fix

app.py

@@ -98,9 +98,33 @@ detailed_success_rate_df = prep_detailed_success_rate_df()
 detailed_action_counts_df = prep_detailed_action_counts_df()
 
 # Function to update the table based on search query
-def filter_and_search(cols: list[str], search_query: str, df, agg: str,):
+def filter_and_search_success_rate(cols: list[str], search_query: str, agg: str,):
     # print("filter")
-    df = df
+    df = detailed_success_rate_df
+    search_terms = "Model"
+    if len(search_query) > 0:
+        search_terms = search_query.split(";")
+        search_terms = [term.strip().lower() for term in search_terms]
+        pattern = "|".join(search_terms)
+        df = df[df["Model"].str.lower().str.contains(pattern, regex=True)]
+        # Drop any columns which are all NaN
+        df = df.dropna(how="all", axis=1)
+
+    if len(cols) > 0:
+        index_cols = list(leaderboard_df.columns[:1])
+        new_cols = index_cols + cols
+        df = df.copy()[new_cols]
+        df = df.copy().dropna(how="all", axis=0, subset=[c for c in df.columns if c in cols])
+
+        df[cols] = df[cols].apply(pd.to_numeric, errors='coerce')
+        df = df.sort_values(by=cols, ascending=False, na_position='last')
+        df[cols] = df[cols].astype(str)
+    return df
+
+# Function to update the table based on search query
+def filter_and_search_action_counts(cols: list[str], search_query: str, agg: str,):
+    # print("filter")
+    df = detailed_action_counts_df
     search_terms = "Model"
     if len(search_query) > 0:
         search_terms = search_query.split(";")
@@ -164,8 +188,8 @@ with demo:
                     wrap=True,
                     column_widths=[350, 120] + [(150 + len(c)) for c in detailed_success_rate_df.columns[2:]],
                 )
-                cols_bar.change(filter_and_search, inputs=[cols_bar, search_bar, detailed_success_rate_table], outputs=[detailed_success_rate_table])
-                search_bar.submit(filter_and_search, inputs=[cols_bar, search_bar, detailed_success_rate_table], outputs=[detailed_success_rate_table])
+                cols_bar.change(filter_and_search_success_rate, inputs=[cols_bar, search_bar], outputs=[detailed_success_rate_table])
+                search_bar.submit(filter_and_search_success_rate, inputs=[cols_bar, search_bar], outputs=[detailed_success_rate_table])
         
         with gr.TabItem("Action Counts - Detailed"):
             with gr.Column():
@@ -183,8 +207,8 @@ with demo:
                     wrap=True,
                     column_widths=[350, 120] + [(100 + len(c)) for c in detailed_action_counts_df.columns[2:]],
                 )
-                cols_bar_1.change(filter_and_search, inputs=[cols_bar_1, search_bar_1, detailed_action_counts_table], outputs=[detailed_action_counts_table])
-                search_bar_1.submit(filter_and_search, inputs=[cols_bar_1, search_bar_1, detailed_action_counts_table], outputs=[detailed_action_counts_table])
+                cols_bar_1.change(filter_and_search_action_counts, inputs=[cols_bar_1, search_bar_1], outputs=[detailed_action_counts_table])
+                search_bar_1.submit(filter_and_search_action_counts, inputs=[cols_bar_1, search_bar_1], outputs=[detailed_action_counts_table])
         
         with gr.TabItem("About"):
             gr.Markdown(ABOUT)