Add submission checks

app.py

@@ -342,26 +342,31 @@ with demo:
                     #upload_button = gr.UploadButton("Upload json", file_types=['.json'])
                     #upload_button.upload(validate_upload, upload_button, file_input)
 
-                    with gr.Group():
-                        captcha_correct = gr.State(False)
-                        text = gr.State("")
-                        image, text.value = generate_captcha()
-                        captcha_img = gr.Image(
-                            image,
-                            label="Prove your humanity",
-                            interactive=False,
-                            show_download_button=False,
-                            show_fullscreen_button=False,
-                            show_share_button=False,
-                        )
-                        captcha_input = gr.Textbox(placeholder="Enter the text in the image above", show_label=False, container=False)
-                        check_button = gr.Button("Validate", interactive=True)
-                        captcha_result = gr.Markdown()
-                        check_button.click(
-                            fn = validate_captcha,
-                            inputs = [captcha_input, text, captcha_img],
-                            outputs = [captcha_correct, captcha_result, text, captcha_img],
-                        )
+                    with gr.Column():
+                        pass
+                    with gr.Column():
+                        with gr.Group():
+                            captcha_correct = gr.State(False)
+                            text = gr.State("")
+                            image, text.value = generate_captcha()
+                            captcha_img = gr.Image(
+                                image,
+                                label="Prove your humanity",
+                                interactive=False,
+                                show_download_button=False,
+                                show_fullscreen_button=False,
+                                show_share_button=False,
+                            )
+                            captcha_input = gr.Textbox(placeholder="Enter the text in the image above", show_label=False, container=False)
+                            check_button = gr.Button("Validate", interactive=True)
+                            captcha_result = gr.Markdown()
+                            check_button.click(
+                                fn = validate_captcha,
+                                inputs = [captcha_input, text, captcha_img],
+                                outputs = [captcha_correct, captcha_result, text, captcha_img],
+                            )
+                    with gr.Column():
+                        pass
 
                     submit_button = gr.Button("Submit Eval", interactive=True)
                     submission_result = gr.Markdown()
@@ -375,7 +380,7 @@ with demo:
                             contact_email,
                             captcha_correct,
                         ],
-                        outputs = [submission_result, model_name_textbox, precision, hf_model_id, contact_email],
+                        outputs = [submission_result],
                     )
 
     with gr.Row():

src/submission/submit.py

@@ -33,7 +33,19 @@ def add_new_eval(
 ):
     try:
         if not captcha_ok:
-            return styled_error("Please prove you are a human!"), "", "", "", ""
+            return styled_error("Please prove you are a human!")
+        
+        if not eval_name:
+            return styled_error("Please provide a model name.")
+        
+        if not precision:
+            return styled_error("Please select precision.")
+        
+        if not contact_email:
+            return styled_error("Please provide your contact email.")
+        
+        if not upload:
+            return styled_error("Please upload a results file.")
         
         with open(upload, mode="r") as f:
             data = json.load(f)    
@@ -59,11 +71,11 @@ def add_new_eval(
                 continue
             if k not in BENCHMARK_COL_IDS:
                 print(f"Missing: {k}")
-                return styled_error(f'Missing: {k}'), "", "", "", ""
+                return styled_error(f'Missing: {k}')
 
         if len(BENCHMARK_COL_IDS) != len(ret) - 4:
             print(f"Missing columns")
-            return styled_error(f'Missing columns'), "", "", "", ""
+            return styled_error(f'Missing result entries')
 
         # TODO add complex validation
         #print(results.keys())
@@ -87,7 +99,7 @@ def add_new_eval(
 
         if ret['eval_name'] in existing_eval_names:
             print(f"Model name {ret['eval_name']} is used!")
-            return styled_error(f"Model name {ret['eval_name']} is used!"), "", "", "", ""
+            return styled_error(f"Model name {ret['eval_name']} is used!")
 
         out_path = f"{OUT_DIR}/{eval_name}_eval_request.json"
 
@@ -206,7 +218,7 @@ def add_new_eval(
         """
         return styled_message(
             "Your results have been successfully submitted. They will be added to the leaderboard upon verification."
-        ), "", "", "", ""
+        )
     
     except Exception as e:
-        return styled_error(f"An error occurred: {e}"), "", "", "", ""
+        return styled_error(f"An error occurred: {e}")