wip

README.md

@@ -5,12 +5,11 @@ colorFrom: green
 colorTo: indigo
 sdk: gradio
 hf_oauth: true
-hf_oauth_expiration_minutes: 2
 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

@@ -1,12 +1,9 @@
-from http.cookies import SimpleCookie
-import os
 import gradio as gr
 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 fastapi import Response
 
 from src.about import CITATION_BUTTON_LABEL, CITATION_BUTTON_TEXT, EVALUATION_QUEUE_TEXT, INTRODUCTION_TEXT, TITLE
 from src.datamodel.data import F1Data
@@ -87,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)
@@ -102,7 +99,7 @@ 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}")
@@ -160,66 +157,21 @@ def add_solution_cbk(
     )
 
 
-# def check_valid_token(oauth_token: gr.OAuthToken | None):
-#     logger.info("CHECK TOKEN %s", oauth_token)
-#     if oauth_token is None:
-#         logger.info("CHECK: NO TOKEN")
-#         return gr.update(value="")
-#     try:
-#         whoami(oauth_token.token)
-#         logger.info("CHECK: VALID TOKEN")
-#         return gr.update(value="")
-#     except Exception:
-#         logger.info("CHECK: TOKEN HAS EXPIRED")
-#         return gr.update(value='<script>window.location.href = "/logout";</script>')
-
-
-# def gate_submission_by_prof(profile: gr.OAuthProfile | None):
-#     if not profile:
-#         return gr.update(visible=True), gr.update(visible=False)
-#     return gr.update(visible=False), gr.update(visible=True)
-
-
-def gate_submission(oauth_token: gr.OAuthToken | None, request: gr.Request):
+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.
     """
-    # Log cookie sizes
-    cookies = request.headers.get("cookie", "")
-    cookie_obj = SimpleCookie()
-    try:
-        cookie_obj.load(cookies)
-        for key in ["spaces-jwt", "session"]:
-            if key in cookie_obj:
-                cookie_size = len(cookie_obj[key].OutputString().encode('utf-8'))
-                logger.info(f"Cookie {key} size: {cookie_size} bytes")
-    except Exception as e:
-        logger.error(f"Error parsing cookies: {str(e)}")
-
     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), gr.update(visible=False)
+        return gr.update(visible=True), gr.update(visible=False)
     try:
-        token_size = len(oauth_token.token.encode('utf-8'))
-        logger.info(f"Token size: {token_size} bytes")
         whoami(oauth_token.token)
         logger.info("GATE: TOKEN IS VALID")
-        return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
+        return gr.update(visible=False), gr.update(visible=True)
     except Exception:
         logger.info("GATE: TOKEN HAS EXPIRED")
-        return gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)
-
-# Custom route to force clear HttpOnly cookies
-def clear_cookies():
-    response = Response()
-    response.headers["Set-Cookie"] = [
-        "spaces-jwt=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Domain=" + os.environ.get("SPACE_HOST", ""),
-        "session=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Domain=" + os.environ.get("SPACE_HOST", "")
-    ]
-    response.headers["Location"] = "/?t=" + str(int(os.times().elapsed * 1000))
-    response.status_code = 302
-    return response
+        return gr.update(visible=True), gr.update(visible=False)
 
 
 def get_theme():
@@ -242,17 +194,6 @@ def get_theme():
     )
     return cyber_theme
 
-# JavaScript to clear cookies and reload
-JS_LOGOUT = """
-<a href="#" onclick="
-  var domain = window.location.hostname;
-  document.cookie = 'spaces-jwt=; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Domain=' + domain;
-  document.cookie = 'session=; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Domain=' + domain;
-  console.log('Cookies cleared: spaces-jwt, session on domain: ' + domain);
-  window.location.href='/?t='+new Date().getTime();
-  return false;
-" style="display: inline-block; padding: 10px; background: #ff4d4f; color: white; text-decoration: none; border-radius: 5px;">Manual Logout</a>
-"""
 
 blocks = gr.Blocks(css=custom_css, theme=get_theme())
 with blocks:
@@ -311,20 +252,6 @@ with blocks:
                 gr.Markdown("Please sign in to continue:")
                 gr.LoginButton()
 
-            # Shown when login token is EXPIRED
-            logout_box = gr.Group(visible=False)
-            with logout_box:
-                gr.Markdown("Your session has already EXPIRED. Please sign in again")
-                gr.LoginButton()
-#                gr.Button("Manual Logout", link="/logout")
-                # gr.HTML(JS_LOGOUT)
-                # Manual logout link to server-side /logout
-                # gr.HTML('<a href="/logout?redirect=/" style="display: inline-block; padding: 10px; background: #ff4d4f; color: white; text-decoration: none; border-radius: 5px;">Logout (via /logout)</a>')
-
-                # Custom clear cookies link
-                # gr.HTML('<a href="/clear-cookies" style="display: inline-block; padding: 10px; background: #ff6666; color: white; text-decoration: none; border-radius: 5px; margin-left: 10px;">Clear Cookies</a>')
-
-
             # Shown when logged IN
             submit_panel = gr.Group(visible=False)
             with submit_panel:
@@ -366,18 +293,12 @@ with blocks:
                 elem_id="citation-block",
             )
 
-    # Trigger reload if token is expired
-    # blocks.load(check_valid_token, outputs=reload_html)
-
     # UI refresh triggers latest data swap.
     # The work already happened in the background - refresh_leaderboard_data().
     blocks.load(lambda: leaderboard_df, inputs=[], outputs=[leaderboard_component])
 
     # On initial load (and after OAuth redirect), toggle the UI based on login status.
-    # blocks.load(gate_submission, inputs=None, outputs=[login_box, submit_panel])
-    blocks.load(gate_submission, inputs=None, outputs=[login_box, logout_box, submit_panel])
-
-# blocks.app.add_api_route("/clear-cookies", clear_cookies, methods=["GET"])
+    blocks.load(gate_submission, inputs=None, outputs=[login_box, submit_panel])
 
 
 logger.info("Scheduler")