refactor: restructure the files

app.py

@@ -22,8 +22,6 @@ from src.css_html_js import custom_css
 from src.envs import (
     API,
     BENCHMARK_VERSION_LIST,
-    COL_NAME_RERANKING_MODEL,
-    COL_NAME_RETRIEVAL_MODEL,
     DEFAULT_METRIC_LONG_DOC,
     DEFAULT_METRIC_QA,
     EVAL_RESULTS_PATH,
@@ -33,6 +31,7 @@ from src.envs import (
     RESULTS_REPO,
     TOKEN,
 )
+from src.columns import COL_NAME_RETRIEVAL_MODEL, COL_NAME_RERANKING_MODEL
 from src.loaders import load_eval_results
 from src.models import TaskType, model_hyperlink
 from src.utils import remove_html, reset_rank, set_listeners, submit_results, update_metric, upload_file

src/columns.py

@@ -1,17 +1,5 @@
 from dataclasses import dataclass, make_dataclass
 
-from src.envs import (
-    COL_NAME_AVG,
-    COL_NAME_IS_ANONYMOUS,
-    COL_NAME_RANK,
-    COL_NAME_RERANKING_MODEL,
-    COL_NAME_RERANKING_MODEL_LINK,
-    COL_NAME_RETRIEVAL_MODEL,
-    COL_NAME_RETRIEVAL_MODEL_LINK,
-    COL_NAME_REVISION,
-    COL_NAME_TIMESTAMP,
-)
-
 
 def fields(raw_class):
     return [v for k, v in raw_class.__dict__.items() if k[:2] != "__" and k[-2:] != "__"]
@@ -96,3 +84,14 @@ def get_default_col_names_and_types(benchmarks):
 def get_fixed_col_names_and_types():
     fixed_cols = get_default_auto_eval_column_dict()[:-3]
     return [c.name for _, _, c in fixed_cols], [c.type for _, _, c in fixed_cols]
+
+
+COL_NAME_AVG = "Average ⬆️"
+COL_NAME_RETRIEVAL_MODEL = "Retrieval Method"
+COL_NAME_RERANKING_MODEL = "Reranking Model"
+COL_NAME_RETRIEVAL_MODEL_LINK = "Retrieval Model LINK"
+COL_NAME_RERANKING_MODEL_LINK = "Reranking Model LINK"
+COL_NAME_RANK = "Rank 🏆"
+COL_NAME_REVISION = "Revision"
+COL_NAME_TIMESTAMP = "Submission Date"
+COL_NAME_IS_ANONYMOUS = "Anonymous Submission"

src/envs.py

@@ -63,12 +63,3 @@ METRIC_LIST = [
     "mrr_at_100",
     "mrr_at_1000",
 ]
-COL_NAME_AVG = "Average ⬆️"
-COL_NAME_RETRIEVAL_MODEL = "Retrieval Method"
-COL_NAME_RERANKING_MODEL = "Reranking Model"
-COL_NAME_RETRIEVAL_MODEL_LINK = "Retrieval Model LINK"
-COL_NAME_RERANKING_MODEL_LINK = "Reranking Model LINK"
-COL_NAME_RANK = "Rank 🏆"
-COL_NAME_REVISION = "Revision"
-COL_NAME_TIMESTAMP = "Submission Date"
-COL_NAME_IS_ANONYMOUS = "Anonymous Submission"

src/loaders.py

@@ -5,12 +5,10 @@ import pandas as pd
 
 from src.envs import (
     BENCHMARK_VERSION_LIST,
-    COL_NAME_IS_ANONYMOUS,
-    COL_NAME_REVISION,
-    COL_NAME_TIMESTAMP,
     DEFAULT_METRIC_LONG_DOC,
     DEFAULT_METRIC_QA,
 )
+from src.columns import COL_NAME_REVISION, COL_NAME_TIMESTAMP, COL_NAME_IS_ANONYMOUS
 from src.models import FullEvalResult, LeaderboardDataStore, TaskType
 from src.utils import get_default_cols, get_leaderboard_df
 

src/models.py

@@ -7,15 +7,9 @@ from typing import List, Optional
 
 import pandas as pd
 
-from src.envs import (
-    COL_NAME_IS_ANONYMOUS,
-    COL_NAME_RERANKING_MODEL,
-    COL_NAME_RERANKING_MODEL_LINK,
-    COL_NAME_RETRIEVAL_MODEL,
-    COL_NAME_RETRIEVAL_MODEL_LINK,
-    COL_NAME_REVISION,
-    COL_NAME_TIMESTAMP,
-)
+from src.columns import COL_NAME_RETRIEVAL_MODEL, COL_NAME_RERANKING_MODEL, COL_NAME_RETRIEVAL_MODEL_LINK, \
+    COL_NAME_RERANKING_MODEL_LINK, COL_NAME_REVISION, COL_NAME_TIMESTAMP, COL_NAME_IS_ANONYMOUS
+
 
 def get_safe_name(name: str):
     """Get RFC 1123 compatible safe name"""

src/utils.py

@@ -8,16 +8,11 @@ import pandas as pd
 
 from src.models import TaskType
 from src.benchmarks import LongDocBenchmarks, QABenchmarks
-from src.columns import get_default_col_names_and_types, get_fixed_col_names_and_types
+from src.columns import get_default_col_names_and_types, get_fixed_col_names_and_types, COL_NAME_AVG, \
+    COL_NAME_RETRIEVAL_MODEL, COL_NAME_RERANKING_MODEL, COL_NAME_RANK, COL_NAME_REVISION, COL_NAME_TIMESTAMP, \
+    COL_NAME_IS_ANONYMOUS
 from src.envs import (
     API,
-    COL_NAME_AVG,
-    COL_NAME_IS_ANONYMOUS,
-    COL_NAME_RANK,
-    COL_NAME_RERANKING_MODEL,
-    COL_NAME_RETRIEVAL_MODEL,
-    COL_NAME_REVISION,
-    COL_NAME_TIMESTAMP,
     LATEST_BENCHMARK_VERSION,
     SEARCH_RESULTS_REPO,
 )

tests/test_utils.py

@@ -2,15 +2,8 @@ import pandas as pd
 import pytest
 
 from app import update_table
-from src.envs import (
-    COL_NAME_AVG,
-    COL_NAME_IS_ANONYMOUS,
-    COL_NAME_RANK,
-    COL_NAME_RERANKING_MODEL,
-    COL_NAME_RETRIEVAL_MODEL,
-    COL_NAME_REVISION,
-    COL_NAME_TIMESTAMP,
-)
+from src.columns import COL_NAME_AVG, COL_NAME_RETRIEVAL_MODEL, COL_NAME_RERANKING_MODEL, COL_NAME_RANK, \
+    COL_NAME_REVISION, COL_NAME_TIMESTAMP, COL_NAME_IS_ANONYMOUS
 from src.utils import (
     filter_models,
     filter_queries,