Update app.py

app.py

@@ -624,6 +624,7 @@ def get_all_df2(selected_columns, dir=VBENCH2_DIR):
     submission_repo = Repository(local_dir=SUBMISSION_NAME, clone_from=SUBMISSION_URL, use_auth_token=HF_TOKEN, repo_type="dataset")
     submission_repo.git_pull()
     df = pd.read_csv(dir)
+    print(df)
     df = get_final_score2(df, selected_columns)
     df = df.sort_values(by="Total Score", ascending=False)
     return df
@@ -751,13 +752,19 @@ def on_filter_model_size_method_change_long(selected_columns, vbench_team_sample
 def on_filter_model_size_method_change_2(selected_columns=TASK_INFO_2, vbench_team_sample=False, vbench_team_eval=False):
     updated_data = get_all_df2(selected_columns, VBENCH2_DIR)
     print(updated_data)
+    print(vbench_team_sample, vbench_team_eval)
     if vbench_team_sample:
-        updated_data = updated_data[updated_data["Sampled by"] == 'VBench Team']
+        updated_data = updated_data[updated_data["Sampled by"].str.contains('VBench Team')]
     if vbench_team_eval:
-        updated_data = updated_data[updated_data['Evaluated by'] == 'VBench Team']
-   
-    updated_headers = COLUMN_NAMES_2
-    update_datatype = VBENCH2_TITLE_TYPE 
+        updated_data = updated_data[updated_data["Evaluated by"].str.contains('VBench Team')]
+
+    present_columns = VBENCH2_MODEL_INFO_DEFAULT + selected_columns
+    updated_headers = present_columns
+    update_datatype = [VBENCH2_TITLE_TYPE[COLUMN_NAMES_2.index(x)] for x in updated_headers]
+
+    updated_data = updated_data[present_columns]
+    updated_data = convert_scores_to_percentage(updated_data)
+    
     print(updated_data)
     filter_component = gr.components.Dataframe(
         value=updated_data, 
@@ -775,9 +782,9 @@ def on_filter_model_size_method_score_change_2(select_score, vbench_team_sample=
     updated_data = get_all_df2(selected_columns, VBENCH2_DIR)
     print(updated_data)
     if vbench_team_sample:
-        updated_data = updated_data[updated_data["Sampled by"] == 'VBench Team']
+        updated_data = updated_data[updated_data["Sampled by"].str.contains('VBench Team')]
     if vbench_team_eval:
-        updated_data = updated_data[updated_data['Evaluated by'] == 'VBench Team']
+        updated_data = updated_data[updated_data["Evaluated by"].str.contains('VBench Team')]
    
     present_columns = VBENCH2_MODEL_INFO_DEFAULT + [f"{select_score} Score"] + selected_columns
     updated_headers = present_columns
@@ -909,14 +916,14 @@ with block:
                 visible=True,
                 # height=700,
                 )
-            vbench_team_filter_2.change(fn=on_filter_model_size_method_change_2, inputs=[vbench2_checkgroup, vbench_team_filter_2, vbench_validate_filter], outputs=data_component_2)
-            vbench_validate_filter_2.change(fn=on_filter_model_size_method_change_2, inputs=[vbench2_checkgroup, vbench_team_filter_2, vbench_validate_filter], outputs=data_component_2)
+            vbench_team_filter_2.change(fn=on_filter_model_size_method_change_2, inputs=[vbench2_checkgroup, vbench_team_filter_2, vbench_validate_filter_2], outputs=data_component_2)
+            vbench_validate_filter_2.change(fn=on_filter_model_size_method_change_2, inputs=[vbench2_checkgroup, vbench_team_filter_2, vbench_validate_filter_2], outputs=data_component_2)
             # vbench2_checkgroup.change(fn=on_filter_model_size_method_change_2, inputs=[vbench2_checkgroup, vbench_team_filter_2, vbench_validate_filter], outputs=data_component_2)
-            vbench2_creativity_button.click(fn=on_filter_model_size_method_score_change_2, inputs=[gr.State("Creativity"), vbench_team_filter_2, vbench_validate_filter], outputs=[data_component_2, vbench2_checkgroup])
-            vbench2_commonsense_button.click(fn=on_filter_model_size_method_score_change_2, inputs=[gr.State("Commonsense"), vbench_team_filter_2, vbench_validate_filter], outputs=[data_component_2, vbench2_checkgroup])
-            vbench2_control_button.click(fn=on_filter_model_size_method_score_change_2, inputs=[gr.State("Controllability"), vbench_team_filter_2, vbench_validate_filter], outputs=[data_component_2, vbench2_checkgroup])
-            vbench2_human_button.click(fn=on_filter_model_size_method_score_change_2, inputs=[gr.State("Human Fidelity"), vbench_team_filter_2, vbench_validate_filter], outputs=[data_component_2, vbench2_checkgroup])
-            vbench2_physics_button.click(fn=on_filter_model_size_method_score_change_2, inputs=[gr.State("Physics"), vbench_team_filter_2, vbench_validate_filter], outputs=[data_component_2, vbench2_checkgroup])
+            vbench2_creativity_button.click(fn=on_filter_model_size_method_score_change_2, inputs=[gr.State("Creativity"), vbench_team_filter_2, vbench_validate_filter_2], outputs=[data_component_2, vbench2_checkgroup])
+            vbench2_commonsense_button.click(fn=on_filter_model_size_method_score_change_2, inputs=[gr.State("Commonsense"), vbench_team_filter_2, vbench_validate_filter_2], outputs=[data_component_2, vbench2_checkgroup])
+            vbench2_control_button.click(fn=on_filter_model_size_method_score_change_2, inputs=[gr.State("Controllability"), vbench_team_filter_2, vbench_validate_filter_2], outputs=[data_component_2, vbench2_checkgroup])
+            vbench2_human_button.click(fn=on_filter_model_size_method_score_change_2, inputs=[gr.State("Human Fidelity"), vbench_team_filter_2, vbench_validate_filter_2], outputs=[data_component_2, vbench2_checkgroup])
+            vbench2_physics_button.click(fn=on_filter_model_size_method_score_change_2, inputs=[gr.State("Physics"), vbench_team_filter_2, vbench_validate_filter_2], outputs=[data_component_2, vbench2_checkgroup])
 
         with gr.TabItem("Video Quality", elem_id="vbench-tab-table", id=3):
             with gr.Accordion("INSTRUCTION", open=False):