feat: enhance submission process by adding user ID handling and improving JSON structure for submissions

app.py

@@ -574,14 +574,24 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
             revision: str,
             precision: str,
             weight_type: str,
-            model_type: str,  # Currently not used but kept for future use
+            model_type: str,
             json_str: str,
             commit_message: str,
             *benchmark_values,
+            oauth_profile: gr.OAuthProfile | None = None,
         ):
             """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.")
+
+            # Extract user_id from OAuth profile
+            user_id = oauth_profile.get("preferred_username") or oauth_profile.get("sub", None)
+            if not user_id:
+                return styled_error("Unable to get user ID. Please try logging in again.")
+
             # If JSON is provided, use it; otherwise build from form
             if json_str and json_str.strip():
                 try:
@@ -610,8 +620,18 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
                 except Exception as e:
                     return styled_error(f"Error building JSON: {str(e)}")
 
-            # Call the submit function
-            return add_new_submit(model, base_model, revision, precision, weight_type, final_json, commit_message)
+            # Call the submit function with all fields including user_id
+            return add_new_submit(
+                model=model,
+                base_model=base_model,
+                revision=revision,
+                precision=precision,
+                weight_type=weight_type,
+                model_type=model_type,
+                json_str=final_json,
+                commit_message=commit_message,
+                user_id=user_id,
+            )
 
         # Create submit button outside form_container so it can be referenced
         # Initially hidden and disabled (will be shown and enabled when user logs in)

src/backend/routes/hf.py

@@ -66,19 +66,6 @@ async def upload_file_content_handler(
     commit_message: str | None = None,
 ):
     """Community submit handler."""
-
-    # FIXME: debug
-    import rich
-
-    rich.print({
-        "path_or_fileobj": path_or_fileobj,
-        "path_in_repo": path_in_repo,
-        "repo_id": repo_id,
-        "repo_type": repo_type,
-        "commit_message": commit_message,
-    })
-    raise RuntimeError("debug")
-
     commit_info = settings.hf_api.upload_file(
         path_or_fileobj=path_or_fileobj,
         path_in_repo=path_in_repo,

src/backend/schemas.py

@@ -100,8 +100,11 @@ class HfRepoUrl(BaseModel):
 class CommunitySubmit_Params(BaseModel):
     username: Annotated[str, Field(description='The username of the user. e.g. "Qwen"')]
 
-    # Commit info
+    # Model info
     model_id: Annotated[str, Field(description='The model id. e.g. "Qwen/Qwen2.5-3B"')]
+    base_model: Annotated[
+        str, Field(description='The base model name (for delta or adapter weights). e.g. "Qwen/Qwen2.5-3B"')
+    ] = ""
     model_sha: Annotated[
         str, Field(description='The model sha or "main". e.g. "3aab1f1954e9cc14eb9509a215f9e5ca08227a9b"')
     ] = "main"
@@ -132,8 +135,15 @@ class CommunitySubmit_Params(BaseModel):
         "float8_e8m0fnu",
         "float4_e2m1fn_x2",
     ]
-    content: Annotated[str, Field(description='The content of the file in JSON format to upload.')]
     weight_type: Literal["Original"] | str = "Original"
+    model_type: Annotated[str, Field(description='The model type. e.g. "pretrained", "fine-tuned"')] = ""
+
+    # Submission info
+    content: Annotated[str, Field(description='The content of the file in JSON format to upload.')]
+    submit_time: Annotated[
+        str, Field(description='The submission time in UTC ISO format. e.g. "2025-01-15T10:30:00Z"')
+    ]
+    commit_message: str | None = None
 
     @computed_field
     @property
@@ -149,5 +159,3 @@ class CommunitySubmit_Params(BaseModel):
                 "username_invalid", "Username {username!r} is invalid.", {"username": self.username}
             )
         return f"{model_name}_eval_request_False_{self.model_dtype}_{self.weight_type}_{self.username}.json"
-
-    commit_message: str | None = None

src/submission/submit.py

@@ -23,21 +23,40 @@ REQUESTED_MODELS: set[str] | None = None
 
 
 def add_new_submit(
-    model: str, base_model: str, revision: str, precision: str, weight_type: str, json_str: str, commit_message: str
+    model: str,
+    base_model: str,
+    revision: str,
+    precision: str,
+    weight_type: str,
+    model_type: str,
+    json_str: str,
+    commit_message: str,
+    user_id: str,
 ):
+    """
+    Submit a new evaluation request.
+
+    Args:
+        model: Model name (e.g., "org/model_name")
+        base_model: Base model name (for delta or adapter weights)
+        revision: Model revision/commit (defaults to "main" if empty)
+        precision: Model precision (e.g., "float16", "bfloat16")
+        weight_type: Weight type (e.g., "Original", "Delta", "Adapter")
+        model_type: Model type (e.g., "pretrained", "fine-tuned")
+        json_str: JSON string containing config and results
+        commit_message: Optional commit message
+        user_id: Submitter's HuggingFace user ID/username (from OAuth)
+    """
     global REQUESTED_MODELS
     if not REQUESTED_MODELS:
         REQUESTED_MODELS, _ = already_submitted_models(settings.EVAL_REQUESTS_PATH.as_posix())
 
-    user_name = ""
-    model_path = model
-    if "/" in model:
-        user_name = model.split("/")[0]
-        model_path = model.split("/")[1]
+    # Use provided user_id, or extract from model name as fallback
+    user_name = user_id
 
-    precision = precision.split(" ")[0]
+    precision = precision.split(" ")[0] if precision else "float16"
     # Does the model actually exist?
-    if revision == "":
+    if not revision or revision == "":
         revision = "main"
 
     # Is the model on the hub?
@@ -67,13 +86,52 @@ def add_new_submit(
     except Exception:
         return styled_error("Please select a license for your model")
 
+    # Validate required fields
+    if not model or not model.strip():
+        return styled_error("Model name is required.")
+    if not user_name or not user_name.strip():
+        return styled_error("User ID/username is required. Please make sure you are logged in.")
+
+    # Get current UTC time for submit_time
+    current_time = datetime.now(UTC).strftime("%Y-%m-%dT%H:%M:%SZ")
+
+    # Parse the evaluation results JSON (json_str contains config and results)
+    try:
+        eval_results = json.loads(json_str)
+    except json.JSONDecodeError:
+        return styled_error("Invalid evaluation results JSON format.")
+
+    # Organize all fields into a comprehensive JSON structure for the content field
+    # This will be the complete JSON that gets uploaded as a file
+    complete_submission_content = {
+        "username": user_name,
+        "model_id": model,
+        "base_model": base_model or "",
+        "model_sha": revision,
+        "model_dtype": precision,
+        "weight_type": weight_type,
+        "model_type": model_type or "",
+        "submit_time": current_time,
+        "commit_message": commit_message,
+        # Include the evaluation results (config and results)
+        "config": eval_results.get("config", {}),
+        "results": eval_results.get("results", {}),
+    }
+
+    # Convert the complete submission content to JSON string for the content field
+    complete_content_json_str = json.dumps(complete_submission_content, indent=2, ensure_ascii=False)
+
+    # Request JSON for the API call - includes all fields separately
     request_json = {
         "username": user_name,
         "model_id": model,
+        "base_model": base_model or "",
         "model_sha": revision,
         "model_dtype": precision,
-        "content": json_str,
         "weight_type": weight_type,
+        "model_type": model_type or "",
+        "content": complete_content_json_str,  # Complete JSON with all fields
+        "submit_time": current_time,
         "commit_message": commit_message,
     }