refactor: improve benchmark handling in create_submit_tab function by restructuring input processing and enhancing data validation

app.py

@@ -1,4 +1,10 @@
+import json
+import re
+import sys
 import threading
+from collections import namedtuple
+from functools import partial
+from textwrap import dedent
 
 import gradio as gr
 import gradio.components as grc
@@ -139,8 +145,6 @@ def search_models_in_dataframe(search_text: str, df: pd.DataFrame) -> pd.DataFra
         return df
 
     # 分割逗号，去除空白并转换为小写用于匹配
-    import re
-
     keywords = [keyword.strip().lower() for keyword in search_text.split(',') if keyword.strip()]
     if not keywords:
         return df
@@ -493,8 +497,6 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
                 if file is None:
                     return ""
                 try:
-                    import json
-
                     # file 是文件路径字符串（当 type="filepath" 时）
                     file_path = file if isinstance(file, str) else file.name
                     with open(file_path, encoding='utf-8') as f:
@@ -532,12 +534,10 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
             model_name: str,
             revision: str,
             precision: str,
-            benchmark_checkbox_values: list,
-            benchmark_result_values: list,
+            benchmark_checkbox_values: list[bool],
+            benchmark_result_values: list[float],
         ) -> str:
             """Build JSON from form inputs"""
-            import json
-
             if not model_name or not model_name.strip():
                 raise ValueError("Model name is required")
 
@@ -549,7 +549,7 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
                 "model_name": model_name,
                 "model_key": model_key,
                 "model_dtype": f"torch.{precision}" if precision else None,
-                "model_sha": revision or "main",
+                "model_sha": revision or None,  # None means "main"
                 "model_args": None,
             }
 
@@ -568,6 +568,21 @@ 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,
@@ -577,12 +592,11 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
             model_type: str,
             json_str: str,
             commit_message: str,
-            oauth_profile: gr.OAuthProfile | None = None,
-            *benchmark_values,
+            oauth_profile: gr.OAuthProfile,
+            *,
+            benchmark_values: list[bool | float],
         ):
             """Submit with either form data or JSON"""
-            import json
-
             # Check if user is logged in
             if oauth_profile is None:
                 return styled_error("Please log in before submitting.")
@@ -604,12 +618,25 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
                 # Build JSON from form
                 # benchmark_values contains pairs of (checkbox_value, result_value) for each benchmark
                 benchmarks_list = get_benchmarks()
-                if len(benchmark_values) != len(benchmarks_list) * 2:
+                if len(benchmark_values) != len(benchmarks_list):
+                    print(
+                        dedent(f"""
+                        Invalid benchmark form data. Please check your inputs.
+                        * benchmarks_list: {benchmarks_list!r}
+                        * benchmark_values: {benchmark_values!r}
+                        """),
+                        file=sys.stderr,
+                    )
                     return styled_error("Invalid benchmark form data. Please check your inputs.")
 
                 # Split into checkbox values and result values
-                benchmark_checkbox_values = [benchmark_values[i] for i in range(0, len(benchmark_values), 2)]
-                benchmark_result_values = [benchmark_values[i] for i in range(1, len(benchmark_values), 2)]
+                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]
 
                 try:
                     final_json = build_json_from_form(
@@ -664,24 +691,28 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
         submission_result = gr.Markdown()
 
         # Collect all inputs for submission
-        all_inputs = [
-            model_name_textbox,
-            base_model_name_textbox,
-            revision_name_textbox,
-            precision,
-            weight_type,
-            model_type,
-            json_str,
-            commit_textbox,
-            login_button,  # oauth_profile must be before *benchmark_values
-        ]
         # Add benchmark form inputs (these will be captured by *benchmark_values)
+        benchmark_values = []
         for _, checkbox, result_input in benchmark_results_form:
-            all_inputs.extend([checkbox, result_input])
+            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,
+                precision=precision,
+                weight_type=weight_type,
+                model_type=model_type,
+                json_str=json_str,
+                commit_message=commit_textbox,
+                # oauth_profile=login_button,
+            )
+        )
 
         submit_button.click(
-            fn=submit_with_form_or_json,
-            inputs=all_inputs,
+            fn=partial(submit_with_form_or_json, benchmark_values=benchmark_values),
+            inputs=list(all_inputs),
             outputs=submission_result,
         )