Update app.py

app.py

@@ -118,15 +118,22 @@ def search_table(df: pd.DataFrame, query: str) -> pd.DataFrame:
 
 def select_columns(df: pd.DataFrame, columns: list) -> pd.DataFrame:
     always_here_cols = [
-        AutoEvalColumn.model_type_symbol.name,
-        AutoEvalColumn.model.name,
+        AutoEvalColumn.model_type_symbol.name,  # 'T'
+        AutoEvalColumn.model.name,              # 'Model'
     ]
-    # always_here_cols が既に columns に含まれている場合は除外
+    # 'always_here_cols' を 'columns' から除外して重複を避ける
     columns = [c for c in columns if c not in always_here_cols]
-    # COLS の順序を維持しつつ、重複を避けてカラムを選択
-    filtered_df = df[
-        always_here_cols + [c for c in COLS if c in df.columns and c in columns]
-    ]
+    # 'always_here_cols' を先頭に追加し、その他のカラムを COLS の順序で追加
+    new_columns = always_here_cols + [c for c in COLS if c in df.columns and c in columns]
+    # 重複を排除しつつ順序を維持
+    seen = set()
+    unique_columns = []
+    for c in new_columns:
+        if c not in seen:
+            unique_columns.append(c)
+            seen.add(c)
+    # フィルタリングされたカラムでデータフレームを作成
+    filtered_df = df[unique_columns]
     return filtered_df
 
 def filter_queries(query: str, filtered_df: pd.DataFrame):
@@ -288,19 +295,30 @@ with demo:
             initial_columns = [c.name for c in fields(AutoEvalColumn) if c.never_hidden or c.displayed_by_default]
             leaderboard_df_filtered = select_columns(leaderboard_df, initial_columns)
             
-            print("Columns in leaderboard_df_filtered:", leaderboard_df_filtered.columns)
-            # データ型を定義するための辞書
+            # 重複カラムの確認と削除
+            duplicate_columns = leaderboard_df_filtered.columns[leaderboard_df_filtered.columns.duplicated()]
+            if len(duplicate_columns) > 0:
+                print(f"Duplicate columns found: {duplicate_columns.tolist()}")
+                # 重複カラムを削除（最初の出現を保持）
+                leaderboard_df_filtered = leaderboard_df_filtered.loc[:, ~leaderboard_df_filtered.columns.duplicated()]
+                print("Duplicate columns have been removed.")
+            else:
+                print("No duplicate columns found.")
+            
+            # データ型を定義
             datatype_dict = {}
             for col in leaderboard_df_filtered.columns:
-                if col == 'Model':
+                if col == AutoEvalColumn.model.name:  # 'Model'
                     datatype_dict[col] = "markdown"
                 elif col in TYPES:
                     datatype_dict[col] = TYPES[col]
                 else:
-                    datatype_dict[col] = "str"
-
+                    datatype_dict[col] = "str"  # デフォルトのデータ型
+            
+            # デバッグ用出力
+            print("Datatype dictionary:", datatype_dict)
             
-            # leaderboard_tableの初期化
+            # Gradio Dataframe コンポーネントの初期化
             leaderboard_table = gr.components.Dataframe(
                 value=leaderboard_df_filtered.to_dict('records'),
                 headers=list(leaderboard_df_filtered.columns),