fix-reranking-0514 (#2)

- fix: fix the ranking resetting issue (0531c42eec8ad47421b5c2eae51fa325e8334eac)
- chore: clean up (472ecbda7ceabfb795535aa1ce9532f1935f22ab)

app.py

@@ -74,6 +74,28 @@ def update_metric_long_doc(
     return update_metric(raw_data, "long-doc", metric, domains, langs, reranking_model, query, show_anonymous)
 
 
+def update_table_without_ranking(
+        hidden_df,
+        domains,
+        langs,
+        reranking_query,
+        query,
+        show_anonymous
+):
+    return update_table(hidden_df, domains, langs, reranking_query, query, show_anonymous, reset_ranking=False)
+
+
+def update_table_without_ranking_long_doc(
+        hidden_df,
+        domains,
+        langs,
+        reranking_query,
+        query,
+        show_anonymous
+):
+    return update_table_long_doc(hidden_df, domains, langs, reranking_query, query, show_anonymous, reset_ranking=False)
+
+
 demo = gr.Blocks(css=custom_css)
 with demo:
     gr.HTML(TITLE)
@@ -153,7 +175,20 @@ with demo:
 
             # Set search_bar listener
             search_bar.submit(
-                update_table,
+                update_table_without_ranking,
+                [
+                    hidden_leaderboard_table_for_search,
+                    selected_domains,
+                    selected_langs,
+                    selected_rerankings,
+                    search_bar,
+                    show_anonymous,
+                ],
+                leaderboard_table,
+            )
+
+            selected_rerankings.change(
+                update_table_without_ranking,
                 [
                     hidden_leaderboard_table_for_search,
                     selected_domains,
@@ -167,7 +202,7 @@ with demo:
 
             # Set column-wise listener
             for selector in [
-                selected_domains, selected_langs, selected_rerankings, show_anonymous
+                selected_domains, selected_langs, show_anonymous
             ]:
                 selector.change(
                     update_table,
@@ -271,7 +306,20 @@ with demo:
 
             # Set search_bar listener
             search_bar.submit(
-                update_table_long_doc,
+                update_table_without_ranking_long_doc,
+                [
+                    hidden_leaderboard_table_for_search,
+                    selected_domains,
+                    selected_langs,
+                    selected_rerankings,
+                    search_bar,
+                    show_anonymous,
+                ],
+                leaderboard_table_long_doc,
+            )
+
+            selected_rerankings.change(
+                update_table_without_ranking_long_doc,
                 [
                     hidden_leaderboard_table_for_search,
                     selected_domains,
@@ -285,7 +333,7 @@ with demo:
 
             # Set column-wise listener
             for selector in [
-                selected_domains, selected_langs, selected_rerankings, show_anonymous
+                selected_domains, selected_langs, show_anonymous
             ]:
                 selector.change(
                     update_table_long_doc,

src/utils.py

@@ -92,7 +92,13 @@ FIXED_COLS = [c.name for _, _, c in fixed_cols]
 FIXED_COLS_TYPES = [c.type for _, _, c in fixed_cols]
 
 
-def select_columns(df: pd.DataFrame, domain_query: list, language_query: list, task: str = "qa") -> pd.DataFrame:
+def select_columns(
+        df: pd.DataFrame,
+        domain_query: list,
+        language_query: list,
+        task: str = "qa",
+        reset_ranking: bool = True
+) -> pd.DataFrame:
     cols, _ = get_default_cols(task=task, columns=df.columns, add_fix_cols=False)
     selected_cols = []
     for c in cols:
@@ -110,25 +116,41 @@ def select_columns(df: pd.DataFrame, domain_query: list, language_query: list, t
     filtered_df[COL_NAME_AVG] = filtered_df[selected_cols].apply(calculate_mean, axis=1).round(decimals=2)
     filtered_df.sort_values(by=[COL_NAME_AVG], ascending=False, inplace=True)
     filtered_df.reset_index(inplace=True, drop=True)
-    filtered_df[COL_NAME_RANK] = filtered_df[COL_NAME_AVG].rank(ascending=False, method="min")
+    if reset_ranking:
+        filtered_df[COL_NAME_RANK] = filtered_df[COL_NAME_AVG].rank(ascending=False, method="min")
 
     return filtered_df
 
 
-def update_table(
+def _update_table(
+        task: str,
         hidden_df: pd.DataFrame,
         domains: list,
         langs: list,
         reranking_query: list,
         query: str,
-        show_anonymous: bool
+        show_anonymous: bool,
+        reset_ranking: bool = True
 ):
     filtered_df = hidden_df.copy()
     if not show_anonymous:
         filtered_df = filtered_df[~filtered_df[COL_NAME_IS_ANONYMOUS]]
     filtered_df = filter_models(filtered_df, reranking_query)
     filtered_df = filter_queries(query, filtered_df)
-    return select_columns(filtered_df, domains, langs, task='qa')
+    return select_columns(filtered_df, domains, langs, task, reset_ranking)
+
+
+def update_table(
+        hidden_df: pd.DataFrame,
+        domains: list,
+        langs: list,
+        reranking_query: list,
+        query: str,
+        show_anonymous: bool,
+        reset_ranking: bool = True
+):
+    return _update_table(
+        "qa", hidden_df, domains, langs, reranking_query, query, show_anonymous, reset_ranking)
 
 
 def update_table_long_doc(
@@ -137,15 +159,11 @@ def update_table_long_doc(
         langs: list,
         reranking_query: list,
         query: str,
-        show_anonymous: bool
+        show_anonymous: bool,
+        reset_ranking: bool = True
 ):
-    filtered_df = hidden_df
-    if not show_anonymous:
-        filtered_df = filtered_df[~filtered_df[COL_NAME_IS_ANONYMOUS]]
-    filtered_df = filter_models(filtered_df, reranking_query)
-    filtered_df = filter_queries(query, filtered_df)
-    df = select_columns(filtered_df, domains, langs, task='long-doc')
-    return df
+    return _update_table(
+        "long-doc", hidden_df, domains, langs, reranking_query, query, show_anonymous, reset_ranking)
 
 
 def update_metric(