fetch user info from HF for stable user id

app.py

@@ -3,7 +3,6 @@ import pandas as pd
 from apscheduler.schedulers.background import BackgroundScheduler
 from gradio_leaderboard import ColumnFilter, Leaderboard, SelectColumns
 from gradio.themes import Base, colors, sizes
-from huggingface_hub import whoami
 
 from src.about import CITATION_BUTTON_LABEL, CITATION_BUTTON_TEXT, EVALUATION_QUEUE_TEXT, INTRODUCTION_TEXT, TITLE
 from src.datamodel.data import F1Data
@@ -13,7 +12,7 @@ from src.display.utils import AutoEvalColumn, ModelType, fields
 from src.envs import API, CODE_PROBLEMS_REPO, REPO_ID, RESULTS_REPO, SUBMISSIONS_REPO
 from src.logger import get_logger
 from src.populate import get_leaderboard_df
-from src.submission.submit import add_new_solutions, fetch_sub_claim
+from src.submission.submit import add_new_solutions, fetch_user_info
 from src.validation.validate import MAX_INPUT_LENGTH, MIN_INPUT_LENGTH, is_submission_file_valid, is_valid
 
 logger = get_logger(__name__)
@@ -97,25 +96,23 @@ def add_solution_cbk(
     logger.info(f"Display name: {display_name}")
 
     # Stable account id
-    claims = fetch_sub_claim(token) or {}
-    logger.info(f"Claims: {claims}")
-    stable_id = claims.get("sub")
+    user_info = fetch_user_info(token)
+    logger.info("Logged in user info: %s", user_info)
+    stable_id = user_info.get("id")
     logger.info(f"User stable ID: {stable_id}")
 
-    # if not stable_id:
-    #     return styled_error("Could not retrieve your stable user ID. Please try signing in again.")
-    # user_id = stable_id
+    if not stable_id:
+        return styled_error("Could not retrieve your stable user ID. Please try signing in again.")
+    user_id = stable_id
 
-    # NOTE: stable_id is sometimes None (expired Token?) so we opt to use username.
-    # TODO: extract stable_id robustly, if possible.
     if not profile.username:
         return styled_error("Could not retrieve username. Please try signing in again.")
     # We rely on underscores as separators in submission ID, replace it with "-".
-    user_id = profile.username.replace("_", "-")
+    # user_id = profile.username.replace("_", "-")
 
     try:
         # Validating the submission file.
-        if len(submission_path) == 0:
+        if not submission_path:
             return styled_error("Please upload JSONL submission file.")
 
         if not is_submission_file_valid(

src/submission/submit.py

@@ -157,6 +157,19 @@ def fetch_sub_claim(oauth_token: gr.OAuthToken | None) -> dict | None:
         return None
 
 
+def fetch_user_info(oauth_token: gr.OAuthToken | None) -> dict | None:
+    if oauth_token is None:
+        return None
+    try:
+        headers = {"Authorization": f"Bearer {oauth_token.token}"}
+        r = requests.get("https://huggingface.co/api/whoami-v2", headers=headers)
+        if r.status_code != 200:
+            return None
+        return r.json()
+    except:
+        logger.exception("Cannot get user info")
+        return None
+
 def _validate_all_submissions_present(
     lbdb: F1Data,
     pd_ds: pd.DataFrame,