mode fix

src/populate.py

@@ -38,19 +38,19 @@ def get_latest_leaderboard(version="v0") -> Optional[Dict]:
         return None
 
 
-def get_model_entry(model_name: str, version="v0") -> Optional[Dict]:
+def get_model_entry(model_name: str, mode: str, version="v0") -> Optional[Dict]:
     """
-    Get a specific model's entry from the entries folder.
+    Get a specific model's entry from the entries folder, uniquely identified by model_name, mode, and version.
     """
     try:
         model_name_safe = model_name.replace("/", "_").replace(" ", "_")
+        mode_safe = str(mode).replace("/", "_").replace(" ", "_").lower()
         entry_path = hf_hub_download(
             repo_id=RESULTS_DATASET_ID,
-            filename=f"entries/entry_{model_name_safe}_{version}.json",
+            filename=f"entries/entry_{model_name_safe}_{mode_safe}_{version}.json",
             repo_type="dataset",
             token=TOKEN
         )
-
         with open(entry_path, 'r') as f:
             return json.load(f)
     except Exception as e:
@@ -58,15 +58,18 @@ def get_model_entry(model_name: str, version="v0") -> Optional[Dict]:
         return None
 
 
-def get_all_entries(version="v0") -> List[Dict]:
+def get_all_entries(version="v0", mode: str = None) -> List[Dict]:
     """
-    Get all model entries from the entries folder.
+    Get all model entries from the entries folder. If mode is provided, only return entries matching that mode.
     """
     try:
         api = HfApi(token=TOKEN)
         files = api.list_repo_files(repo_id=RESULTS_DATASET_ID, repo_type="dataset")
-        entry_files = [f for f in files if f.startswith("entries/") and f.endswith(f"_{version}.json")]
-
+        if mode is not None:
+            mode_safe = str(mode).replace("/", "_").replace(" ", "_").lower()
+            entry_files = [f for f in files if f.startswith("entries/") and f"_{mode_safe}_" in f and f.endswith(f"_{version}.json")]
+        else:
+            entry_files = [f for f in files if f.startswith("entries/") and f.endswith(f"_{version}.json")]
         entries = []
         for entry_file in entry_files:
             try:
@@ -81,7 +84,6 @@ def get_all_entries(version="v0") -> List[Dict]:
                     entries.append(entry_data)
             except Exception as e:
                 print(f"Error loading entry {entry_file}: {e}")
-
         return entries
     except Exception as e:
         print(f"Error listing entries: {e}")
@@ -229,20 +231,16 @@ def get_category_leaderboard_df(category: str, version="v0") -> pd.DataFrame:
     return leaderboard_to_dataframe(filtered_leaderboard)
 
 
-def get_detailed_model_data(model_name: str, version="v0") -> Dict:
+def get_detailed_model_data(model_name: str, mode: str, version="v0") -> Dict:
     """
-    Get detailed data for a specific model.
+    Get detailed data for a specific model and mode.
     """
-    # Try to get model's entry directly first
-    entry = get_model_entry(model_name, version)
+    entry = get_model_entry(model_name, mode, version)
     if entry:
         return entry
-
-    # If no direct entry found, try looking in the leaderboard
     leaderboard_data = get_latest_leaderboard(version)
     if leaderboard_data:
         for entry in leaderboard_data.get("entries", []):
-            if entry.get("model_name") == model_name:
+            if entry.get("model_name") == model_name and str(entry.get("mode")).lower() == str(mode).lower():
                 return entry
-
     return {}

src/submission/submit.py

@@ -36,16 +36,17 @@ def validate_submission(file_path: str) -> Tuple[bool, str]:
         return False, f"Error validating submission: {e}"
 
 
-def submit_entry_to_hub(entry: Dict, model_name: str, version="v0") -> Tuple[bool, str]:
+def submit_entry_to_hub(entry: Dict, model_name: str, mode: str, version="v0") -> Tuple[bool, str]:
     """
-    Submit a model's evaluation entry to the HuggingFace dataset.
+    Submit a model's evaluation entry to the HuggingFace dataset. The entry is uniquely identified by model_name, mode, and version.
     """
     try:
         # Create safe model name for file path
         model_name_safe = model_name.replace("/", "_").replace(" ", "_")
+        mode_safe = str(mode).replace("/", "_").replace(" ", "_").lower()
 
         # Create entry path in entries folder
-        entry_path = f"entries/entry_{model_name_safe}_{version}.json"
+        entry_path = f"entries/entry_{model_name_safe}_{mode_safe}_{version}.json"
 
         # Save entry to temporary file
         with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as temp_file:
@@ -59,11 +60,11 @@ def submit_entry_to_hub(entry: Dict, model_name: str, version="v0") -> Tuple[boo
             path_in_repo=entry_path,
             repo_id=RESULTS_DATASET_ID,
             repo_type="dataset",
-            commit_message=f"Add evaluation entry for {model_name} (version {version})"
+            commit_message=f"Add evaluation entry for {model_name} (mode {mode}, version {version})"
         )
 
         os.unlink(temp_path)
-        return True, f"Successfully uploaded evaluation entry for {model_name}"
+        return True, f"Successfully uploaded evaluation entry for {model_name} (mode {mode})"
     except Exception as e:
         return False, f"Error submitting entry to dataset: {e}"
 
@@ -205,7 +206,7 @@ def process_submission(file_path: str, metadata: Dict, version="v0") -> str:
             })
 
             # Submit entry to entries folder
-            success, message = submit_entry_to_hub(model_entry, model_name, version)
+            success, message = submit_entry_to_hub(model_entry, model_name, metadata.get("mode"), version)
             if not success:
                 return styled_error(message)