reorg df

app.py

@@ -14,7 +14,7 @@ import os
 
 from submit import submit_boundary
 from about import PROBLEM_TYPES, TOKEN, CACHE_PATH, API, submissions_repo, results_repo
-from utils import read_boundary, write_results, get_user
+from utils import read_boundary, write_results, get_user, make_user_clickable, make_boundary_clickable
 from visualize import make_visual
 
 def evaluate_boundary(filename):
@@ -23,25 +23,25 @@ def evaluate_boundary(filename):
     with Path(local_path).open("r") as f:
         raw = f.read()
         data_dict = json.loads(raw)
-    result = evaluate_problem(data_dict['problem_type'], local_path)
+
+    try:
+        result = evaluate_problem(data_dict['problem_type'], local_path)
+    except Exception as e:
+        raise gr.Error(f'Evaluation failed: {e}. No results written to results dataset.')
     
     write_results(data_dict, result)
     return
 
-def make_clickable(name):
-    link =f'https://huggingface.co/{name}'
-    return f'<a target="_blank" href="{link}" style="color: var(--link-text-color); text-decoration: underline;text-decoration-style: dotted;">{name}</a>'
-
 def get_leaderboard():
     ds = load_dataset(results_repo, split='train')
-    df = pd.DataFrame(ds)
+    full_df = pd.DataFrame(ds)
+    full_df['full results'] = full_df['result_filename'].apply(lambda x: make_boundary_clickable(x)).astype(str)
 
-    df.rename(columns={'submission_time': 'submission time', 'problem_type': 'problem type'}, inplace=True)
-    # df['user'] = df['user'].apply(lambda x: make_clickable(x)).astype(str)
-    score_field = "score" if "score" in df.columns else "objective"  # fallback
+    full_df.rename(columns={'submission_time': 'submission time', 'problem_type': 'problem type'}, inplace=True)
+    to_show = full_df[['submission time', 'problem type', 'user', 'score', 'full results']]
+    to_show['user'] = to_show['user'].apply(lambda x: make_user_clickable(x)).astype(str)
 
-    df = df.sort_values(by=score_field, ascending=True)
-    return df
+    return to_show
 
 def show_output_box(message):
     return gr.update(value=message, visible=True)
@@ -55,10 +55,10 @@ def gradio_interface() -> gr.Blocks:
 
                 Leaderboard(
                     value=get_leaderboard(),
-                    datatype=['str', 'date', 'str', 'str', 'bool', 'markdown', 'number', 'bool', 'number', 'number', 'str'],
+                    datatype=['date', 'str', 'html', 'number', 'html'],
                     select_columns=["submission time", "feasibility", "score", "problem type", "user"],
                     search_columns=["submission time", "score", "user"],
-                    hide_columns=["result_filename", "submission_filename", "objective", "minimize_objective", "boundary_json", "evaluated"],
+                    # hide_columns=["result_filename", "submission_filename", "objective", "minimize_objective", "boundary_json", "evaluated"],
                     filter_columns=["problem type"],
                     every=60,
                     render=True
@@ -119,7 +119,6 @@ def gradio_interface() -> gr.Blocks:
                     problem_type = gr.Dropdown(PROBLEM_TYPES, label="Problem Type")
                     boundary_file = gr.File(label="Boundary JSON File (.json)")
 
-                boundary_file
                 submit_btn = gr.Button("Evaluate")
                 message = gr.Textbox(label="Status", lines=1, visible=False)
                 submit_btn.click(

utils.py

@@ -6,15 +6,21 @@ import json
 import pandas as pd
 
 import gradio as gr
-from datasets import load_dataset, Dataset
 from huggingface_hub import upload_file, hf_hub_download
-from gradio_leaderboard import ColumnFilter, Leaderboard, SelectColumns
 from evaluation import evaluate_problem
 from datetime import datetime
 import os
 
 from about import PROBLEM_TYPES, TOKEN, CACHE_PATH, API, submissions_repo, results_repo
 
+def make_user_clickable(name):
+    link =f'https://huggingface.co/{name}'
+    return f'<a target="_blank" href="{link}" style="color: var(--link-text-color); text-decoration: underline;text-decoration-style: dotted;">{name}</a>'
+
+def make_boundary_clickable(filename):
+    link =f'https://huggingface.co/datasets/proxima-fusion/constellaration-bench-results/blob/main/{filename}'
+    return f'<a target="_blank" href="{link}" style="color: var(--link-text-color); text-decoration: underline;text-decoration-style: dotted;">link</a>'
+
 def read_boundary(filename):
     local_path = hf_hub_download(
         repo_id=submissions_repo,
@@ -35,7 +41,7 @@ def write_results(record, result):
     if 'objective' not in record.keys():
         record['objective'] = 0.0
         record['minimize_objective'] = True
-        record['feasibility'] = 0.0 # sum(record['feasibilities'])/len(record['feasibilities'])
+        record['feasibility'] = sum(record['feasibility'])/len(record['feasibility'])
 
     with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as tmp:
         json.dump(record, tmp, indent=2)