refactor: update model key extraction and improve model dtype handling in create_submit_tab function for enhanced clarity

app.py

@@ -544,13 +544,13 @@ def create_submit_tab(tab_id: int, demo: gr.Blocks):
                 raise ValueError("Model name is required")
 
             # Extract model_key from model_name (simple conversion)
-            model_key = model_name.lower().replace("/", "_").replace("-", "_")
+            model_key = model_name.lower().replace("-", "_").replace("/", "-")
 
             # Build config
             config = {
                 "model_name": model_name,
                 "model_key": model_key,
-                "model_dtype": f"torch.{precision}" if precision else None,
+                "model_dtype": precision or None,
                 "model_sha": revision or None,  # None means "main"
                 "model_args": None,
             }

src/backend/schemas.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import Annotated, Any, Generic, Literal, TypeVar
 
-from pydantic import BaseModel, ConfigDict, Field, computed_field
+from pydantic import AfterValidator, BaseModel, ConfigDict, Field, computed_field
 from pydantic_core import PydanticCustomError
 
 T = TypeVar("T", bound=BaseModel)
@@ -102,12 +102,22 @@ class CommunitySubmit_Params(BaseModel):
 
     # Model info
     model_id: Annotated[str, Field(description='The model id. e.g. "Qwen/Qwen2.5-3B"')]
+
+    @computed_field
+    @property
+    def model_key(self) -> str:
+        if not self.model_id:
+            raise PydanticCustomError(
+                "model_id_invalid", "Model id {model_id!r} is invalid.", {"model_id": self.model_id}
+            )
+        return self.model_id.lower().replace("-", "_").replace("/", "-")
+
     base_model: Annotated[
-        str, Field(description='The base model name (for delta or adapter weights). e.g. "Qwen/Qwen2.5-3B"')
-    ] = ""
+        str | None, Field(description='The base model name (for delta or adapter weights). e.g. "Qwen/Qwen2.5-3B"')
+    ] = None
     model_sha: Annotated[
-        str, Field(description='The model sha or "main". e.g. "3aab1f1954e9cc14eb9509a215f9e5ca08227a9b"')
-    ] = "main"
+        str | None, Field(description='The model sha or "main". e.g. "3aab1f1954e9cc14eb9509a215f9e5ca08227a9b"')
+    ] = None
     model_dtype: Literal[
         # float types
         "bfloat16",
@@ -135,8 +145,11 @@ class CommunitySubmit_Params(BaseModel):
         "float8_e8m0fnu",
         "float4_e2m1fn_x2",
     ]
-    weight_type: Literal["Original"] | str = "Original"
-    model_type: Annotated[str, Field(description='The model type. e.g. "pretrained", "fine-tuned"')] = ""
+    weight_type: Literal["Original", "Delta", "Adapter"] = "Original"
+    model_type: Annotated[
+        str,
+        Field(description='The model type. e.g. "pretrained", "fine-tuned", "instruction-tuned", "RL-tuned"'),
+    ]
 
     # Submission info
     content: Annotated[str, Field(description='The content of the file in JSON format to upload.')]
@@ -149,13 +162,14 @@ class CommunitySubmit_Params(BaseModel):
     @property
     def filename(self) -> str:
         """Filename of the file to upload."""
-        model_name = self.model_id.split("/")[-1]
-        if not model_name:
+        if not self.model_key:
             raise PydanticCustomError(
-                "model_id_invalid", "Model id {model_id!r} is invalid.", {"model_id": self.model_id}
+                "model_key_invalid", "Model key {model_key!r} is invalid.", {"model_key": self.model_key}
             )
         if not self.username:
             raise PydanticCustomError(
                 "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"
+        # "2025-01-15T10:30:00Z" -> "20250115T103000"
+        submit_time = self.submit_time.replace(":", "").replace("-", "").rstrip("Z")
+        return f"{submit_time}_{self.model_key}_{self.model_dtype}_{self.model_sha}_{self.username}.json"

src/submission/submit.py

@@ -25,7 +25,7 @@ REQUESTED_MODELS: set[str] | None = None
 def add_new_submit(
     model: str,
     base_model: str,
-    revision: str,
+    revision: str | None,
     precision: str,
     weight_type: str,
     model_type: str,
@@ -52,24 +52,29 @@ def add_new_submit(
         REQUESTED_MODELS, _ = already_submitted_models(settings.EVAL_REQUESTS_PATH.as_posix())
 
     # Use provided user_id, or extract from model name as fallback
-    user_name = user_id
 
-    precision = precision.split(" ")[0] if precision else "float16"
+    if " " in precision:
+        precision = precision.split(" ")[0]
     # Does the model actually exist?
-    if not revision or revision == "":
-        revision = "main"
+    revision = revision or None
 
     # Is the model on the hub?
     if weight_type in ["Delta", "Adapter"]:
         base_model_on_hub, error, _ = is_model_on_hub(
-            model_name=base_model, revision=revision, token=settings.HF_TOKEN.get_secret_value(), test_tokenizer=True
+            model_name=base_model,
+            revision=revision or "main",
+            token=settings.HF_TOKEN.get_secret_value(),
+            test_tokenizer=True,
         )
         if not base_model_on_hub:
             return styled_error(f'Base model "{base_model}" {error}')
 
     if not weight_type == "Adapter":
         model_on_hub, error, _ = is_model_on_hub(
-            model_name=model, revision=revision, token=settings.HF_TOKEN.get_secret_value(), test_tokenizer=True
+            model_name=model,
+            revision=revision or "main",
+            token=settings.HF_TOKEN.get_secret_value(),
+            test_tokenizer=True,
         )
         if not model_on_hub:
             return styled_error(f'Model "{model}" {error}')
@@ -89,7 +94,7 @@ def add_new_submit(
     # 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():
+    if not user_id or not user_id.strip():
         return styled_error("User ID/username is required. Please make sure you are logged in.")
 
     # Get current UTC time for submit_time
@@ -103,8 +108,9 @@ def add_new_submit(
 
     # Organize all fields into a comprehensive JSON structure for the content field
     # This will be the complete JSON that gets uploaded as a file
+    model_type = model_type.rpartition(":")[2].strip()  # "⭕ : instruction-tuned" -> "instruction-tuned"
     complete_submission_content = {
-        "username": user_name,
+        "user_id": user_id,
         "model_id": model,
         "base_model": base_model or "",
         "model_sha": revision,
@@ -123,7 +129,7 @@ def add_new_submit(
 
     # Request JSON for the API call - includes all fields separately
     request_json = {
-        "username": user_name,
+        "username": user_id,
         "model_id": model,
         "base_model": base_model or "",
         "model_sha": revision,