Minor adjustments

app.py

@@ -168,8 +168,8 @@ def generate_captcha(width=200, height=150, length=4):
 def validate_captcha(input, text, img):
     img, new_text = generate_captcha()
     if input == text:
-        return True, styled_message("Correct! You can procede with your submission"), new_text, img
-    return False, styled_error("Incorrect! Please retry with the new code."), new_text, img
+        return True, styled_message("Correct! You can procede with your submission."), new_text, img, ""
+    return False, styled_error("Incorrect! Please retry with the new code."), new_text, img, ""
 
 
 
@@ -342,31 +342,26 @@ with demo:
                     #upload_button = gr.UploadButton("Upload json", file_types=['.json'])
                     #upload_button.upload(validate_upload, upload_button, file_input)
 
-                    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
+                    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, captcha_input],
+                        )
 
                     submit_button = gr.Button("Submit Eval", interactive=True)
                     submission_result = gr.Markdown()

src/submission/submit.py

@@ -32,9 +32,6 @@ def add_new_eval(
     captcha_ok: bool,
 ):
     try:
-        if not captcha_ok:
-            return styled_error("Please prove you are a human!")
-        
         if not eval_name:
             return styled_error("Please provide a model name.")
         
@@ -47,6 +44,9 @@ def add_new_eval(
         if not upload:
             return styled_error("Please upload a results file.")
         
+        if not captcha_ok:
+            return styled_error("Please prove you are a human!")
+        
         with open(upload, mode="r") as f:
             data = json.load(f)