Update app.py

app.py

@@ -221,59 +221,59 @@ def main():
         with gr.Tabs():
             with gr.Tab("Leaderboard"):
                 with gr.Tabs():
-                    with gr.Tab("3C3H Scores"):
+                    with gr.Tab("Tasks Scores"):
+                        gr.Markdown("""
+                                    Note: This Table is sorted based on the First Task
+                                    """)
+                        
                         with gr.Row():
-                            search_box_3c3h = gr.Textbox(
+                            search_box_tasks = gr.Textbox(
                                 placeholder="Search for models...", 
                                 label="Search", 
                                 interactive=True
                             )
                         with gr.Row():
-                            column_selector_3c3h = gr.CheckboxGroup(
-                                choices=column_choices_3c3h,
-                                value=[
-                                    'Rank', 'Model Name', '3C3H Score', 'Correctness', 'Completeness',
-                                    'Conciseness', 'Helpfulness', 'Honesty', 'Harmlessness'
-                                ],
+                            column_selector_tasks = gr.CheckboxGroup(
+                                choices=column_choices_tasks,
+                                value=['Rank', 'Model Name'] + task_columns,
                                 label="Select columns to display",
                             )
                         with gr.Row():
-                            license_filter_3c3h = gr.CheckboxGroup(
-                                choices=license_options_3c3h,
-                                value=license_options_3c3h.copy(),  # Default all selected
+                            license_filter_tasks = gr.CheckboxGroup(
+                                choices=license_options_tasks,
+                                value=license_options_tasks.copy(),  # Default all selected
                                 label="Filter by License",
                             )
-                            precision_filter_3c3h = gr.CheckboxGroup(
-                                choices=precision_options_3c3h,
-                                value=precision_options_3c3h.copy(),  # Default all selected
+                            precision_filter_tasks = gr.CheckboxGroup(
+                                choices=precision_options_tasks,
+                                value=precision_options_tasks.copy(),  # Default all selected
                                 label="Filter by Precision",
                             )
                         with gr.Row():
-                            model_size_min_filter_3c3h = gr.Slider(
-                                minimum=min_model_size_3c3h,
-                                maximum=max_model_size_3c3h,
-                                value=min_model_size_3c3h,
+                            model_size_min_filter_tasks = gr.Slider(
+                                minimum=min_model_size_tasks,
+                                maximum=max_model_size_tasks,
+                                value=min_model_size_tasks,
                                 step=1,
                                 label="Minimum Model Size",
                                 interactive=True
                             )
-                            model_size_max_filter_3c3h = gr.Slider(
-                                minimum=min_model_size_3c3h,
-                                maximum=max_model_size_3c3h,
-                                value=max_model_size_3c3h,
+                            model_size_max_filter_tasks = gr.Slider(
+                                minimum=min_model_size_tasks,
+                                maximum=max_model_size_tasks,
+                                value=max_model_size_tasks,
                                 step=1,
                                 label="Maximum Model Size",
                                 interactive=True
                             )
                         
-                        leaderboard_3c3h = gr.Dataframe(
-                            df_3c3h[['Rank', 'Model Name', '3C3H Score', 'Correctness', 'Completeness',
-                                      'Conciseness', 'Helpfulness', 'Honesty', 'Harmlessness']],
+                        leaderboard_tasks = gr.Dataframe(
+                            df_tasks[['Rank', 'Model Name'] + task_columns],
                             interactive=False
                         )
                         
-                        def filter_df_3c3h(search_query, selected_cols, precision_filters, license_filters, min_size, max_size):
-                            filtered_df = df_3c3h.copy()
+                        def filter_df_tasks(search_query, selected_cols, precision_filters, license_filters, min_size, max_size):
+                            filtered_df = df_tasks.copy()
                             
                             # Ensure min_size <= max_size
                             if min_size > max_size:
@@ -319,6 +319,13 @@ def main():
                             if 'Rank' in filtered_df.columns:
                                 filtered_df = filtered_df.drop(columns=['Rank'])
                             
+                            # Sort by the first task column if it exists
+                            if task_columns:
+                                first_task = task_columns[0]
+                                filtered_df = filtered_df.sort_values(by=first_task, ascending=False)
+                            else:
+                                filtered_df = filtered_df.sort_values(by='Model Name', ascending=True)
+                            
                             # Recalculate Rank after filtering
                             filtered_df = filtered_df.reset_index(drop=True)
                             filtered_df.insert(0, 'Rank', range(1, len(filtered_df) + 1))
@@ -329,81 +336,80 @@ def main():
                             return filtered_df[selected_cols]
                         
                         # Bind the filter function to the appropriate events
-                        filter_inputs_3c3h = [
-                            search_box_3c3h,
-                            column_selector_3c3h,
-                            precision_filter_3c3h,
-                            license_filter_3c3h,
-                            model_size_min_filter_3c3h,
-                            model_size_max_filter_3c3h
+                        filter_inputs_tasks = [
+                            search_box_tasks,
+                            column_selector_tasks,
+                            precision_filter_tasks,
+                            license_filter_tasks,
+                            model_size_min_filter_tasks,
+                            model_size_max_filter_tasks
                         ]
-                        search_box_3c3h.submit(
-                            filter_df_3c3h,
-                            inputs=filter_inputs_3c3h,
-                            outputs=leaderboard_3c3h
+                        search_box_tasks.submit(
+                            filter_df_tasks,
+                            inputs=filter_inputs_tasks,
+                            outputs=leaderboard_tasks
                         )
                         
                         # Bind change events for CheckboxGroups and sliders
-                        for component in filter_inputs_3c3h:
+                        for component in filter_inputs_tasks:
                             component.change(
-                                filter_df_3c3h,
-                                inputs=filter_inputs_3c3h,
-                                outputs=leaderboard_3c3h
+                                filter_df_tasks,
+                                inputs=filter_inputs_tasks,
+                                outputs=leaderboard_tasks
                             )
-                    
-                    with gr.Tab("Tasks Scores"):
-                        gr.Markdown("""
-                                    Note: This Table is sorted based on the First Task
-                                    """)
-                        
+                    with gr.Tab("3C3H Scores"):
                         with gr.Row():
-                            search_box_tasks = gr.Textbox(
+                            search_box_3c3h = gr.Textbox(
                                 placeholder="Search for models...", 
                                 label="Search", 
                                 interactive=True
                             )
                         with gr.Row():
-                            column_selector_tasks = gr.CheckboxGroup(
-                                choices=column_choices_tasks,
-                                value=['Rank', 'Model Name'] + task_columns,
+                            column_selector_3c3h = gr.CheckboxGroup(
+                                choices=column_choices_3c3h,
+                                value=[
+                                    'Rank', 'Model Name', '3C3H Score', 'Correctness', 'Completeness',
+                                    'Conciseness', 'Helpfulness', 'Honesty', 'Harmlessness'
+                                ],
                                 label="Select columns to display",
                             )
                         with gr.Row():
-                            license_filter_tasks = gr.CheckboxGroup(
-                                choices=license_options_tasks,
-                                value=license_options_tasks.copy(),  # Default all selected
+                            license_filter_3c3h = gr.CheckboxGroup(
+                                choices=license_options_3c3h,
+                                value=license_options_3c3h.copy(),  # Default all selected
                                 label="Filter by License",
                             )
-                            precision_filter_tasks = gr.CheckboxGroup(
-                                choices=precision_options_tasks,
-                                value=precision_options_tasks.copy(),  # Default all selected
+                            precision_filter_3c3h = gr.CheckboxGroup(
+                                choices=precision_options_3c3h,
+                                value=precision_options_3c3h.copy(),  # Default all selected
                                 label="Filter by Precision",
                             )
                         with gr.Row():
-                            model_size_min_filter_tasks = gr.Slider(
-                                minimum=min_model_size_tasks,
-                                maximum=max_model_size_tasks,
-                                value=min_model_size_tasks,
+                            model_size_min_filter_3c3h = gr.Slider(
+                                minimum=min_model_size_3c3h,
+                                maximum=max_model_size_3c3h,
+                                value=min_model_size_3c3h,
                                 step=1,
                                 label="Minimum Model Size",
                                 interactive=True
                             )
-                            model_size_max_filter_tasks = gr.Slider(
-                                minimum=min_model_size_tasks,
-                                maximum=max_model_size_tasks,
-                                value=max_model_size_tasks,
+                            model_size_max_filter_3c3h = gr.Slider(
+                                minimum=min_model_size_3c3h,
+                                maximum=max_model_size_3c3h,
+                                value=max_model_size_3c3h,
                                 step=1,
                                 label="Maximum Model Size",
                                 interactive=True
                             )
                         
-                        leaderboard_tasks = gr.Dataframe(
-                            df_tasks[['Rank', 'Model Name'] + task_columns],
+                        leaderboard_3c3h = gr.Dataframe(
+                            df_3c3h[['Rank', 'Model Name', '3C3H Score', 'Correctness', 'Completeness',
+                                      'Conciseness', 'Helpfulness', 'Honesty', 'Harmlessness']],
                             interactive=False
                         )
                         
-                        def filter_df_tasks(search_query, selected_cols, precision_filters, license_filters, min_size, max_size):
-                            filtered_df = df_tasks.copy()
+                        def filter_df_3c3h(search_query, selected_cols, precision_filters, license_filters, min_size, max_size):
+                            filtered_df = df_3c3h.copy()
                             
                             # Ensure min_size <= max_size
                             if min_size > max_size:
@@ -449,13 +455,6 @@ def main():
                             if 'Rank' in filtered_df.columns:
                                 filtered_df = filtered_df.drop(columns=['Rank'])
                             
-                            # Sort by the first task column if it exists
-                            if task_columns:
-                                first_task = task_columns[0]
-                                filtered_df = filtered_df.sort_values(by=first_task, ascending=False)
-                            else:
-                                filtered_df = filtered_df.sort_values(by='Model Name', ascending=True)
-                            
                             # Recalculate Rank after filtering
                             filtered_df = filtered_df.reset_index(drop=True)
                             filtered_df.insert(0, 'Rank', range(1, len(filtered_df) + 1))
@@ -466,28 +465,28 @@ def main():
                             return filtered_df[selected_cols]
                         
                         # Bind the filter function to the appropriate events
-                        filter_inputs_tasks = [
-                            search_box_tasks,
-                            column_selector_tasks,
-                            precision_filter_tasks,
-                            license_filter_tasks,
-                            model_size_min_filter_tasks,
-                            model_size_max_filter_tasks
+                        filter_inputs_3c3h = [
+                            search_box_3c3h,
+                            column_selector_3c3h,
+                            precision_filter_3c3h,
+                            license_filter_3c3h,
+                            model_size_min_filter_3c3h,
+                            model_size_max_filter_3c3h
                         ]
-                        search_box_tasks.submit(
-                            filter_df_tasks,
-                            inputs=filter_inputs_tasks,
-                            outputs=leaderboard_tasks
+                        search_box_3c3h.submit(
+                            filter_df_3c3h,
+                            inputs=filter_inputs_3c3h,
+                            outputs=leaderboard_3c3h
                         )
                         
                         # Bind change events for CheckboxGroups and sliders
-                        for component in filter_inputs_tasks:
+                        for component in filter_inputs_3c3h:
                             component.change(
-                                filter_df_tasks,
-                                inputs=filter_inputs_tasks,
-                                outputs=leaderboard_tasks
+                                filter_df_3c3h,
+                                inputs=filter_inputs_3c3h,
+                                outputs=leaderboard_3c3h
                             )
-            
+
             with gr.Tab("About"):
                 gr.Markdown(ABOUT_SECTION)
             with gr.Row():
@@ -499,6 +498,7 @@ def main():
                         elem_id="citation-button",
                         show_copy_button=True,
                     )
+
     demo.launch()
 
 if __name__ == "__main__":