Update app.py

app.py

@@ -660,120 +660,112 @@ first_model = next(iter(models.values()))
 category_choices = list(first_model['scores'].keys())
 
 with gr.Blocks(css=css) as demo:
-    gr.Markdown("# AI System Social Impact Scorecard Dashboard")
+    gr.Markdown("# AI System Social Impact Dashboard")
+
+    initial_df = create_leaderboard(category_choices)
     
     with gr.Row():
-        tab_selection = gr.Radio(
-            # ["Leaderboard", "Category Analysis", "Detailed Scorecard"],  # Original tabs
-            ["Leaderboard", "Detailed Scorecard"],  # Current tabs
-            label="Select Tab", 
-            value="Leaderboard"
-        )
+        tab_selection = gr.Radio(["Leaderboard", "Category Analysis", "Detailed Scorecard"], 
+                               label="Select Tab", value="Leaderboard")
     
     with gr.Row():
-        system_chooser = gr.Dropdown(choices=[""] + list(models.keys()),
-                                   label="Select AI System for Details", 
-                                   value="",
-                                   interactive=True, visible=False)
-        # Commenting out multi-chooser for now
-        # system_multi_chooser = gr.Dropdown(choices=list(models.keys()),
-        #                                  label="Select AI Systems for Comparison",
-        #                                  value=[],
-        #                                  multiselect=True, 
-        #                                  interactive=True, 
-        #                                  visible=False,
-        #                                  info="Select one or more AI systems")
-    
+        model_chooser = gr.Dropdown(choices=[""] + list(models.keys()),
+                                  label="Select AI System for Details", 
+                                  value="",
+                                  interactive=True, visible=False)
+        model_multi_chooser = gr.Dropdown(choices=list(models.keys()),
+                                        label="Select AI Systems for Comparison",
+                                        value=[],
+                                        multiselect=True, 
+                                        interactive=True, 
+                                        visible=False,
+                                        info="Select one or more AI Systems")
+    
+    # Category filter now visible for all tabs
     category_filter = gr.CheckboxGroup(choices=category_choices,
                                      label="Filter Categories", 
                                      value=category_choices)
     
     with gr.Column(visible=True) as leaderboard_tab:
-        initial_df = create_leaderboard(category_choices)
         leaderboard_output = gr.DataFrame(
             value=initial_df,
             interactive=False,
-            wrap=True
+            wrap=True,
+            datatype=["markdown", "markdown", "markdown"] + ["markdown"] * (len(category_choices)+1)  # Support markdown in all columns
         )
     
-    # Commenting out category analysis tab for now
-    # with gr.Column(visible=False) as category_analysis_tab:
-    #     initial_plot = create_category_chart([], category_choices)
-    #     category_chart = gr.Plot(value=initial_plot)
+    with gr.Column(visible=False) as category_analysis_tab:
+        # Initialize with empty plot
+        initial_plot = create_category_chart([], category_choices)
+        category_chart = gr.Plot(value=initial_plot)
     
     with gr.Column(visible=False) as detailed_scorecard_tab:
-        system_metadata = gr.HTML()
+        model_metadata = gr.HTML()
         all_category_cards = gr.HTML()
         total_score = gr.Markdown()
 
-    def update_dashboard(tab, selected_system, selected_categories):
-        # Original component states
+    def update_dashboard(tab, selected_models, selected_model, selected_categories):
+        # Default visibility states
         component_states = {
             "leaderboard": False,
-            # "category_chart": False,  # Commented out
+            "category_chart": False,
             "detailed_scorecard": False,
-            "system_chooser": False,
-            # "system_multi_chooser": False,  # Commented out
+            "model_chooser": False,
+            "model_multi_chooser": False
         }
         
-        # Original outputs
+        # Initialize outputs with None
         outputs = {
             "leaderboard": None,
-            # "category_chart": None,  # Commented out
-            "system_metadata": None,
+            "category_chart": None,
+            "model_metadata": None,
             "category_cards": None,
             "total_score": None
         }
         
+        # Update visibility based on selected tab
         if tab == "Leaderboard":
             component_states["leaderboard"] = True
             outputs["leaderboard"] = create_leaderboard(selected_categories)
             
-        # Commenting out Category Analysis tab handling
-        # elif tab == "Category Analysis":
-        #     component_states["category_chart"] = True
-        #     component_states["system_multi_chooser"] = True
-        #     if selected_systems:
-        #         outputs["category_chart"] = create_category_chart(selected_systems, selected_categories)
+        elif tab == "Category Analysis":
+            component_states["category_chart"] = True
+            component_states["model_multi_chooser"] = True
+            if selected_models:  # Only update chart if models are selected
+                outputs["category_chart"] = create_category_chart(selected_models, selected_categories)
             
         elif tab == "Detailed Scorecard":
             component_states["detailed_scorecard"] = True
-            component_states["system_chooser"] = True
-            if selected_system:
-                scorecard_updates = update_detailed_scorecard(selected_system, selected_categories)
-                outputs["system_metadata"] = scorecard_updates[0]
+            component_states["model_chooser"] = True
+            if selected_model:
+                scorecard_updates = update_detailed_scorecard(selected_model, selected_categories)
+                outputs["model_metadata"] = scorecard_updates[0]
                 outputs["category_cards"] = scorecard_updates[1]
                 outputs["total_score"] = scorecard_updates[2]
         
-        # Return updates with commented out components removed
+        # Return updates in the correct order
         return [
             gr.update(visible=component_states["leaderboard"]),
-            # gr.update(visible=component_states["category_chart"]),  # Commented out
+            gr.update(visible=component_states["category_chart"]),
             gr.update(visible=component_states["detailed_scorecard"]),
-            gr.update(visible=component_states["system_chooser"]),
-            # gr.update(visible=component_states["system_multi_chooser"]),  # Commented out
+            gr.update(visible=component_states["model_chooser"]),
+            gr.update(visible=component_states["model_multi_chooser"]),
             outputs["leaderboard"] if outputs["leaderboard"] is not None else gr.update(),
-            # outputs["category_chart"] if outputs["category_chart"] is not None else gr.update(),  # Commented out
-            outputs["system_metadata"] if outputs["system_metadata"] is not None else gr.update(),
+            outputs["category_chart"] if outputs["category_chart"] is not None else gr.update(),
+            outputs["model_metadata"] if outputs["model_metadata"] is not None else gr.update(),
             outputs["category_cards"] if outputs["category_cards"] is not None else gr.update(),
             outputs["total_score"] if outputs["total_score"] is not None else gr.update()
         ]
 
     # Set up event handlers
-    for component in [tab_selection, system_chooser, category_filter]:  # Removed system_multi_chooser
+    for component in [tab_selection, model_chooser, model_multi_chooser, category_filter]:
         component.change(
             fn=update_dashboard,
-            inputs=[tab_selection, system_chooser, category_filter],  # Removed system_multi_chooser
-            outputs=[leaderboard_tab, 
-                    # category_analysis_tab,  # Commented out
-                    detailed_scorecard_tab,
-                    system_chooser,
-                    # system_multi_chooser,  # Commented out
-                    leaderboard_output, 
-                    # category_chart,  # Commented out
-                    system_metadata,
-                    all_category_cards, 
-                    total_score]
+            inputs=[tab_selection, model_multi_chooser, model_chooser, category_filter],
+            outputs=[leaderboard_tab, category_analysis_tab, detailed_scorecard_tab,
+                    model_chooser, model_multi_chooser,
+                    leaderboard_output, category_chart, model_metadata,
+                    all_category_cards, total_score]
         )
 
 # Launch the app