Update app.py

app.py

@@ -105,24 +105,16 @@ def search_table(df: pd.DataFrame, query: str) -> pd.DataFrame:
     return df[(df[AutoEvalColumn.dummy.name].str.contains(query, case=False))]
 
 
-# def select_columns(df: pd.DataFrame, columns: list) -> pd.DataFrame:
-#     always_here_cols = [
-#         AutoEvalColumn.model_type_symbol.name,
-#         AutoEvalColumn.model.name,
-#     ]
-#     # We use COLS to maintain sorting
-#     filtered_df = df[
-#         always_here_cols + [c for c in COLS if c in df.columns and c in columns]# + [AutoEvalColumn.dummy.name]
-#     ]
-#     return filtered_df
-
 def select_columns(df: pd.DataFrame, columns: list) -> pd.DataFrame:
     always_here_cols = [
         AutoEvalColumn.model_type_symbol.name,
         AutoEvalColumn.model.name,
     ]
-    selected_cols = list(dict.fromkeys(always_here_cols + [c for c in COLS if c in df.columns and c in columns]))
-    return df[selected_cols]
+    # We use COLS to maintain sorting
+    filtered_df = df[
+        always_here_cols + [c for c in COLS if c in df.columns and c in columns]# + [AutoEvalColumn.dummy.name]
+    ]
+    return filtered_df
 
 def filter_queries(query: str, filtered_df: pd.DataFrame):
     """Added by Abishek"""
@@ -268,8 +260,8 @@ with demo:
                     )
 
             leaderboard_df_filtered = filter_models(leaderboard_df, [t.to_str(" : ") for t in ModelType], list(NUMERIC_INTERVALS.keys()), [i.value.name for i in Precision], [i.value.name for i in AddSpecialTokens], [i.value.name for i in NumFewShots], False, False, False)
-            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_filtered, initial_columns)
+            # 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_filtered, initial_columns)
 
             # leaderboard_table = gr.components.Dataframe(
             #     value=leaderboard_df_filtered,
@@ -280,12 +272,18 @@ with demo:
             #     visible=True,
             # )
 
+            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)
             
-            datatype_dict = {col: "markdown" if col == "Model" else "str" for col in leaderboard_df_filtered.columns}
+            # datatypeを準備
+            datatype_dict = {col: TYPES.get(col, "str") for col in leaderboard_df_filtered.columns}
+            datatype_dict["Model"] = "markdown"  # Modelカラムのみmarkdownとして扱う
             
+            # leaderboard_tableの初期化
             leaderboard_table = gr.components.Dataframe(
-                value=leaderboard_df_filtered.to_dict('records'),  # DataFrame を辞書のリストに変換
+                value=leaderboard_df_filtered.to_dict('records'),
                 headers=list(leaderboard_df_filtered.columns),
                 datatype=datatype_dict,
                 elem_id="leaderboard-table",