Merge branch 'main' of hf.co:spaces/double-ai/FormulaOne-Leaderboard

README.md

@@ -9,7 +9,7 @@ app_file: app.py
 pinned: true
 license: apache-2.0
 short_description: FormulaOne Leaderboard
-sdk_version: 5.19.0
+sdk_version: 5.42.0
 ---
 
 # Start the configuration

app.py

@@ -3,6 +3,7 @@ import pandas as pd
 from apscheduler.schedulers.background import BackgroundScheduler
 from gradio.themes import Base, colors, sizes
 from gradio_leaderboard import Leaderboard, SelectColumns
+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
@@ -83,13 +84,13 @@ def add_solution_cbk(
     sys_type: str,
     submission_path: str,
     profile: gr.OAuthProfile | None,
-    token: gr.OAuthToken | None,
+    oauth_token: gr.OAuthToken | None,
 ):
     logger.info("Fetching user details for submission")
     logger.info("PROFILE %s", profile)
-    logger.info("TOKEN %s", token)
+    logger.info("TOKEN %s", oauth_token)
 
-    if profile is None or token is None:
+    if profile is None or oauth_token is None:
         return styled_error("Please sign in with Hugging Face before submitting.")
 
     # Display handle and display name (may change over time)
@@ -98,20 +99,19 @@ def add_solution_cbk(
     logger.info(f"Display name: {display_name}")
 
     # Stable account id
-    user_info = fetch_user_info(token)
+    user_info = fetch_user_info(oauth_token)
     logger.info("Logged in user info: %s", user_info)
     stable_id = user_info.get("id") if user_info else None
     logger.info(f"User stable ID: {stable_id}")
 
-    # TODO: find a way to invalidate login status if token is outdated
-    # 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
 
     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.
@@ -156,13 +156,21 @@ def add_solution_cbk(
     )
 
 
-def gate_submission(profile: gr.OAuthProfile | None):
+def gate_submission(oauth_token: gr.OAuthToken | None):
     """
     @brief Toggles the visibility of the login box and submission panel based on the user's login status.
     """
-    if profile is None:
+    logger.info("GATE TOKEN %s", oauth_token)
+    if oauth_token is None:
+        logger.info("GATE: NO TOKEN")
+        return gr.update(visible=True), gr.update(visible=False)
+    try:
+        whoami(oauth_token.token)
+        logger.info("GATE: TOKEN IS VALID")
+        return gr.update(visible=False), gr.update(visible=True)
+    except Exception:
+        logger.info("GATE: TOKEN HAS EXPIRED")
         return gr.update(visible=True), gr.update(visible=False)
-    return gr.update(visible=False), gr.update(visible=True)
 
 
 def get_theme():
@@ -240,7 +248,7 @@ with blocks:
             # Shown when logged OUT
             login_box = gr.Group(visible=True)
             with login_box:
-                gr.Markdown("Please sign in to continue:")
+                gr.Markdown("Please sign in with Hugging Face to submit")
                 gr.LoginButton()
 
             # Shown when logged IN

requirements.txt

@@ -2,7 +2,7 @@ APScheduler
 black
 datasets
 pydantic==2.10.6
-gradio
+gradio==5.42.0
 gradio[oauth]
 gradio_leaderboard==0.0.13
 gradio_client

src/envs.py

@@ -1,4 +1,5 @@
 import os
+import gradio as gr
 
 from huggingface_hub import HfApi
 
@@ -16,6 +17,7 @@ RESULTS_REPO = f"{OWNER}/dev-f1-leaderboard-results"
 # If you setup a cache later, just change HF_HOME
 CACHE_PATH = os.getenv("HF_HOME", ".")
 
+print(f"RUNNING gradio {gr.__version__}")
 print(f"{TOKEN=}")
 print(f"{REPO_ID=}")