Update app.py

app.py

@@ -82,10 +82,7 @@ def update_table(
     print(f"Update table called with: type_query={type_query}, precision_query={precision_query}, size_query={size_query}")
     print(f"hidden_df shape before filtering: {hidden_df.shape}")
     
-    filtered_df = filter_models(
-        hidden_df, type_query, size_query, precision_query, add_special_tokens_query, 
-        num_few_shots_query, show_deleted, show_merges, show_flagged, columns
-    )
+    filtered_df = filter_models(hidden_df, type_query, size_query, precision_query, add_special_tokens_query, num_few_shots_query, show_deleted, show_merges, show_flagged)
     print(f"filtered_df shape after filter_models: {filtered_df.shape}")
     
     filtered_df = filter_queries(query, filtered_df)
@@ -95,8 +92,11 @@ def update_table(
     print("Filtered dataframe head:")
     print(filtered_df.head())
 
-    return filtered_df
-
+    df = select_columns(filtered_df, columns)
+    print(f"Final df shape: {df.shape}")
+    print("Final dataframe head:")
+    print(df.head())
+    return df
 
 
 def load_query(request: gr.Request):  # triggered only once at startup => read query parameter if it exists
@@ -141,9 +141,7 @@ def filter_queries(query: str, filtered_df: pd.DataFrame):
 
 
 def filter_models(
-    df: pd.DataFrame, type_query: list, size_query: list, precision_query: list, 
-    add_special_tokens_query: list, num_few_shots_query: list, show_deleted: bool, 
-    show_merges: bool, show_flagged: bool, shown_columns: list
+    df: pd.DataFrame, type_query: list, size_query: list, precision_query: list, add_special_tokens_query: list, num_few_shots_query: list, show_deleted: bool, show_merges: bool, show_flagged: bool
 ) -> pd.DataFrame:
     print(f"Initial df shape: {df.shape}")
     print(f"Initial df content:\n{df}")
@@ -163,7 +161,7 @@ def filter_models(
     if 'Unknown' in size_query:
         size_mask = filtered_df['#Params (B)'].isna() | (filtered_df['#Params (B)'] == 0)
     else:
-        size_mask = filtered_df['#Params (B)'].apply(lambda x: any(pd.Interval(NUMERIC_INTERVALS[s].left, NUMERIC_INTERVALS[s].right).contains(x) for s in size_query if s != 'Unknown'))
+        size_mask = filtered_df['#Params (B)'].apply(lambda x: any(x in NUMERIC_INTERVALS[s] for s in size_query if s != 'Unknown'))
     filtered_df = filtered_df[size_mask]
     print(f"After size filter: {filtered_df.shape}")
 
@@ -180,31 +178,11 @@ def filter_models(
         filtered_df = filtered_df[filtered_df['Available on the hub'] == True]
     print(f"After show_deleted filter: {filtered_df.shape}")
 
-    # 選択された列のみを表示
-    filtered_df = filtered_df[['T', 'Model'] + [col for col in shown_columns if col in filtered_df.columns]]
-
     print("Filtered dataframe head:")
     print(filtered_df.head())
     return filtered_df
 
-initial_shown_columns = [
-    c.name
-    for c in fields(AutoEvalColumn)
-    if c.displayed_by_default and not c.hidden and not c.never_hidden and c.name not in ['Type', 'Architecture', 'Precision', 'Hub License', '#Params (B)', 'Hub ❤️', 'Available on the hub', 'Model sha', 'Add Special Tokens']
-]
-
-leaderboard_df = 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_shown_columns
-)
+leaderboard_df = 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)
 
 demo = gr.Blocks(css=custom_css)
 with demo:
@@ -223,16 +201,20 @@ with demo:
                         )
                     with gr.Row():
                         shown_columns = gr.CheckboxGroup(
-                        choices=[
-                            c.name
-                            for c in fields(AutoEvalColumn)
-                            if not c.hidden and not c.never_hidden and c.name not in ['Type', 'Architecture', 'Precision', 'Hub License', '#Params (B)', 'Hub ❤️', 'Available on the hub', 'Model sha', 'Add Special Tokens']
-                        ],
-                        value=initial_shown_columns,  
-                        label="Select columns to show",
-                        elem_id="column-select",
-                        interactive=True,
-                    )
+                            choices=[
+                                c.name
+                                for c in fields(AutoEvalColumn)
+                                if not c.hidden and not c.never_hidden# and not c.dummy
+                            ],
+                            value=[
+                                c.name
+                                for c in fields(AutoEvalColumn)
+                                if c.displayed_by_default and not c.hidden and not c.never_hidden
+                            ],
+                            label="Select columns to show",
+                            elem_id="column-select",
+                            interactive=True,
+                        )
                     with gr.Row():
                         deleted_models_visibility = gr.Checkbox(
                             value=False, label="Show private/deleted models", interactive=True