handle subdirectory in requests queue

src/populate.py

@@ -45,19 +45,23 @@ def get_leaderboard_df(results_path: str, requests_path: str, cols: list, benchm
     df = df[has_no_nan_values(df, benchmark_cols)]
     return raw_data, df
 
-
 def get_evaluation_queue_df(save_path: str, cols: list) -> list[pd.DataFrame]:
     """Creates the different dataframes for the evaluation queues requestes"""
     entries = [entry for entry in os.listdir(save_path) if not entry.startswith(".")]
     all_evals = []
+    
     for entry in entries:
-        if ".json" in entry:
-            file_path = os.path.join(save_path, entry)
-            with open(file_path) as fp:
+        full_path = os.path.join(save_path, entry)
+
+        if os.path.isdir(full_path):
+            continue
+
+        if entry.endswith(".json"):
+            with open(full_path) as fp:
                 data = json.load(fp)
+
             data[EvalQueueColumn.model.name] = make_clickable_model(data["model_name"]) if not data["private"] else data["model_name"]
             data[EvalQueueColumn.revision.name] = data.get("revision", "main")
-            # changes to be made here
             data[EvalQueueColumn.closed_ended_status.name] = data["status"]["closed-ended"]
             data[EvalQueueColumn.open_ended_status.name] = data["status"]["open-ended"]
             data[EvalQueueColumn.med_safety_status.name] = data["status"]["med-safety"]
@@ -66,42 +70,24 @@ def get_evaluation_queue_df(save_path: str, cols: list) -> list[pd.DataFrame]:
             if PRIVATE_REPO:
                 data[EvalQueueColumn.closed_ended_arabic_status.name] = data["status"]["closed-ended-arabic"]
             all_evals.append(data)
-        elif ".md" not in entry:
-            # this is a folder
-            sub_entries = [e for e in os.listdir(f"{save_path}/{entry}") if not e.startswith(".")]
-            for sub_entry in sub_entries:
-                file_path = os.path.join(save_path, entry, sub_entry)
-                with open(file_path) as fp:
-                    data = json.load(fp)
-                # print(data)
-                data[EvalQueueColumn.model.name] = make_clickable_model(data["model_name"]) if not data["private"] else data["model_name"]
-                data[EvalQueueColumn.revision.name] = data.get("revision", "main")
-                data[EvalQueueColumn.closed_ended_status.name] = data["status"]["closed-ended"]
-                data[EvalQueueColumn.open_ended_status.name] = data["status"]["open-ended"]
-                data[EvalQueueColumn.med_safety_status.name] = data["status"]["med-safety"]
-                data[EvalQueueColumn.medical_summarization_status.name] = data["status"]["medical-summarization"]
-                data[EvalQueueColumn.note_generation_status.name] = data["status"]["note-generation"]
-                if PRIVATE_REPO:
-                    data[EvalQueueColumn.closed_ended_arabic_status.name] = data["status"]["closed-ended-arabic"]
-                all_evals.append(data)
-    # breakpoint()
+    
     pending_list = []
     running_list = []
     finished_list = []
     for run in all_evals:
-        # changes to be made here
         status_list = [run["status"]["closed-ended"], run["status"]["open-ended"], run["status"]["med-safety"], run["status"]["medical-summarization"], run["status"]["note-generation"]]
         if PRIVATE_REPO:
             status_list.append(run["status"]["closed-ended-arabic"])
-        # status_list = status_list
+        
         if "RUNNING" in status_list:
             running_list.append(run)
         elif "PENDING" in status_list or "RERUN" in status_list:
             pending_list.append(run)
         else:
             finished_list.append(run)
-        # breakpoint()
+
     df_pending = pd.DataFrame.from_records(pending_list, columns=cols)
     df_running = pd.DataFrame.from_records(running_list, columns=cols)
     df_finished = pd.DataFrame.from_records(finished_list, columns=cols)
+    
     return df_finished[cols], df_running[cols], df_pending[cols]