Update app.py

app.py

@@ -315,17 +315,17 @@ with gr.Blocks() as demo_leaderboard:
                     shown_columns_dict[task_type.name] = shown_column
                 with gr.Row():
                     gr.Button("全選択", size="sm").click(
-                        fn=lambda t=task_type.name: toggle_category_columns(t, "all", shown_columns_dict),
-                        outputs=shown_column  # 直接shown_columnを参照
+                        fn=lambda: toggle_all_categories("all", shown_columns_dict),
+                        outputs=[shown_columns_dict[task_type.name] for task_type in TaskType if task_type != TaskType.NotTask]
                     )
                     gr.Button("全解除", size="sm").click(
-                        fn=lambda t=task_type.name: toggle_category_columns(t, "none", shown_columns_dict),
-                        outputs=shown_column  # 直接shown_columnを参照
+                        fn=lambda: toggle_all_categories("none", shown_columns_dict),
+                        outputs=[shown_columns_dict[task_type.name] for task_type in TaskType if task_type != TaskType.NotTask]
                     )
                     gr.Button("AVGのみ", size="sm").click(
-                        fn=lambda t=task_type.name: toggle_category_columns(t, "avg_only", shown_columns_dict),
-                        outputs=shown_column  # 直接shown_columnを参照
-                    )    
+                        fn=lambda: toggle_all_categories("avg_only", shown_columns_dict),
+                        outputs=[shown_columns_dict[task_type.name] for task_type in TaskType if task_type != TaskType.NotTask]
+                    )
                 # with gr.Row(height=110):
                 #     shown_column = gr.CheckboxGroup(
                 #         show_label=False,
@@ -447,27 +447,36 @@ with gr.Blocks() as demo_leaderboard:
     # Check query parameter once at startup and update search bar + hidden component
     demo_leaderboard.load(fn=load_query, outputs=[search_bar, hidden_search_bar])
 
-def toggle_category_columns(task_type: str, action: str, shown_columns_dict: dict):
-    """カテゴリーごとのチェックボックスを制御する関数"""
-    columns = [
-        c.name for c in fields(AutoEvalColumn)
-        if not c.hidden and not c.never_hidden and not c.dummy 
-        and c.task_type.name == task_type
-    ]
-    
-    if action == "all":
-        return columns
-    elif action == "none":
-        return []
-    elif action == "avg_only":
-        if task_type == TaskType.AVG.name:
-            return columns  # 全体AVGの場合
-        return [
-            c.name for c in fields(AutoEvalColumn)
-            if not c.hidden and not c.never_hidden and c.average 
-            and c.task_type.name == task_type  # カテゴリー別AVGの場合
+def toggle_all_categories(action: str, shown_columns_dict: dict):
+    """全カテゴリーのチェックボックスを一括制御する関数"""
+    results = {}
+    for task_type in TaskType:
+        if task_type == TaskType.NotTask:
+            continue
+            
+        columns = [
+            c.name
+            for c in fields(AutoEvalColumn)
+            if not c.hidden and not c.never_hidden and not c.dummy and c.task_type == task_type
         ]
-
+        
+        if action == "all":
+            results[task_type.name] = columns
+        elif action == "none":
+            results[task_type.name] = []
+        elif action == "avg_only":
+            results[task_type.name] = [
+                c.name
+                for c in fields(AutoEvalColumn)
+                if not c.hidden and not c.never_hidden 
+                and c.task_type == task_type
+                and (
+                    (task_type == TaskType.AVG) or  # AVGカテゴリの場合は全て
+                    (task_type != TaskType.AVG and c.average)  # その他のカテゴリはAVGのみ
+                )
+            ]
+    
+    return [results[task_type.name] for task_type in TaskType if task_type != TaskType.NotTask]
 
 # Submission demo