improve encore

app.py

@@ -379,20 +379,15 @@ with gr.Blocks(title="Model Test Results Dashboard", css=load_css(), js=js_func)
             gr.update(visible=show_all),           # all_models_container
             gr.update(visible=show_amd_only),      # amd_failures_container
             gr.update(visible=show_nvidia_only),   # nvidia_failures_container
-            gr.update(visible=show_all_failures),  # all_failures_container
+            gr.update(visible=show_all_failures),  # both_failures_container
+        )
+
+    for checkbox in [show_amd_failures, show_nvidia_failures]:
+        checkbox.change(
+            fn=filter_failing_models,
+            inputs=[show_amd_failures, show_nvidia_failures],
+            outputs=[all_models_container, amd_failures_container, nvidia_failures_container, both_failures_container]
         )
-    
-    # Connect both checkboxes to the filter function
-    show_amd_failures.change(
-        fn=filter_failing_models,
-        inputs=[show_amd_failures, show_nvidia_failures],
-        outputs=[all_models_container, amd_failures_container, nvidia_failures_container, both_failures_container]
-    )
-    show_nvidia_failures.change(
-        fn=filter_failing_models,
-        inputs=[show_amd_failures, show_nvidia_failures],
-        outputs=[all_models_container, amd_failures_container, nvidia_failures_container, both_failures_container]
-    )
 
     # Regressions panel toggle functionality
     def toggle_regressions_panel(current_visible):
@@ -556,6 +551,11 @@ with gr.Blocks(title="Model Test Results Dashboard", css=load_css(), js=js_func)
 
 
 
+    # Constants for Gradio updates
+    HIDDEN = gr.update(visible=False)
+    SHOWN = gr.update(visible=True)
+    NOOP = gr.update()
+
     def get_historical_summary_plots():
         """Get historical summary plots from preloaded data."""
         plots = create_time_series_summary_gradio(Ci_results.historical_df)
@@ -564,77 +564,61 @@ with gr.Blocks(title="Model Test Results Dashboard", css=load_css(), js=js_func)
             gr.update(value=plots['amd_tests'], visible=True),
             gr.update(value=plots['nvidia_tests'], visible=True),
         )
+
+    def show_time_series_model(selected_model):
+        """Show time-series view for a specific model."""
+        plots = create_model_time_series_gradio(Ci_results.historical_df, selected_model)
+        return (
+            gr.update(value=plots['amd_plot'], visible=True),
+            gr.update(value=plots['nvidia_plot'], visible=True),
+        )
     
     def handle_history_toggle(history_mode, last_selected_model, in_model_view):
-        # Helper to create visibility updates efficiently
-        hidden = gr.update(visible=False)
-        shown = gr.update(visible=True)
-        noop = gr.update()
-        
+        """Handle toggling between current and historical view."""
         if history_mode:
-            if in_model_view and last_selected_model:  # Show historical model detail
+            # Historical mode: show model detail if in model view, otherwise summary
+            if in_model_view and last_selected_model:
                 amd_ts, nvidia_ts = show_time_series_model(last_selected_model)
-                return (hidden, shown, hidden, hidden, hidden, hidden, hidden, hidden, 
-                        amd_ts, nvidia_ts, shown, noop, noop, noop, True)
-            # Show historical summary
+                return (HIDDEN, SHOWN, HIDDEN, HIDDEN, HIDDEN, HIDDEN, HIDDEN, HIDDEN, 
+                        amd_ts, nvidia_ts, SHOWN, NOOP, NOOP, NOOP, True)
+            
             fr_plot, amd_plot, nvidia_plot = get_historical_summary_plots()
-            return (hidden, shown, hidden, hidden, hidden, fr_plot, amd_plot, nvidia_plot,
-                    noop, noop, hidden, noop, noop, noop, False)
+            return (HIDDEN, SHOWN, HIDDEN, HIDDEN, HIDDEN, fr_plot, amd_plot, nvidia_plot,
+                    NOOP, NOOP, HIDDEN, NOOP, NOOP, NOOP, False)
         else:
-            # Switch to current mode
+            # Current mode: show model detail if available, otherwise summary
             if last_selected_model and Ci_results.df is not None and not Ci_results.df.empty and last_selected_model in Ci_results.df.index:
                 fig, amd_txt, nvidia_txt = plot_model_stats(Ci_results.df, last_selected_model, Ci_results.all_historical_data)
-                return (shown, hidden, hidden, hidden, shown, hidden, hidden, hidden,
-                        noop, noop, hidden, fig, amd_txt, nvidia_txt, True)
-            else:
-                fig = create_summary_page(Ci_results.df, Ci_results.available_models)
-                return (shown, hidden, shown, gr.update(value=fig, visible=True), hidden,
-                        hidden, hidden, hidden, noop, noop, hidden, noop, noop, noop, False)
+                return (SHOWN, HIDDEN, HIDDEN, HIDDEN, SHOWN, HIDDEN, HIDDEN, HIDDEN,
+                        NOOP, NOOP, HIDDEN, fig, amd_txt, nvidia_txt, True)
+            
+            fig = create_summary_page(Ci_results.df, Ci_results.available_models)
+            return (SHOWN, HIDDEN, SHOWN, gr.update(value=fig, visible=True), HIDDEN,
+                    HIDDEN, HIDDEN, HIDDEN, NOOP, NOOP, HIDDEN, NOOP, NOOP, NOOP, False)
 
