add more robust error checking

app.py

@@ -33,52 +33,85 @@ from src.envs import API, EVAL_REQUESTS_PATH, EVAL_RESULTS_PATH, QUEUE_REPO, REP
 from src.populate import get_evaluation_queue_df, get_leaderboard_df
 from src.submission.submit import add_new_eval
 from src.submission.evaluate import calculate_metrics
+import json
 
-def handle_new_eval_submission(model_name, model_zip, model_link=None):
-    
-    if not model_name:
-        return "Please enter a model name."
-    
-    # check if the model name is already in the leaderboard
-    if model_name in leaderboard_df[AutoEvalColumn.model.name].values:
-        return "Model name already exists in the leaderboard. Please choose a different name."
-    
-    # check if the zip file is actually a zip file
-    if model_zip is None or not zipfile.is_zipfile(model_zip):
-        return "Please upload a valid zip file."
-    
-    # check if the model name is only one word
-    if len(model_name.split()) > 1:
-        return "Model name should be a single word with hyphens."
-    
-    extraction_path = EVAL_RESULTS_PATH_BACKEND
-
-    if not os.path.exists(extraction_path):
-        os.makedirs(extraction_path)
+def handle_new_eval_submission(model_name, model_zip, model_link=None) -> str:
+    try:
+        # Input validation
+        if not model_name:
+            return "Please enter a model name."
         
-    # define path for the zip file to be extracted to
-    extraction_path = os.path.join(extraction_path, model_name)
-
-    if model_zip is not None:
-        with zipfile.ZipFile(model_zip, 'r') as zip_ref:
-            zip_ref.extractall(extraction_path)
-    print("File unzipped successfully to:", extraction_path)
+        if not isinstance(model_name, str):
+            return "Model name must be a string."
         
-    # Evaluate the model's performance
-    calculate_metrics(extraction_path, model_name)
-    
-    # upload to results repo
-    API.upload_file(
-        path_or_fileobj=os.path.join(os.getcwd(), EVAL_RESULTS_PATH, '3d-pope', model_name, 'results.json'),
-        path_in_repo=os.path.join('3d-pope', model_name, 'results.json'),
-        repo_id=RESULTS_REPO,
-        repo_type="dataset",
-        )
-    
-    restart_space()
+        if len(model_name.split()) > 1:
+            return "Model name should be a single word with hyphens."
+        
+        # Check if the model name is already in the leaderboard
+        if model_name in leaderboard_df[AutoEvalColumn.model.name].values:
+            return "Model name already exists in the leaderboard. Please choose a different name."
+        
+        if model_zip is None:
+            return "Please provide a zip file."
+        
+        extraction_path = os.path.join(EVAL_RESULTS_PATH_BACKEND, model_name)
+        
+        if model_zip is not None:
+            # Check if the zip file is actually a zip file
+            if not zipfile.is_zipfile(model_zip):
+                return "Please upload a valid zip file."
+            
+            # Create extraction path if it doesn't exist
+            os.makedirs(extraction_path, exist_ok=True)
+            
+            # Extract the zip file
+            try:
+                with zipfile.ZipFile(model_zip, 'r') as zip_ref:
+                    zip_ref.extractall(extraction_path)
+            except zipfile.BadZipFile:
+                return "The uploaded file is not a valid zip file."
+            except Exception as e:
+                return f"An error occurred while extracting the zip file: {str(e)}"
+            
+            print("File unzipped successfully to:", extraction_path)
+        
+        # Evaluate the model's performance
+        try:
+            calculate_metrics(extraction_path, model_name)
+        except Exception as e:
+            return f"An error occurred while calculating metrics: {str(e)}"
+        
+        # Upload results to repo
+        results_file_path = os.path.join(os.getcwd(), EVAL_RESULTS_PATH, '3d-pope', model_name, 'results.json')
+        if not os.path.exists(results_file_path):
+            return f"Results file not found at {results_file_path}"
+        
+        try:
+            with open(results_file_path, 'r') as f:
+                json.load(f)  # Validate JSON structure
+        except json.JSONDecodeError:
+            return "The results file is not a valid JSON file."
+        
+        try:
+            API.upload_file(
+                path_or_fileobj=results_file_path,
+                path_in_repo=os.path.join('3d-pope', model_name, 'results.json'),
+                repo_id=RESULTS_REPO,
+                repo_type="dataset",
+            )
+        except Exception as e:
+            return f"An error occurred while uploading results: {str(e)}"
+        
+        # Restart the space
+        try:
+            restart_space()
+        except Exception as e:
+            return f"An error occurred while restarting the space: {str(e)}"
+        
+        return "Submission received and results are being processed. Please check the leaderboard for updates."
     
-    return "Submission received and results are being processed. Please check the leaderboard for updates."
-
+    except Exception as e:
+        return f"An unexpected error occurred: {str(e)}"
 
 
 def restart_space():