Keep show_all_labels checkbox from original (sync with main)

ui_components.py

@@ -705,7 +705,7 @@ def create_leaderboard_display(
         primary_runtime_col = f"{category_name} Runtime"
     
     # Function to create cost/performance scatter plot from data
-    def create_cost_scatter_plot(df_data, mark_by=MARK_BY_DEFAULT, show_all_labels=False):
+    def create_cost_scatter_plot(df_data, mark_by=MARK_BY_DEFAULT):
         return _plot_scatter_plotly(
             data=df_data,
             x=primary_cost_col if primary_cost_col in df_data.columns else None,
@@ -713,12 +713,11 @@ def create_leaderboard_display(
             agent_col="SDK Version",
             name=category_name,
             plot_type='cost',
-            mark_by=mark_by,
-            show_all_labels=show_all_labels
+            mark_by=mark_by
         )
     
     # Function to create runtime/performance scatter plot from data
-    def create_runtime_scatter_plot(df_data, mark_by=MARK_BY_DEFAULT, show_all_labels=False):
+    def create_runtime_scatter_plot(df_data, mark_by=MARK_BY_DEFAULT):
         return _plot_scatter_plotly(
             data=df_data,
             x=primary_runtime_col if primary_runtime_col in df_data.columns else None,
@@ -726,8 +725,7 @@ def create_leaderboard_display(
             agent_col="SDK Version",
             name=category_name,
             plot_type='runtime',
-            mark_by=mark_by,
-            show_all_labels=show_all_labels
+            mark_by=mark_by
         )
     
     # Create initial cost scatter plots for all filter combinations
@@ -774,7 +772,7 @@ def create_leaderboard_display(
     
     # Add toggle checkboxes and dropdown ABOVE the plot
     with gr.Row():
-        with gr.Column(scale=3):
+        with gr.Column(scale=3, elem_classes=["oh-leaderboard-filter-col"]):
             if has_complete_entries:
                 show_incomplete_checkbox = gr.Checkbox(
                     label=f"Show incomplete entries ({num_incomplete} entries with fewer than 5 categories)",
@@ -794,7 +792,6 @@ def create_leaderboard_display(
                 )
             else:
                 show_open_only_checkbox = None
-            
             # Add checkbox for showing all labels on scatter plot
             show_all_labels_checkbox = gr.Checkbox(
                 label="Show all labels on scatter plots",
@@ -844,7 +841,7 @@ def create_leaderboard_display(
             )
             
             # Update function for filters - handles checkboxes and mark_by dropdown
-            def update_display(show_incomplete, show_open_only, mark_by, show_all_labels):
+            def update_display(show_incomplete, show_open_only, mark_by):
                 # Determine which dataframe to show based on checkbox states
                 if show_open_only:
                     df_to_show = df_display_open if show_incomplete else df_display_complete_open
@@ -853,9 +850,9 @@ def create_leaderboard_display(
                     df_to_show = df_display_all if show_incomplete else df_display_complete
                     view_df = df_view_full if show_incomplete else df_view_complete
                 
-                # Regenerate plots with current mark_by and show_all_labels settings
-                cost_plot = create_cost_scatter_plot(view_df, mark_by, show_all_labels)
-                runtime_plot = create_runtime_scatter_plot(view_df, mark_by, show_all_labels)
+                # Regenerate plots with current mark_by setting
+                cost_plot = create_cost_scatter_plot(view_df, mark_by)
+                runtime_plot = create_runtime_scatter_plot(view_df, mark_by)
                 return df_to_show, cost_plot, runtime_plot
             
             # Connect checkboxes and dropdown to the update function
@@ -866,7 +863,6 @@ def create_leaderboard_display(
                 # Add a dummy value for show_open_only when checkbox doesn't exist
                 filter_inputs = [show_incomplete_checkbox, gr.State(value=False)]
             filter_inputs.append(mark_by_dropdown)
-            filter_inputs.append(show_all_labels_checkbox)
             
             show_incomplete_checkbox.change(
                 fn=update_display,
@@ -884,11 +880,6 @@ def create_leaderboard_display(
                 inputs=filter_inputs,
                 outputs=[dataframe_component, cost_plot_component, runtime_plot_component]
             )
-            show_all_labels_checkbox.change(
-                fn=update_display,
-                inputs=filter_inputs,
-                outputs=[dataframe_component, cost_plot_component, runtime_plot_component]
-            )
         else:
             dataframe_component = gr.DataFrame(
                 headers=df_headers,
@@ -903,15 +894,15 @@ def create_leaderboard_display(
             )
             
             # Update function for mark_by and optional open_only checkbox
-            def update_display_no_complete(show_open_only, mark_by, show_all_labels):
+            def update_display_no_complete(show_open_only, mark_by):
                 if show_open_only:
                     df_to_show = df_display_open
                     view_df = df_view_open
                 else:
                     df_to_show = df_display_all
                     view_df = df_view_full
-                cost_plot = create_cost_scatter_plot(view_df, mark_by, show_all_labels)
-                runtime_plot = create_runtime_scatter_plot(view_df, mark_by, show_all_labels)
+                cost_plot = create_cost_scatter_plot(view_df, mark_by)
+                runtime_plot = create_runtime_scatter_plot(view_df, mark_by)
                 return df_to_show, cost_plot, runtime_plot
             
             filter_inputs_no_complete = []
@@ -920,7 +911,6 @@ def create_leaderboard_display(
             else:
                 filter_inputs_no_complete.append(gr.State(value=False))
             filter_inputs_no_complete.append(mark_by_dropdown)
-            filter_inputs_no_complete.append(show_all_labels_checkbox)
             
             if show_open_only_checkbox is not None:
                 show_open_only_checkbox.change(
@@ -933,18 +923,13 @@ def create_leaderboard_display(
                 inputs=filter_inputs_no_complete,
                 outputs=[dataframe_component, cost_plot_component, runtime_plot_component]
             )
-            show_all_labels_checkbox.change(
-                fn=update_display_no_complete,
-                inputs=filter_inputs_no_complete,
-                outputs=[dataframe_component, cost_plot_component, runtime_plot_component]
-            )
         
         legend_markdown = create_legend_markdown(category_name)
         gr.HTML(value=legend_markdown, elem_id="legend-markdown")
     
     # Add a timer to periodically check for data updates and refresh the UI
     # This runs every 60 seconds to check if new data is available
-    def check_and_refresh_data(show_incomplete, show_open_only=False, mark_by=MARK_BY_DEFAULT, show_all_labels=False):
+    def check_and_refresh_data(show_incomplete, show_open_only=False, mark_by=MARK_BY_DEFAULT):
         """Check if data has been refreshed and return updated data if so."""
         current_version = get_data_version()
         if current_version > initial_data_version:
@@ -974,16 +959,16 @@ def create_leaderboard_display(
                 new_df_display_open = prepare_df_for_display(new_df_view_open)
                 new_df_display_complete_open = prepare_df_for_display(new_df_view_complete_open)
                 
-                # Create new scatter plots for all combinations (with current mark_by and show_all_labels)
-                new_cost_scatter_complete = create_cost_scatter_plot(new_df_view_complete, mark_by, show_all_labels) if len(new_df_display_complete) > 0 else go.Figure()
-                new_cost_scatter_all = create_cost_scatter_plot(new_df_view_full, mark_by, show_all_labels)
-                new_cost_scatter_open = create_cost_scatter_plot(new_df_view_open, mark_by, show_all_labels) if len(new_df_view_open) > 0 else go.Figure()
-                new_cost_scatter_complete_open = create_cost_scatter_plot(new_df_view_complete_open, mark_by, show_all_labels) if len(new_df_view_complete_open) > 0 else go.Figure()
+                # Create new scatter plots for all combinations (with current mark_by)
+                new_cost_scatter_complete = create_cost_scatter_plot(new_df_view_complete, mark_by) if len(new_df_display_complete) > 0 else go.Figure()
+                new_cost_scatter_all = create_cost_scatter_plot(new_df_view_full, mark_by)
+                new_cost_scatter_open = create_cost_scatter_plot(new_df_view_open, mark_by) if len(new_df_view_open) > 0 else go.Figure()
+                new_cost_scatter_complete_open = create_cost_scatter_plot(new_df_view_complete_open, mark_by) if len(new_df_view_complete_open) > 0 else go.Figure()
                 
-                new_runtime_scatter_complete = create_runtime_scatter_plot(new_df_view_complete, mark_by, show_all_labels) if len(new_df_display_complete) > 0 else go.Figure()
-                new_runtime_scatter_all = create_runtime_scatter_plot(new_df_view_full, mark_by, show_all_labels)
-                new_runtime_scatter_open = create_runtime_scatter_plot(new_df_view_open, mark_by, show_all_labels) if len(new_df_view_open) > 0 else go.Figure()
-                new_runtime_scatter_complete_open = create_runtime_scatter_plot(new_df_view_complete_open, mark_by, show_all_labels) if len(new_df_view_complete_open) > 0 else go.Figure()
+                new_runtime_scatter_complete = create_runtime_scatter_plot(new_df_view_complete, mark_by) if len(new_df_display_complete) > 0 else go.Figure()
+                new_runtime_scatter_all = create_runtime_scatter_plot(new_df_view_full, mark_by)
+                new_runtime_scatter_open = create_runtime_scatter_plot(new_df_view_open, mark_by) if len(new_df_view_open) > 0 else go.Figure()
+                new_runtime_scatter_complete_open = create_runtime_scatter_plot(new_df_view_complete_open, mark_by) if len(new_df_view_complete_open) > 0 else go.Figure()
                 
                 # Return the appropriate data based on checkbox states
                 if show_open_only:
@@ -1018,7 +1003,6 @@ def create_leaderboard_display(
         if show_open_only_checkbox is not None:
             timer_inputs.append(show_open_only_checkbox)
         timer_inputs.append(mark_by_dropdown)  # Always include mark_by
-        timer_inputs.append(show_all_labels_checkbox)
         refresh_timer.tick(
             fn=check_and_refresh_data,
             inputs=timer_inputs,
@@ -1026,7 +1010,7 @@ def create_leaderboard_display(
         )
     else:
         # If no incomplete checkbox, always show all data (but still filter by open if needed)
-        def check_and_refresh_all(show_open_only=False, mark_by=MARK_BY_DEFAULT, show_all_labels=False):
+        def check_and_refresh_all(show_open_only=False, mark_by=MARK_BY_DEFAULT):
             current_version = get_data_version()
             if current_version > initial_data_version:
                 print(f"[REFRESH] Data version changed, reloading...")
@@ -1039,8 +1023,8 @@ def create_leaderboard_display(
                         new_df_view_full = new_df_view_full[new_df_view_full['Openness'].str.lower() == 'open'].copy()
                     
                     new_df_display_all = prepare_df_for_display(new_df_view_full)
-                    new_cost_scatter_all = create_cost_scatter_plot(new_df_view_full, mark_by, show_all_labels)
-                    new_runtime_scatter_all = create_runtime_scatter_plot(new_df_view_full, mark_by, show_all_labels)
+                    new_cost_scatter_all = create_cost_scatter_plot(new_df_view_full, mark_by)
+                    new_runtime_scatter_all = create_runtime_scatter_plot(new_df_view_full, mark_by)
                     return new_df_display_all, new_cost_scatter_all, new_runtime_scatter_all
             
             if show_open_only:
@@ -1050,15 +1034,15 @@ def create_leaderboard_display(
         if show_open_only_checkbox is not None:
             refresh_timer.tick(
                 fn=check_and_refresh_all,
-                inputs=[show_open_only_checkbox, mark_by_dropdown, show_all_labels_checkbox],
+                inputs=[show_open_only_checkbox, mark_by_dropdown],
                 outputs=[dataframe_component, cost_plot_component, runtime_plot_component]
             )
         else:
-            def check_and_refresh_simple(mark_by=MARK_BY_DEFAULT, show_all_labels=False):
-                return check_and_refresh_all(False, mark_by, show_all_labels)
+            def check_and_refresh_simple(mark_by=MARK_BY_DEFAULT):
+                return check_and_refresh_all(False, mark_by)
             refresh_timer.tick(
                 fn=check_and_refresh_simple,
-                inputs=[mark_by_dropdown, show_all_labels_checkbox],
+                inputs=[mark_by_dropdown],
                 outputs=[dataframe_component, cost_plot_component, runtime_plot_component]
             )