refactor: enhance type safety and input handling in create_submit_tab function by updating benchmark results form and restructuring submission logic

app.py

@@ -2,6 +2,7 @@ import json
 import re
 import sys
 import threading
+import typing
 from textwrap import dedent
 
 import gradio as gr
@@ -46,6 +47,9 @@ from src.prepare import get_benchmarks, load_display_toml, prepare_space
 from src.submission.submit import add_new_submit
 from src.utils.hf import restart_space
 
+if typing.TYPE_CHECKING:
+    from src.schemas.meta_toml import MetaToml_Benchmark
+
 prepare_space()
 
 
@@ -458,7 +462,7 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
                 )
 
                 # Simple form for benchmark results
-                benchmark_results_form: list = []
+                benchmark_results_form: list[tuple[MetaToml_Benchmark, gr.Checkbox, gr.Number]] = []
                 for benchmark in benchmarks_list:
                     with gr.Row():
                         benchmark_checkbox = gr.Checkbox(
@@ -553,6 +557,9 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
 
             # Build results: {benchmark_key: {metric: value}}
             results = {}
+            assert (
+                len(benchmarks_list) > 0 and len(benchmark_checkbox_values) > 0 and len(benchmark_result_values) > 0
+            ), "Empty benchmarks list, checkbox values, or result values."
             for benchmark, checkbox_checked, result_value in zip(
                 benchmarks_list,
                 benchmark_checkbox_values,
@@ -581,9 +588,8 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
             model_type: str,
             json_str: str,
             commit_message: str,
+            *benchmark_values: list[bool | float],
             oauth_profile: gr.OAuthProfile | None = None,
-            *,
-            benchmark_values: list[tuple[bool, float]],
         ):
             """Submit with either form data or JSON"""
             # Check if user is logged in
@@ -677,38 +683,13 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
         )
         submission_result = gr.Markdown()
 
-        def submit_with_form_or_json_wrapper(
-            model: str,
-            base_model: str,
-            revision: str,
-            precision: str,
-            weight_type: str,
-            model_type: str,
-            json_str: str,
-            commit_message: str,
-            oauth_profile: gr.OAuthProfile | None = None,
-        ):
-            # Collect all inputs for submission
-            # Add benchmark form inputs (these will be captured by *benchmark_values)
-            benchmark_values: list[tuple[bool, float]] = []
-            for _, checkbox, result_input in benchmark_results_form:
-                benchmark_values.append((checkbox.value, result_input.value))
-
-            return submit_with_form_or_json(
-                model=model,
-                base_model=base_model,
-                revision=revision,
-                precision=precision,
-                weight_type=weight_type,
-                model_type=model_type,
-                json_str=json_str,
-                commit_message=commit_message,
-                oauth_profile=oauth_profile,
-                benchmark_values=benchmark_values,
-            )
+        # Add benchmark form inputs (these will be captured by *benchmark_values)
+        benchmark_values: list[gr.Checkbox | gr.Number] = []
+        for _, checkbox, result_input in benchmark_results_form:
+            benchmark_values.extend((checkbox, result_input))
 
         submit_button.click(
-            fn=submit_with_form_or_json_wrapper,
+            fn=submit_with_form_or_json,
             inputs=[
                 model_name_textbox,
                 base_model_name_textbox,
@@ -718,6 +699,7 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
                 model_type,
                 json_str,
                 commit_textbox,
+                *benchmark_values,
             ],
             outputs=submission_result,
         )