Bokeh figure - change category according to the dropdown

app.py

@@ -199,6 +199,10 @@ def submit_results(*inputs):
             value=leaderboard_server.get_leaderboard_csv(category=leaderboard_server.TASKS_CATEGORY_OVERALL),
             visible=True,
         )
+        leaderboard_scatter_plot = gr.update(
+            value=leaderboard_server.get_bokeh_figure(category=leaderboard_server.TASKS_CATEGORY_OVERALL),
+            visible=True,
+        )
         submission_ids_and_titles = get_submission_ids_and_titles()
     
     return (
@@ -213,6 +217,7 @@ def submit_results(*inputs):
         gr.update(visible=False),
         leaderboard,
         leaderboard_csv,
+        leaderboard_scatter_plot,
         gr.update(visible=False),
         gr.update(choices=submission_ids_and_titles),
         gr.update(value=leaderboard_server.TASKS_CATEGORY_OVERALL),
@@ -324,11 +329,16 @@ def change_leaderboard_category(category, selected_submission_id):
         value=leaderboard_server.get_leaderboard_csv(category=category),
         visible=True,
     )
+    leaderboard_scatter_plot = gr.update(
+        value=leaderboard_server.get_bokeh_figure(category=category),
+        visible=True,
+    )
     
     return (
         leaderboard,
         leaderboard_csv,
         task_abbreviation_legend,
+        leaderboard_scatter_plot,
         tournament_results_title,
         tournament_results_dropdown,
         model_tournament_results_table,
@@ -431,11 +441,16 @@ def on_application_load():
             value=leaderboard_server.get_leaderboard_csv(category=leaderboard_server.TASKS_CATEGORY_OVERALL),
             visible=True,
         )
+        leaderboard_scatter_plot = gr.update(
+            value=leaderboard_server.get_bokeh_figure(category=leaderboard_server.TASKS_CATEGORY_OVERALL),
+            visible=True,
+        )
         submission_ids_and_titles = get_submission_ids_and_titles()
     
     return (
         leaderboard,
         leaderboard_csv,
+        leaderboard_scatter_plot,
         gr.update(choices=submission_ids_and_titles),
         gr.update(value=leaderboard_server.TASKS_CATEGORY_OVERALL),
         gr.update(choices=submission_ids_and_titles),
@@ -654,12 +669,6 @@ def gradio_app():
                             value=leaderboard_server.get_leaderboard_csv(category=leaderboard_server.TASKS_CATEGORY_OVERALL),
                         )
                     
-                    with gr.Row():
-                        gr.Plot(
-                            value=leaderboard_server.get_bokeh_figure(),
-                            #label='Foo',
-                        )
-                    
                     with gr.Row():
                         leaderboard_table_legend = gr.DataFrame(
                             value=None,
@@ -676,6 +685,12 @@ def gradio_app():
                             elem_classes="leaderboard-table-legend",
                         )
                     
+                    with gr.Row():
+                        leaderboard_scatter_plot = gr.Plot(
+                            value=leaderboard_server.get_bokeh_figure(category=leaderboard_server.TASKS_CATEGORY_OVERALL),
+                            label='Scatter plot',
+                        )
+                    
                     with gr.Row():
                         tournament_results_title = gr.Markdown(
                             value="## Tournament results for selected model",
@@ -717,6 +732,7 @@ def gradio_app():
                             leaderboard_table,
                             leaderboard_table_csv,
                             leaderboard_table_legend,
+                            leaderboard_scatter_plot,
                             tournament_results_title,
                             tournament_results_dropdown,
                             model_tournament_results_table,
@@ -972,6 +988,7 @@ def gradio_app():
                             pre_submit_model_tournament_results_table_csv,
                             leaderboard_table,
                             leaderboard_table_csv,
+                            leaderboard_scatter_plot,
                             modal_submit,
                             model_details_model_dropdown,
                             leaderboard_category_of_tasks,
@@ -1040,6 +1057,7 @@ def gradio_app():
             outputs=[
                 leaderboard_table,
                 leaderboard_table_csv,
+                leaderboard_scatter_plot,
                 model_details_model_dropdown,
                 leaderboard_category_of_tasks,
                 tournament_results_dropdown,

server.py

@@ -622,7 +622,7 @@ class LeaderboardServer:
         dataframe.to_csv(filepath, index=False)
         return filepath
 
-    def get_bokeh_figure(self):
+    def get_bokeh_figure(self, pre_submit=None, category=None):
         import numpy as np
         from analyze_winscore import get_ldb_records, create_scatter_plot_with_curve_with_variances_named
         
@@ -630,13 +630,18 @@ class LeaderboardServer:
         #tournament = self.tournament_results
         name_map = self.submission_id_to_model_title
         
-        category = self.TASKS_CATEGORY_OVERALL
-        csv_file_path = self.leaderboard_dataframes_csv[category]
+        category = category if category else self.TASKS_CATEGORY_OVERALL
+        
+        csv_file_path = self.leaderboard_dataframes_csv[self.TASKS_CATEGORY_OVERALL]
         ldb_records = get_ldb_records(name_map, csv_file_path)
         categories = self.TASKS_CATEGORIES
         model_names = list(ldb_records.keys())
         sizes = [float(ldb_records[model]['# θ (B)']) for model in model_names]
-        average_performance = [float(ldb_records[model]['Average ⬆️']) for model in model_names]
+        
+        if category in (self.TASKS_CATEGORY_OVERALL, self.TASKS_CATEGORY_OVERALL_DETAILS):
+            average_performance = [float(ldb_records[model]['Average ⬆️']) for model in model_names]
+        else:
+            average_performance = [float(ldb_records[model][category]) for model in model_names]
         
         variances={}
         for model, record in ldb_records.items():
@@ -647,8 +652,13 @@ class LeaderboardServer:
         print(min(variances.values()))
         variance_across_categories = variances
         
+        if category in (self.TASKS_CATEGORY_OVERALL, self.TASKS_CATEGORY_OVERALL_DETAILS):
+            fig_y_axis_label = 'Overall Duel Win Score'
+        else:
+            fig_y_axis_label = f"{category} Duel Win Score"
+        
         fig = create_scatter_plot_with_curve_with_variances_named(
-            'Overall Duel Win Score',
+            fig_y_axis_label,
             variance_across_categories,
             sizes,
             average_performance,