Update miniapp_leaderboard.py

miniapp_leaderboard.py

@@ -4,42 +4,34 @@ import json
 import os
 import re
 import uuid
+import requests
 
 import gradio as gr
 import pandas as pd
 from huggingface_hub import HfApi, hf_hub_download
 
-APP_NAME = "MiniApp"
+APP_NAME = "MiniApp2"
 
 HF_TOKEN = os.environ.get("HF_TOKEN")
 LEADERBOARD_DATASET = os.environ.get("LEADERBOARD_DATASET", "").strip()
-OWNER_REVIEW_TOKEN = os.environ.get("OWNER_REVIEW_TOKEN", "").strip()
 
 PENDING_PREFIX = "pending/"
 APPROVED_PREFIX = "approved/"
 
-COLUMNS = [
-    "model name",
-    "model family",
-    "avg",
-    "easy",
-    "mid",
-    "hard",
-    "submitted_at",
-]
-
-NUMERIC_COLS = ["avg", "easy", "mid", "hard"]
+RESEND_API_KEY = os.environ.get("RESEND_API_KEY", "").strip()
+NOTIFY_EMAIL_TO = os.environ.get("NOTIFY_EMAIL_TO", "").strip()
+NOTIFY_EMAIL_FROM = os.environ.get("NOTIFY_EMAIL_FROM", "").strip()
 
+COLUMNS = ["model name","model family","avg","easy","mid","hard","submitted_at"]
+NUMERIC_COLS = ["avg","easy","mid","hard"]
 
 def _api():
     return HfApi(token=HF_TOKEN)
 
-
 def _slug(s: str):
     s = re.sub(r"[^a-z0-9]+", "-", (s or "").lower())
     return s.strip("-") or "model"
 
-
 def _load_df(prefix: str):
     if not HF_TOKEN or not LEADERBOARD_DATASET:
         return pd.DataFrame(columns=COLUMNS)
@@ -52,7 +44,6 @@ def _load_df(prefix: str):
 
     files = [f for f in files if f.startswith(prefix) and f.endswith(".json")]
     rows = []
-
     for f in files:
         try:
             path = hf_hub_download(
@@ -73,31 +64,87 @@ def _load_df(prefix: str):
     for c in COLUMNS:
         if c not in df.columns:
             df[c] = ""
-
     for c in NUMERIC_COLS:
         df[c] = pd.to_numeric(df[c], errors="coerce")
 
     df = df.sort_values(by="avg", ascending=False)
     return df[COLUMNS]
 
-
 def refresh():
     return _load_df(APPROVED_PREFIX)
 
+def _today_utc():
+    return datetime.datetime.utcnow().date().isoformat()  # YYYY-MM-DD
+
+def _send_email_resend(subject: str, text: str):
+    # 可替换为 SendGrid/Mailgun
+    if not (RESEND_API_KEY and NOTIFY_EMAIL_TO and NOTIFY_EMAIL_FROM):
+        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,
+        },
+        timeout=20,
+    )
 
-def submit(model_name, model_family, email, zip_file):
-    if not model_name or not model_family or not email or zip_file is None:
-        return "All fields are required.", refresh()
+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
+
+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
+
+    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()
+
     now = datetime.datetime.utcnow().isoformat() + "Z"
     safe_model = _slug(model_name)
     nonce = uuid.uuid4().hex[:6]
 
-    json_path = f"{PENDING_PREFIX}{now}-{safe_model}-{nonce}.json"
-    zip_path = f"{PENDING_PREFIX}{now}-{safe_model}-{nonce}.zip"
+    # 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"
+    marker_path = f"{base_dir}_submitted.json"
 
     payload = {
         "model name": model_name,
@@ -107,65 +154,67 @@ def submit(model_name, model_family, email, zip_file):
         "mid": 0,
         "hard": 0,
         "submitted_at": now,
-        "email": email,
+        "username": username,
+        "day": day,
     }
 
-    api = _api()
-
-    # 上传 JSON
+    # 5) 上传 JSON / ZIP / marker（marker 用于每天一次）
     api.upload_file(
         repo_id=LEADERBOARD_DATASET,
         repo_type="dataset",
-        path_or_fileobj=io.BytesIO(
-            json.dumps(payload, indent=2).encode("utf-8")
-        ),
+        path_or_fileobj=io.BytesIO(json.dumps(payload, indent=2).encode("utf-8")),
         path_in_repo=json_path,
-        commit_message=f"submit {model_name}",
+        commit_message=f"submit {model_name} by {username}",
     )
 
-    # 上传 ZIP
     api.upload_file(
         repo_id=LEADERBOARD_DATASET,
         repo_type="dataset",
         path_or_fileobj=zip_file,
         path_in_repo=zip_path,
-        commit_message=f"upload zip {model_name}",
+        commit_message=f"upload zip {model_name} by {username}",
+    )
+
+    api.upload_file(
+        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"
+        ),
     )
 
     return "Submitted. Waiting for review.", refresh()
 
-with gr.Blocks(
-    title=f"{APP_NAME} leaderboard",
-    css="""
-    /* 全局字体变大（影响 Markdown、按钮、输入框等） */
-    :root { --body-text-size: 18px; }
-    .gradio-container { font-size: var(--body-text-size); }
-
-    /* 表格字体、行高 */
-    #leaderboard_table table { font-size: 18px; }
-    #leaderboard_table th, #leaderboard_table td { padding: 10px 12px; }
-
-    /* Dataframe 内部输入/渲染（不同版本 gradio 结构可能略不同，这两条通常有用） */
-    #leaderboard_table .cell-wrap, 
-    #leaderboard_table .ag-cell { font-size: 18px !important; }
-    """
-) as demo:
+
+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,
-        elem_id="leaderboard_table",   # 关键：给它一个 id 方便写 CSS
-        elem_classes="full-width",
     )
+
     refresh_btn = gr.Button("Refresh")
 
-    gr.Markdown("## Submit")
+    gr.Markdown("## Submit (login required)")
 
     model_name = gr.Textbox(label="Model name")
     model_family = gr.Textbox(label="Model family")
-    email = gr.Textbox(label="Email")
     zip_file = gr.File(label="Upload zip", file_types=[".zip"])
     submit_btn = gr.Button("Submit", variant="primary")
     status = gr.Markdown()
@@ -173,8 +222,8 @@ with gr.Blocks(
     refresh_btn.click(refresh, outputs=[leaderboard])
     submit_btn.click(
         submit,
-        inputs=[model_name, model_family, email, zip_file],
+        inputs=[model_name, model_family, zip_file],
         outputs=[status, leaderboard],
     )
 
-demo.launch()
+demo.launch()