refactor: refactor the naming

app.py

@@ -57,13 +57,13 @@ except Exception:
     print("failed to download")
     restart_space()
 
-global data
-data = load_eval_results(EVAL_RESULTS_PATH)
+global ds_dict
+ds_dict = load_eval_results(EVAL_RESULTS_PATH)
 global datastore
-datastore = data[LATEST_BENCHMARK_VERSION]
+datastore = ds_dict[LATEST_BENCHMARK_VERSION]
 
 
-def update_metric_qa(
+def update_qa_metric(
     metric: str,
     domains: list,
     langs: list,
@@ -72,6 +72,7 @@ def update_metric_qa(
     show_anonymous: bool,
     show_revision_and_timestamp: bool,
 ):
+    global datastore
     return update_metric(
         datastore,
         "qa",
@@ -85,7 +86,7 @@ def update_metric_qa(
     )
 
 
-def update_metric_long_doc(
+def update_doc_metric(
     metric: str,
     domains: list,
     langs: list,
@@ -94,6 +95,7 @@ def update_metric_long_doc(
     show_anonymous: bool,
     show_revision_and_timestamp,
 ):
+    global datastore
     return update_metric(
         datastore,
         "long-doc",
@@ -107,30 +109,28 @@ def update_metric_long_doc(
     )
 
 
-def update_datastore(version):
+def update_qa_version(version):
     global datastore
-    global data
-    datastore = data[version]
-    selected_domains = get_domain_dropdown(QABenchmarks[datastore.slug])
-    selected_langs = get_language_dropdown(QABenchmarks[datastore.slug])
-    selected_rerankings = get_reranking_dropdown(datastore.reranking_models)
-    leaderboard_table = get_leaderboard_table(datastore.qa_fmt_df, datastore.qa_types)
-    hidden_leaderboard_table = \
-        get_leaderboard_table(datastore.qa_raw_df, datastore.qa_types, visible=False)
-    return selected_domains, selected_langs, selected_rerankings, leaderboard_table, hidden_leaderboard_table
-
-
-def update_datastore_long_doc(version):
+    global ds_dict
+    datastore = ds_dict[version]
+    domain_elem = get_domain_dropdown(QABenchmarks[datastore.slug])
+    lang_elem = get_language_dropdown(QABenchmarks[datastore.slug])
+    model_elem = get_reranking_dropdown(datastore.reranking_models)
+    df_elem = get_leaderboard_table(datastore.qa_fmt_df, datastore.qa_types)
+    hidden_df_elem = get_leaderboard_table(datastore.qa_raw_df, datastore.qa_types, visible=False)
+    return domain_elem, lang_elem, model_elem, df_elem, hidden_df_elem
+
+
+def update_doc_version(version):
     global datastore
-    global data
-    datastore = data[version]
-    selected_domains = get_domain_dropdown(LongDocBenchmarks[datastore.slug])
-    selected_langs = get_language_dropdown(LongDocBenchmarks[datastore.slug])
-    selected_rerankings = get_reranking_dropdown(datastore.reranking_models)
-    leaderboard_table = get_leaderboard_table(datastore.doc_fmt_df, datastore.doc_types)
-    hidden_leaderboard_table = \
-        get_leaderboard_table(datastore.doc_raw_df, datastore.doc_types, visible=False)
-    return selected_domains, selected_langs, selected_rerankings, leaderboard_table, hidden_leaderboard_table
+    global ds_dict
+    datastore = ds_dict[version]
+    domain_elem = get_domain_dropdown(LongDocBenchmarks[datastore.slug])
+    lang_elem = get_language_dropdown(LongDocBenchmarks[datastore.slug])
+    model_elem = get_reranking_dropdown(datastore.reranking_models)
+    df_elem = get_leaderboard_table(datastore.doc_fmt_df, datastore.doc_types)
+    hidden_df_elem = get_leaderboard_table(datastore.doc_raw_df, datastore.doc_types, visible=False)
+    return domain_elem, lang_elem, model_elem, df_elem, hidden_df_elem
 
 
 demo = gr.Blocks(css=custom_css)
@@ -142,7 +142,7 @@ with demo:
     with gr.Tabs(elem_classes="tab-buttons") as tabs:
         with gr.TabItem("Results", elem_id="results-tab-table"):
             with gr.Row():
-                selected_version = get_version_dropdown()
+                version = get_version_dropdown()
 
             with gr.TabItem("QA", elem_id="qa-benchmark-tab-table", id=0):
                 with gr.Row():
@@ -174,10 +174,10 @@ with demo:
                         # Dummy leaderboard for handling the case when the user uses backspace key
                         hidden_lb_table = get_leaderboard_table(datastore.qa_raw_df, datastore.qa_types, visible=False)
 
-                        selected_version.change(
-                            update_datastore,
+                        version.change(
+                            update_qa_version,
                             [
-                                selected_version,
+                                version,
                             ],
                             [selected_domains, selected_langs, selected_rerankings, lb_table, hidden_lb_table],
                         )
@@ -187,7 +187,7 @@ with demo:
                             lb_table,
                             hidden_lb_table,
                             search_bar,
-                            selected_version,
+                            version,
                             selected_domains,
                             selected_langs,
                             selected_rerankings,
@@ -197,7 +197,7 @@ with demo:
 
                         # set metric listener
                         selected_metric.change(
-                            update_metric_qa,
+                            update_qa_metric,
                             [
                                 selected_metric,
                                 selected_domains,
@@ -233,10 +233,10 @@ with demo:
                             hidden_lb_df_retriever, datastore.qa_types, visible=False
                         )
 
-                        selected_version.change(
-                            update_datastore,
+                        version.change(
+                            update_qa_version,
                             [
-                                selected_version,
+                                version,
                             ],
                             [
                                 selected_domains,
@@ -252,7 +252,7 @@ with demo:
                             lb_table_retriever,
                             hidden_lb_table_retriever,
                             search_bar_retriever,
-                            selected_version,
+                            version,
                             selected_domains,
                             selected_langs,
                             selected_noreranker,
@@ -262,7 +262,7 @@ with demo:
 
                         # set metric listener
                         selected_metric.change(
-                            update_metric_qa,
+                            update_qa_metric,
                             [
                                 selected_metric,
                                 selected_domains,
@@ -298,10 +298,10 @@ with demo:
                             hidden_lb_df_reranker, datastore.qa_types, visible=False
                         )
 
-                        selected_version.change(
-                            update_datastore,
+                        version.change(
+                            update_qa_version,
                             [
-                                selected_version,
+                                version,
                             ],
                             [
                                 selected_domains,
@@ -317,7 +317,7 @@ with demo:
                             lb_table_reranker,
                             hidden_lb_table_reranker,
                             search_bar_reranker,
-                            selected_version,
+                            version,
                             selected_domains,
                             selected_langs,
                             selected_rerankings_reranker,
@@ -326,7 +326,7 @@ with demo:
                         )
                         # set metric listener
                         selected_metric.change(
-                            update_metric_qa,
+                            update_qa_metric,
                             [
                                 selected_metric,
                                 selected_domains,
@@ -373,10 +373,10 @@ with demo:
                             datastore.doc_raw_df, datastore.doc_types, visible=False
                         )
 
-                        selected_version.change(
-                            update_datastore_long_doc,
+                        version.change(
+                            update_doc_version,
                             [
-                                selected_version,
+                                version,
                             ],
                             [
                                 selected_domains,
@@ -392,7 +392,7 @@ with demo:
                             lb_table_long_doc,
                             hidden_lb_table_long_doc,
                             search_bar,
-                            selected_version,
+                            version,
                             selected_domains,
                             selected_langs,
                             selected_rerankings,
@@ -402,7 +402,7 @@ with demo:
 
                         # set metric listener
                         selected_metric.change(
-                            update_metric_long_doc,
+                            update_doc_metric,
                             [
                                 selected_metric,
                                 selected_domains,
@@ -437,10 +437,10 @@ with demo:
                             hidden_lb_df_retriever_long_doc, datastore.doc_types, visible=False
                         )
 
-                        selected_version.change(
-                            update_datastore_long_doc,
+                        version.change(
+                            update_doc_version,
                             [
-                                selected_version,
+                                version,
                             ],
                             [
                                 selected_domains,
@@ -456,7 +456,7 @@ with demo:
                             lb_table_retriever_long_doc,
                             hidden_lb_table_retriever_long_doc,
                             search_bar_retriever,
-                            selected_version,
+                            version,
                             selected_domains,
                             selected_langs,
                             selected_noreranker,
@@ -465,7 +465,7 @@ with demo:
                         )
 
                         selected_metric.change(
-                            update_metric_long_doc,
+                            update_doc_metric,
                             [
                                 selected_metric,
                                 selected_domains,
@@ -502,10 +502,10 @@ with demo:
                             hidden_lb_df_reranker_ldoc, datastore.doc_types, visible=False
                         )
 
-                        selected_version.change(
-                            update_datastore_long_doc,
+                        version.change(
+                            update_doc_version,
                             [
-                                selected_version,
+                                version,
                             ],
                             [
                                 selected_domains,
@@ -521,7 +521,7 @@ with demo:
                             lb_table_reranker_ldoc,
                             hidden_lb_table_reranker_ldoc,
                             search_bar_reranker_ldoc,
-                            selected_version,
+                            version,
                             selected_domains,
                             selected_langs,
                             selected_rerankings_reranker_ldoc,
@@ -529,7 +529,7 @@ with demo:
                             show_revision_and_timestamp,
                         )
                         selected_metric.change(
-                            update_metric_long_doc,
+                            update_doc_metric,
                             [
                                 selected_metric,
                                 selected_domains,

src/loaders.py

@@ -1,5 +1,5 @@
 import os.path
-from typing import List
+from typing import List, Dict
 
 import pandas as pd
 
@@ -94,7 +94,7 @@ def load_leaderboard_datastore(file_path, version) -> LeaderboardDataStore:
     return lb_data_store
 
 
-def load_eval_results(file_path: str):
+def load_eval_results(file_path: str) -> Dict[str, LeaderboardDataStore]:
     output = {}
     for version in BENCHMARK_VERSION_LIST:
         fn = f"{file_path}/{version}"

src/models.py

@@ -147,5 +147,4 @@ class LeaderboardDataStore:
     doc_fmt_df: Optional[pd.DataFrame]
     reranking_models: Optional[list]
     qa_types: Optional[list]
-    doc_types: Optional[list]
-    # qa_raw_df, docs_raw_df, qa_fmt_df, docs_fmt_df, 
+    doc_types: Optional[list]