refactor: restructure the files

app.py

@@ -6,7 +6,7 @@ from huggingface_hub import snapshot_download
 
 from src.about import BENCHMARKS_TEXT, EVALUATION_QUEUE_TEXT, INTRODUCTION_TEXT, TITLE
 from src.benchmarks import LongDocBenchmarks, QABenchmarks
-from src.display.components import (
+from src.components import (
     get_anonymous_checkbox,
     get_domain_dropdown,
     get_language_dropdown,
@@ -18,8 +18,7 @@ from src.display.components import (
     get_search_bar,
     get_version_dropdown,
 )
-from src.display.css_html_js import custom_css
-from src.display.formatting import model_hyperlink
+from src.css_html_js import custom_css
 from src.envs import (
     API,
     BENCHMARK_VERSION_LIST,
@@ -35,7 +34,7 @@ from src.envs import (
     TOKEN,
 )
 from src.loaders import load_eval_results
-from src.models import TaskType
+from src.models import TaskType, model_hyperlink
 from src.utils import remove_html, reset_rank, set_listeners, submit_results, update_metric, upload_file
 
 

src/display/formatting.py

@@ -1,29 +0,0 @@
-def model_hyperlink(link, model_name):
-    return f'<a target="_blank" href="{link}" style="color: var(--link-text-color); text-decoration: underline;text-decoration-style: dotted;">{model_name}</a>'
-
-
-def make_clickable_model(model_name: str, model_link: str):
-    # link = f"https://huggingface.co/{model_name}"
-    if not model_link or not model_link.startswith("https://"):
-        return model_name
-    return model_hyperlink(model_link, model_name)
-
-
-def styled_error(error):
-    return f"<p style='color: red; font-size: 20px; text-align: center;'>{error}</p>"
-
-
-def styled_warning(warn):
-    return f"<p style='color: orange; font-size: 20px; text-align: center;'>{warn}</p>"
-
-
-def styled_message(message):
-    return f"<p style='color: green; font-size: 20px; text-align: center;'>{message}</p>"
-
-
-def has_no_nan_values(df, columns):
-    return df[columns].notna().all(axis=1)
-
-
-def has_nan_values(df, columns):
-    return df[columns].isna().any(axis=1)

src/models.py

@@ -7,7 +7,6 @@ from typing import List, Optional
 
 import pandas as pd
 
-from src.display.formatting import make_clickable_model
 from src.envs import (
     COL_NAME_IS_ANONYMOUS,
     COL_NAME_RERANKING_MODEL,
@@ -159,3 +158,14 @@ class LeaderboardDataStore:
 class TaskType(Enum):
     qa = "qa"
     long_doc = "long-doc"
+
+
+def make_clickable_model(model_name: str, model_link: str):
+    # link = f"https://huggingface.co/{model_name}"
+    if not model_link or not model_link.startswith("https://"):
+        return model_name
+    return model_hyperlink(model_link, model_name)
+
+
+def model_hyperlink(link, model_name):
+    return f'<a target="_blank" href="{link}" style="color: var(--link-text-color); text-decoration: underline;text-decoration-style: dotted;">{model_name}</a>'

src/utils.py

@@ -8,8 +8,7 @@ import pandas as pd
 
 from src.models import TaskType
 from src.benchmarks import LongDocBenchmarks, QABenchmarks
-from src.display.columns import get_default_col_names_and_types, get_fixed_col_names_and_types
-from src.display.formatting import styled_error, styled_message
+from src.columns import get_default_col_names_and_types, get_fixed_col_names_and_types
 from src.envs import (
     API,
     COL_NAME_AVG,
@@ -441,3 +440,11 @@ def update_qa_df_elem(
         reset_ranking,
         show_revision_and_timestamp,
     )
+
+
+def styled_error(error):
+    return f"<p style='color: red; font-size: 20px; text-align: center;'>{error}</p>"
+
+
+def styled_message(message):
+    return f"<p style='color: green; font-size: 20px; text-align: center;'>{message}</p>"