refactor: update benchmark values handling in create_submit_tab function to improve type safety and streamline input collection

.env.example

@@ -6,4 +6,4 @@ HF_RESULTS_REPO_NAME=EASI-Leaderboard-Results
 HF_REQUESTS_REPO_NAME=EASI-Leaderboard-Requests
 
 # Enable Submission
-ENABLE_SUBMISSION=1
+ENABLE_SUBMISSION=0

app.py

@@ -460,7 +460,7 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
 
                 # Simple form for benchmark results
                 benchmarks = get_benchmarks()
-                benchmark_results_form = []
+                benchmark_results_form: list = []
                 for benchmark in benchmarks:
                     with gr.Row():
                         benchmark_checkbox = gr.Checkbox(
@@ -568,21 +568,6 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
 
             return json.dumps({"config": config, "results": results}, indent=2, ensure_ascii=False)
 
-        SubmitWithFormOrJsonInputs = namedtuple(
-            "SubmitWithFormOrJsonInputs",
-            [
-                "model",
-                "base_model",
-                "revision",
-                "precision",
-                "weight_type",
-                "model_type",
-                "json_str",
-                "commit_message",
-                # "oauth_profile",
-            ],
-        )
-
         def submit_with_form_or_json(
             model: str,
             base_model: str,
@@ -592,9 +577,9 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
             model_type: str,
             json_str: str,
             commit_message: str,
-            oauth_profile: gr.OAuthProfile,
+            oauth_profile: gr.OAuthProfile | None = None,
             *,
-            benchmark_values: list[bool | float],
+            benchmark_values: list[tuple[bool, float]],
         ):
             """Submit with either form data or JSON"""
             # Check if user is logged in
@@ -632,11 +617,9 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
                 # Split into checkbox values and result values
                 benchmark_checkbox_values: list[bool] = []
                 benchmark_result_values: list[float] = []
-                for i, val in enumerate(benchmark_values):
-                    if i % 2 == 0:
-                        benchmark_checkbox_values.append(bool(val))
-                    else:
-                        benchmark_result_values.append(float(val))  # pyright: ignore[reportArgumentType]
+                for checkbox_value, result_value in benchmark_values:
+                    benchmark_checkbox_values.append(checkbox_value)
+                    benchmark_result_values.append(result_value)  # pyright: ignore[reportArgumentType]
 
                 try:
                     final_json = build_json_from_form(
@@ -690,29 +673,48 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
         )
         submission_result = gr.Markdown()
 
-        # Collect all inputs for submission
-        # Add benchmark form inputs (these will be captured by *benchmark_values)
-        benchmark_values = []
-        for _, checkbox, result_input in benchmark_results_form:
-            benchmark_values.extend([checkbox.value, result_input.value])
-
-        all_inputs = list(
-            SubmitWithFormOrJsonInputs(
-                model=model_name_textbox,
-                base_model=base_model_name_textbox,
-                revision=revision_name_textbox,
+        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_textbox,
-                # oauth_profile=login_button,
+                commit_message=commit_message,
+                oauth_profile=oauth_profile,
+                benchmark_values=benchmark_values,
             )
-        )
 
         submit_button.click(
-            fn=partial(submit_with_form_or_json, benchmark_values=benchmark_values),
-            inputs=list(all_inputs),
+            fn=submit_with_form_or_json_wrapper,
+            inputs=[
+                model_name_textbox,
+                base_model_name_textbox,
+                revision_name_textbox,
+                precision,
+                weight_type,
+                model_type,
+                json_str,
+                commit_textbox,
+            ],
             outputs=submission_result,
         )