more formatting

app.py

@@ -71,6 +71,8 @@ class LeaderboardData:
     def __init__(self):
         self._setup_data_paths()
         self._load_contact_info()
+        self._eval_results = None
+        self._results_dfs = None
 
     def _setup_data_paths(self):
         """
@@ -122,6 +124,9 @@ class LeaderboardData:
         """
         Load all evaluation data and return results and dataframes.
         """
+        if self._eval_results is not None and self._results_dfs is not None:
+            return self._eval_results, self._results_dfs
+
         # Load S2EF results
         s2ef_results = load_dataset(
             RESULTS_DATASET,
@@ -148,7 +153,6 @@ class LeaderboardData:
 
         # Generate result dataframes
         results_dfs = {}
-
         # S2EF dataframes
         for split in ["Validation", "Test"]:
             for subsplit in S2EF_SUBSPLITS:
@@ -161,6 +165,10 @@ class LeaderboardData:
         for split in OTHER_EVAL_TYPES:
             results_dfs[split] = self._get_eval_df_from_results(eval_results, split)
 
+        # Cache the results
+        self._eval_results = eval_results
+        self._results_dfs = results_dfs
+
         return eval_results, results_dfs
 
     def _get_s2ef_df_from_results(
@@ -495,7 +503,7 @@ def create_overview_dataframe(results_dfs: Dict[str, pd.DataFrame]) -> pd.DataFr
     overview_data = {
         "Model": [],
         "Organization": [],
-        "Energy Conserving": [],
+        "Energy\nConserving": [],
         "Training Set": [],
     }
 
@@ -523,7 +531,7 @@ def create_overview_dataframe(results_dfs: Dict[str, pd.DataFrame]) -> pd.DataFr
 
         overview_data["Model"].append(entry_info["Model"])
         overview_data["Organization"].append(entry_info["Organization"])
-        overview_data["Energy Conserving"].append(entry_info["Energy Conserving"])
+        overview_data["Energy\nConserving"].append(entry_info["Energy Conserving"])
         overview_data["Training Set"].append(entry_info["Training Set"])
 
         # Fill in metrics for each column
@@ -557,7 +565,7 @@ def create_overview_dataframe(results_dfs: Dict[str, pd.DataFrame]) -> pd.DataFr
         # Calculate mean across columns, ignoring NaN values
         avg_scores = numeric_metrics.mean(axis=1)
         # Sort by average score (ascending for MAE metrics)
-        overview_df = overview_df.loc[avg_scores.sort_values(na_position="last").index]
+        overview_df = overview_df.loc[avg_scores.sort_values().index]
 
     return overview_df
 
@@ -637,6 +645,11 @@ def create_interface() -> gr.Blocks:
                 gr.Markdown(CITATION_BUTTON_LABEL)
                 gr.Markdown(CITATION_BUTTON_TEXT)
 
+        # Evaluation results
+        gr.Markdown("## Evaluations", elem_classes="markdown-text")
+        with gr.Row():
+            create_evaluation_tabs(results_dfs)
+
         # S2EF Results tabs
         gr.Markdown("## S2EF", elem_classes="markdown-text")
         with gr.Tab("Test"):
@@ -645,11 +658,6 @@ def create_interface() -> gr.Blocks:
         with gr.Tab("Validation"):
             create_s2ef_tabs("Validation", results_dfs)
 
-        # Evaluation results
-        gr.Markdown("## Evaluations", elem_classes="markdown-text")
-        with gr.Row():
-            create_evaluation_tabs(results_dfs)
-
         (
             submit_button,
             file_output,
@@ -665,22 +673,22 @@ def create_interface() -> gr.Blocks:
             submission_result,
         ) = create_submission_interface()
 
-        # submit_button.click(
-        #     add_new_eval,
-        #     [
-        #         file_output,
-        #         eval_type,
-        #         organization,
-        #         model_name_textbox,
-        #         model_url,
-        #         paper_url,
-        #         energy_conserving,
-        #         mail,
-        #         dataset,
-        #         additional_info,
-        #     ],
-        #     submission_result,
-        # )
+        submit_button.click(
+            add_new_eval,
+            [
+                file_output,
+                eval_type,
+                organization,
+                model_name_textbox,
+                model_url,
+                paper_url,
+                energy_conserving,
+                mail,
+                dataset,
+                additional_info,
+            ],
+            submission_result,
+        )
 
     return demo
 

content.py

@@ -68,8 +68,18 @@ TYPES = ["markdown", "str", "bool", "str"]
 
 def model_hyperlink(model_link: str, paper_link: str, model_name: str) -> str:
     """Create a hyperlink for model names in the leaderboard."""
-    if not model_link or model_link.strip() == "":
+
+    # Check if we have valid links
+    has_model_link = model_link and model_link.strip() != ""
+    has_paper_link = paper_link and paper_link.strip() != ""
+
+    if not has_model_link and not has_paper_link:
         return model_name
-    if not paper_link or paper_link.strip() == "" or paper_link == "-":
+
+    if has_model_link and not has_paper_link:
         return f'<a target="_blank" href="{model_link}" style="color: var(--link-text-color); text-decoration: underline;text-decoration-style: dotted;" title="Download model">{model_name}</a>'
+
+    if not has_model_link and has_paper_link:
+        return f'{model_name} <a target="_blank" href="{paper_link}" style="color: var(--link-text-color); text-decoration: underline;text-decoration-style: dotted;" title="Read paper">📕</a>'
+
     return f'<a target="_blank" href="{model_link}" style="color: var(--link-text-color); text-decoration: underline;text-decoration-style: dotted;" title="Download model">{model_name}</a> <a target="_blank" href="{paper_link}" style="color: var(--link-text-color); text-decoration: underline;text-decoration-style: dotted;" title="Read paper">📕</a>'