+    def handle_model_click(selected_model: str, history_mode: bool):
+        """Handle clicking on a model button."""
+        if history_mode:
+            amd_ts, nvidia_ts = show_time_series_model(selected_model)
+            return (NOOP, NOOP, NOOP, HIDDEN, SHOWN, HIDDEN, HIDDEN, HIDDEN, HIDDEN, HIDDEN, 
+                    HIDDEN, amd_ts, nvidia_ts, SHOWN, selected_model, True)
+        
+        fig, amd_txt, nvidia_txt = plot_model_stats(Ci_results.df, selected_model, Ci_results.all_historical_data)
+        return (fig, amd_txt, nvidia_txt, SHOWN, HIDDEN, HIDDEN, HIDDEN, SHOWN, NOOP, NOOP,
+                NOOP, NOOP, NOOP, HIDDEN, selected_model, True)
+
+    # Wire up history toggle
     history_view_button.change(
         fn=handle_history_toggle,
         inputs=[history_view_button, selected_model_state, in_model_view_state],
         outputs=[
-            current_view,
-            historical_view,
-            summary_view,
-            summary_display,
-            detail_view,
-            time_series_failure_rates,
-            time_series_amd_tests,
-            time_series_nvidia_tests,
-            time_series_amd_model_plot,
-            time_series_nvidia_model_plot,
-            time_series_detail_view,
-            plot_output,
-            amd_failed_tests_output,
-            nvidia_failed_tests_output,
-            in_model_view_state,
+            current_view, historical_view, summary_view, summary_display, detail_view,
+            time_series_failure_rates, time_series_amd_tests, time_series_nvidia_tests,
+            time_series_amd_model_plot, time_series_nvidia_model_plot, time_series_detail_view,
+            plot_output, amd_failed_tests_output, nvidia_failed_tests_output, in_model_view_state,
         ],
     )
 
-
-    # Time-series model selection functionality
-    def show_time_series_model(selected_model):
-        """Show time-series view for a specific model."""
-        plots = create_model_time_series_gradio(Ci_results.historical_df, selected_model)
-        return (
-            gr.update(value=plots['amd_plot'], visible=True),
-            gr.update(value=plots['nvidia_plot'], visible=True),
-        )
-
-    # Unified model click handler: respects History toggle
-    def handle_model_click(selected_model: str, history_mode: bool):
-        noop, hidden, shown = gr.update(), gr.update(visible=False), gr.update(visible=True)
-        if history_mode:
-            amd_ts, nvidia_ts = show_time_series_model(selected_model)
-            return (noop, noop, noop, hidden, shown, hidden, hidden, hidden, hidden, hidden, 
-                    hidden, amd_ts, nvidia_ts, shown, selected_model, True)
-        else:
-            fig, amd_txt, nvidia_txt = plot_model_stats(Ci_results.df, selected_model, Ci_results.all_historical_data)
-            return (fig, amd_txt, nvidia_txt, shown, hidden, hidden, hidden, shown, noop, noop,
-                    noop, noop, noop, hidden, selected_model, True)
-
     # Define common outputs for model click handlers
     model_click_outputs = [
         plot_output, amd_failed_tests_output, nvidia_failed_tests_output,
@@ -644,44 +628,21 @@ with gr.Blocks(title="Model Test Results Dashboard", css=load_css(), js=js_func)
         selected_model_state, in_model_view_state,
     ]
     
-    # Wire up all model buttons
-    for i, btn in enumerate(model_buttons):
-        model_name = model_choices[i]
-        btn.click(
-            fn=lambda history_mode, m=model_name: handle_model_click(m, history_mode),
-            inputs=[history_view_button],
-            outputs=model_click_outputs,
-        )
-    
-    # Wire up AMD failing model buttons
-    amd_models_to_show = amd_failing_models + both_failing_models
-    for i, btn in enumerate(amd_buttons):
-        model_name = sorted(amd_models_to_show)[i]
-        btn.click(
-            fn=lambda history_mode, m=model_name: handle_model_click(m, history_mode),
-            inputs=[history_view_button],
-            outputs=model_click_outputs,
-        )
-    
-    # Wire up NVIDIA failing model buttons
-    nvidia_models_to_show = nvidia_failing_models + both_failing_models
-    for i, btn in enumerate(nvidia_buttons):
-        model_name = sorted(nvidia_models_to_show)[i]
-        btn.click(
-            fn=lambda history_mode, m=model_name: handle_model_click(m, history_mode),
-            inputs=[history_view_button],
-            outputs=model_click_outputs,
-        )
+    # Helper function to connect button clicks
+    def connect_model_buttons(buttons, models):
+        """Connect a list of buttons to their corresponding models."""
+        for btn, model_name in zip(buttons, models):
+            btn.click(
+                fn=lambda history_mode, m=model_name: handle_model_click(m, history_mode),
+                inputs=[history_view_button],
+                outputs=model_click_outputs,
+            )
     
-    # Wire up both failures model buttons
-    all_failing = list(set(amd_failing_models + nvidia_failing_models + both_failing_models))
-    for i, btn in enumerate(both_buttons):
-        model_name = sorted(all_failing)[i]
-        btn.click(
-            fn=lambda history_mode, m=model_name: handle_model_click(m, history_mode),
-            inputs=[history_view_button],
-            outputs=model_click_outputs,
-        )
+    # Wire up all button groups
+    connect_model_buttons(model_buttons, model_choices)
+    connect_model_buttons(amd_buttons, sorted(amd_failing_models + both_failing_models))
+    connect_model_buttons(nvidia_buttons, sorted(nvidia_failing_models + both_failing_models))
+    connect_model_buttons(both_buttons, sorted(list(set(amd_failing_models + nvidia_failing_models + both_failing_models))))
 
     # Summary button click handler
     def show_summary_and_update_links():