update

app.py

@@ -103,13 +103,11 @@ def update_table(
     hidden_df: pd.DataFrame,
     columns: list,
     query: str,
-    allcolumns: list,
-    allcols: list,
 ):
     print("query", query)
     #filtered_df = filter_models(df=hidden_df, type_query=type_query, size_query=size_query, precision_query=precision_query, hide_models=hide_models)
-    filtered_df = filter_queries(query, hidden_df,allcolums)
-    df = select_columns(filtered_df, columns, allcolumns, allcols)
+    filtered_df = filter_queries(query, hidden_df)
+    df = select_columns(filtered_df, columns)
     return df
 
 
@@ -122,19 +120,19 @@ 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, allcolumns=AutoEvalColumn, ALLCOLS=COLS) -> pd.DataFrame:
-    always_here_cols = [c.name for c in fields(allcolumns) if c.never_hidden]
-    dummy_col = [allcolumns.dummy.name]
+def select_columns(df: pd.DataFrame, columns: list) -> pd.DataFrame:
+    always_here_cols = [c.name for c in fields(AutoEvalColumn) if c.never_hidden]
+    dummy_col = [AutoEvalColumn.dummy.name]
         #AutoEvalColumn.model_type_symbol.name,
         #AutoEvalColumn.model.name,
     # We use COLS to maintain sorting
     filtered_df = df[
-        always_here_cols + [c for c in ALLCOLS if c in df.columns and c in columns] + dummy_col
+        always_here_cols + [c for c in COLS if c in df.columns and c in columns] + dummy_col
     ]
     return filtered_df
 
 
-def filter_queries(query: str, filtered_df: pd.DataFrame, allcolumns):
+def filter_queries(query: str, filtered_df: pd.DataFrame):
     """Added by Abishek"""
     final_df = []
     if query != "":
@@ -148,11 +146,53 @@ def filter_queries(query: str, filtered_df: pd.DataFrame, allcolumns):
         if len(final_df) > 0:
             filtered_df = pd.concat(final_df)
             filtered_df = filtered_df.drop_duplicates(
-                subset=[allcolumns.model.name, allcolumns.precision.name, allcolumns.revision.name]
+                subset=[AutoEvalColumn.model.name, AutoEvalColumn.precision.name, AutoEvalColumn.revision.name]
             )
 
     return filtered_df
 
+def update_table_q(
+    hidden_df: pd.DataFrame,
+    columns: list,
+    query: str,
+):
+    filtered_df = filter_queriesq(query, hidden_df)
+    df = select_columnsq(filtered_df, columns)
+    return df
+
+
+def search_tableq(df: pd.DataFrame, query: str) -> pd.DataFrame:
+    return df[(df[AutoEvalColumnQuota.dummy.name].str.contains(query, case=False))]
+
+
+def select_columnsq(df: pd.DataFrame, columns: list) -> pd.DataFrame:
+    always_here_cols = [c.name for c in fields(AutoEvalColumnQuota) if c.never_hidden]
+    dummy_col = [AutoEvalColumnQuota.dummy.name]
+    # We use COLS to maintain sorting
+    filtered_df = df[
+        always_here_cols + [c for c in QUOTACOLS if c in df.columns and c in columns] + dummy_col
+    ]
+    return filtered_df
+
+
+def filter_queriesq(query: str, filtered_df: pd.DataFrame):
+    """Added by Abishek"""
+    final_df = []
+    if query != "":
+        queries = [q.strip() for q in query.split(";")]
+        for _q in queries:
+            _q = _q.strip()
+            if _q != "":
+                temp_filtered_df = search_tableq(filtered_df, _q)
+                if len(temp_filtered_df) > 0:
+                    final_df.append(temp_filtered_df)
+        if len(final_df) > 0:
+            filtered_df = pd.concat(final_df)
+            filtered_df = filtered_df.drop_duplicates(
+                subset=[AutoEvalColumnQuota.model.name, AutoEvalColumnQuota.precision.name, AutoEvalColumnQuota.revision.name]
+            )
+
+    return filtered_df
 
 def filter_models(
     df: pd.DataFrame, type_query: list, size_query: list, precision_query: list, hide_models: list
@@ -284,13 +324,7 @@ with demo:
                 [
                     hidden_leaderboard_table_for_search,
                     shown_columns,
-                    #filter_columns_type,
-                    #filter_columns_precision,
-                    #filter_columns_size,
-                    #hide_models,
                     search_bar,
-                    AutoEvalColumn,
-                    COLS,
                 ],
                 leaderboard_table,
             )
@@ -302,13 +336,7 @@ with demo:
                 [
                     hidden_leaderboard_table_for_search,
                     shown_columns,
-                    #filter_columns_type,
-                    #filter_columns_precision,
-                    #filter_columns_size,
-                    #hide_models,
                     search_bar,
-                    AutoEvalColumn,
-                    COLS,
                 ],
                 leaderboard_table,
             )
@@ -322,13 +350,7 @@ with demo:
                     [
                         hidden_leaderboard_table_for_search,
                         shown_columns,
-                        #filter_columns_type,
-                        #filter_columns_precision,
-                        #filter_columns_size,
-                        #hide_models,
                         search_bar,
-                        AutoEvalColumn,
-                        COLS,
                     ],
                     leaderboard_table,
                     queue=True,
@@ -415,17 +437,11 @@ with demo:
                 visible=False,
             )
             search_bar.submit(
-                update_table,
+                update_table_q,
                 [
                     hidden_leaderboard_table_for_search,
                     shown_columns,
-                    #filter_columns_type,
-                    #filter_columns_precision,
-                    #filter_columns_size,
-                    #hide_models,
                     search_bar,
-                    AutoEvalColumnQuota,
-                    QUOTACOLS,
                 ],
                 leaderboard_table,
             )
@@ -433,17 +449,11 @@ with demo:
             # Define a hidden component that will trigger a reload only if a query parameter has been set
             hidden_search_bar = gr.Textbox(value="", visible=False)
             hidden_search_bar.change(
-                update_table,
+                update_table_q,
                 [
                     hidden_leaderboard_table_for_search,
                     shown_columns,
-                    #filter_columns_type,
-                    #filter_columns_precision,
-                    #filter_columns_size,
-                    #hide_models,
                     search_bar,
-                    AutoEvalColumnQuota,
-                    QUOTACOLS,
                 ],
                 leaderboard_table,
             )
@@ -453,17 +463,11 @@ with demo:
             #for selector in [shown_columns, filter_columns_type, filter_columns_precision, filter_columns_size, hide_models]:
             for selector in [shown_columns]:#, filter_columns_type, filter_columns_precision, filter_columns_size]: #, hide_models]:
                 selector.change(
-                    update_table,
+                    update_table_q,
                     [
                         hidden_leaderboard_table_for_search,
                         shown_columns,
-                        #filter_columns_type,
-                        #filter_columns_precision,
-                        #filter_columns_size,
-                        #hide_models,
                         search_bar,
-                        AutoEvalColumnQuota,
-                        QUOTACOLS,
                     ],
                     leaderboard_table,
                     queue=True,