Update miniapp_leaderboard.py

miniapp_leaderboard.py

@@ -74,65 +74,42 @@ def refresh():
     return _load_df(APPROVED_PREFIX)
 
 def _today_utc():
-    return datetime.datetime.utcnow().date().isoformat()  # YYYY-MM-DD
+    return datetime.datetime.utcnow().date().isoformat()
 
 def _send_email_resend(subject: str, text: str):
-    # 可替换为 SendGrid/Mailgun
     if not (RESEND_API_KEY and NOTIFY_EMAIL_TO and NOTIFY_EMAIL_FROM):
-        return  # 没配置就不发
-
+        return
     requests.post(
         "https://api.resend.com/emails",
-        headers={
-            "Authorization": f"Bearer {RESEND_API_KEY}",
-            "Content-Type": "application/json",
-        },
-        json={
-            "from": NOTIFY_EMAIL_FROM,
-            "to": [NOTIFY_EMAIL_TO],
-            "subject": subject,
-            "text": text,
-        },
+        headers={"Authorization": f"Bearer {RESEND_API_KEY}", "Content-Type": "application/json"},
+        json={"from": NOTIFY_EMAIL_FROM, "to": [NOTIFY_EMAIL_TO], "subject": subject, "text": text},
         timeout=20,
     )
 
 def _already_submitted_today(api: HfApi, day: str, username: str) -> bool:
-    # 用“标记文件”判断：pending/YYYY-MM-DD/<username>/_submitted.json
     marker = f"{PENDING_PREFIX}{day}/{username}/_submitted.json"
     try:
         files = api.list_repo_files(repo_id=LEADERBOARD_DATASET, repo_type="dataset")
         return marker in files
     except Exception:
-        # 列表失败时宁可放行或宁可拒绝，二选一；这里选择拒绝更安全
-        return True
+        return True  # 更安全：查不到就当提交过
 
-def submit(model_name, model_family, zip_file, request: gr.Request):
-    # 1) 必须登录：从 request 拿 HF username
-    username = None
-    try:
-        # gradio 在 HF Spaces 登录场景下，通常能从 request 得到用户信息
-        # 不同版本字段可能略有差异；这里做多种兜底
-        username = getattr(request, "username", None) \
-                   or (request.headers.get("x-forwarded-user") if request else None)
-    except Exception:
-        username = None
+# ✅ 改这里：用 profile 取 username
+def submit(model_name, model_family, zip_file, profile: gr.OAuthProfile):
+    if profile is None or not getattr(profile, "username", None):
+        return "Please sign in with Hugging Face first.", refresh()
+    username = profile.username
 
-    if not username:
-        return "Please sign in first (HF login) before submitting.", refresh()
-
-    # 2) 基础校验
     if not model_name or not model_family or zip_file is None:
         return "All fields are required.", refresh()
     if not zip_file.name.endswith(".zip"):
         return "Please upload a .zip file.", refresh()
-
     if not HF_TOKEN or not LEADERBOARD_DATASET:
         return "Server is not configured (HF_TOKEN / LEADERBOARD_DATASET).", refresh()
 
     api = _api()
     day = _today_utc()
 
-    # 3) 每天一次限制
     if _already_submitted_today(api, day, username):
         return f"Limit: you can only submit once per day. (user={username}, day={day})", refresh()
 
@@ -140,7 +117,6 @@ def submit(model_name, model_family, zip_file, request: gr.Request):
     safe_model = _slug(model_name)
     nonce = uuid.uuid4().hex[:6]
 
-    # 4) 按日期/用户名组织路径
     base_dir = f"{PENDING_PREFIX}{day}/{username}/"
     json_path = f"{base_dir}{now}-{safe_model}-{nonce}.json"
     zip_path  = f"{base_dir}{now}-{safe_model}-{nonce}.zip"
@@ -149,52 +125,36 @@ def submit(model_name, model_family, zip_file, request: gr.Request):
     payload = {
         "model name": model_name,
         "model family": model_family,
-        "avg": 0,
-        "easy": 0,
-        "mid": 0,
-        "hard": 0,
+        "avg": 0, "easy": 0, "mid": 0, "hard": 0,
         "submitted_at": now,
         "username": username,
         "day": day,
     }
 
-    # 5) 上传 JSON / ZIP / marker（marker 用于每天一次）
     api.upload_file(
-        repo_id=LEADERBOARD_DATASET,
-        repo_type="dataset",
+        repo_id=LEADERBOARD_DATASET, repo_type="dataset",
         path_or_fileobj=io.BytesIO(json.dumps(payload, indent=2).encode("utf-8")),
         path_in_repo=json_path,
         commit_message=f"submit {model_name} by {username}",
     )
 
     api.upload_file(
-        repo_id=LEADERBOARD_DATASET,
-        repo_type="dataset",
+        repo_id=LEADERBOARD_DATASET, repo_type="dataset",
         path_or_fileobj=zip_file,
         path_in_repo=zip_path,
         commit_message=f"upload zip {model_name} by {username}",
     )
 
     api.upload_file(
-        repo_id=LEADERBOARD_DATASET,
-        repo_type="dataset",
+        repo_id=LEADERBOARD_DATASET, repo_type="dataset",
         path_or_fileobj=io.BytesIO(json.dumps({"submitted_at": now, "username": username, "day": day}, indent=2).encode("utf-8")),
         path_in_repo=marker_path,
         commit_message=f"marker {day} {username}",
     )
 
-    # 6) 邮件提醒
     _send_email_resend(
         subject=f"[{APP_NAME}] New submission from {username} ({day})",
-        text=(
-            f"New submission received.\n\n"
-            f"user: {username}\n"
-            f"day: {day}\n"
-            f"model: {model_name}\n"
-            f"family: {model_family}\n"
-            f"json: {json_path}\n"
-            f"zip: {zip_path}\n"
-        ),
+        text=f"user: {username}\nday: {day}\nmodel: {model_name}\nfamily: {model_family}\njson: {json_path}\nzip: {zip_path}\n",
     )
 
     return "Submitted. Waiting for review.", refresh()
@@ -203,26 +163,24 @@ def submit(model_name, model_family, zip_file, request: gr.Request):
 with gr.Blocks(title=f"{APP_NAME} leaderboard") as demo:
     gr.Markdown(f"# {APP_NAME} Leaderboard")
 
-    leaderboard = gr.Dataframe(
-        value=_load_df(APPROVED_PREFIX),
-        interactive=False,
-        wrap=True,
-    )
-
+    leaderboard = gr.Dataframe(value=_load_df(APPROVED_PREFIX), interactive=False, wrap=True)
     refresh_btn = gr.Button("Refresh")
 
     gr.Markdown("## Submit (login required)")
-
     model_name = gr.Textbox(label="Model name")
     model_family = gr.Textbox(label="Model family")
     zip_file = gr.File(label="Upload zip", file_types=[".zip"])
+
+    # ✅ 增加登录按钮
+    login_btn = gr.LoginButton()
+
     submit_btn = gr.Button("Submit", variant="primary")
     status = gr.Markdown()
 
     refresh_btn.click(refresh, outputs=[leaderboard])
     submit_btn.click(
         submit,
-        inputs=[model_name, model_family, zip_file],
+        inputs=[model_name, model_family, zip_file],  # profile 不需要作为 inputs 传，会自动注入
         outputs=[status, leaderboard],
     )