Put Tasks into tabs and merge Load Result buttons

app.py

@@ -105,6 +105,10 @@ def get_result_path_from_model(model_id, result_path_per_model):
     return result_path_per_model[model_id]
 
 
+def update_load_results_component():
+    return gr.Button("Load Results", interactive=True)
+
+
 def load_data(result_path) -> pd.DataFrame:
     with fs.open(result_path, "r") as f:
         data = json.load(f)
@@ -112,6 +116,8 @@ def load_data(result_path) -> pd.DataFrame:
 
 
 def load_results_dataframe(model_id):
+    if not model_id:
+        return
     result_path = get_result_path_from_model(model_id, latest_result_path_per_model)
     data = load_data(result_path)
     model_name = data.get("model_name", "Model")
@@ -146,7 +152,7 @@ def display_tab(tab, df, task):
     return df.to_html()
 
 
-def update_tasks(task):
+def update_tasks_component(task):
     return gr.Radio(
             ["All"] + list(TASKS.values()),
             label="Tasks",
@@ -156,7 +162,7 @@ def update_tasks(task):
         )
 
 
-def update_subtasks(task):
+def update_subtasks_component(task):
     return gr.Radio(
         SUBTASKS.get(task),
         info="Evaluation subtasks to be displayed",
@@ -209,31 +215,37 @@ with gr.Blocks(fill_height=True) as demo:
     with gr.Row():
         with gr.Column():
             model_id_1 = gr.Dropdown(choices=list(latest_result_path_per_model.keys()), label="Models")
-            load_btn_1 = gr.Button("Load")
             dataframe_1 = gr.Dataframe(visible=False)
         with gr.Column():
             model_id_2 = gr.Dropdown(choices=list(latest_result_path_per_model.keys()), label="Models")
-            load_btn_2 = gr.Button("Load")
             dataframe_2 = gr.Dataframe(visible=False)
-    with gr.Row():
-        task = gr.Radio(
-            ["All"] + list(TASKS.values()),
-            label="Tasks",
-            info="Evaluation tasks to be displayed",
-            value="All",
-            interactive=False,
-        )
 
     with gr.Row():
         # with gr.Tab("All"):
         #     pass
         with gr.Tab("Results"):
-            results = gr.HTML()
-        with gr.Tab("Configs"):
-            configs = gr.HTML()
+            task = gr.Radio(
+                ["All"] + list(TASKS.values()),
+                label="Tasks",
+                info="Evaluation tasks to be displayed",
+                value="All",
+                interactive=False,
+            )
+            load_results_btn = gr.Button("Load Results", interactive=False)
+            with gr.Tab("Results"):
+                results = gr.HTML()
+            with gr.Tab("Configs"):
+                configs = gr.HTML()
         with gr.Tab("Details"):
+            details_task = gr.Radio(
+                ["All"] + list(TASKS.values()),
+                label="Tasks",
+                info="Evaluation tasks to be displayed",
+                value="All",
+                interactive=True,
+            )
             subtask = gr.Radio(
-                SUBTASKS.get(task.value),
+                SUBTASKS.get(details_task.value),
                 label="Subtasks",
                 info="Evaluation subtasks to be displayed (choose one of the Tasks above)",
             )
@@ -244,20 +256,15 @@ with gr.Blocks(fill_height=True) as demo:
             details_dataframe_2 = gr.Dataframe(visible=False)
             details_dataframe = gr.DataFrame(visible=False)
 
-    load_btn_1.click(
+    model_id_1.change(
+        fn=update_load_results_component,
+        outputs=load_results_btn,
+    )
+    load_results_btn.click(
         fn=load_results_dataframe,
         inputs=model_id_1,
         outputs=dataframe_1,
     ).then(
-        fn=display_results,
-        inputs=[dataframe_1, dataframe_2, task],
-        outputs=[results, configs],
-    ).then(
-        fn=update_tasks,
-        inputs=task,
-        outputs=task,
-    )
-    load_btn_2.click(
         fn=load_results_dataframe,
         inputs=model_id_2,
         outputs=dataframe_2,
@@ -266,7 +273,7 @@ with gr.Blocks(fill_height=True) as demo:
         inputs=[dataframe_1, dataframe_2, task],
         outputs=[results, configs],
     ).then(
-        fn=update_tasks,
+        fn=update_tasks_component,
         inputs=task,
         outputs=task,
     )
@@ -274,12 +281,13 @@ with gr.Blocks(fill_height=True) as demo:
         fn=display_results,
         inputs=[dataframe_1, dataframe_2, task],
         outputs=[results, configs],
-    ).then(
-        fn=update_subtasks,
-        inputs=task,
-        outputs=subtask,
     )
 
+    details_task.change(
+        fn=update_subtasks_component,
+        inputs=details_task,
+        outputs=subtask,
+    )
     load_details_btn.click(
         fn=load_details_dataframe,
         inputs=[model_id_1, subtask],