Allow admins to always see LB (#26)

competitions/app.py

@@ -62,6 +62,11 @@ class User(BaseModel):
     user_token: str
 
 
+class UserLB(BaseModel):
+    user_token: str
+    lb: str
+
+
 class UserSubmissionUpdate(BaseModel):
     user_token: str
     submission_ids: str
@@ -167,9 +172,15 @@ async def get_submission_info(request: Request):
     return resp
 
 
-@app.get("/leaderboard/{lb}", response_class=JSONResponse)
-async def get_leaderboard(request: Request, lb: str):
-    if DISABLE_PUBLIC_LB == 1 and lb == "public":
+@app.post("/leaderboard", response_class=JSONResponse)
+async def fetch_leaderboard(request: Request, user_lb: UserLB):
+    if USE_OAUTH == 1:
+        if request.session.get("oauth_info") is not None:
+            user_lb.user_token = request.session.get("oauth_info")["access_token"]
+
+    is_user_allowed = utils.is_user_admin(user_lb.user_token, COMPETITION_ID)
+
+    if DISABLE_PUBLIC_LB == 1 and user_lb.lb == "public" and not is_user_allowed:
         return {"response": "Public leaderboard is disabled by the competition host."}
 
     leaderboard = Leaderboard(
@@ -180,12 +191,12 @@ async def get_leaderboard(request: Request, lb: str):
         token=HF_TOKEN,
         scoring_metric=COMP_INFO.scoring_metric,
     )
-    if lb == "private":
-        current_utc_time = datetime.datetime.utcnow()
-        if current_utc_time < COMP_INFO.end_date:
+    if user_lb.lb == "private":
+        current_utc_time = datetime.datetime.now()
+        if current_utc_time < COMP_INFO.end_date and not is_user_allowed:
             return {"response": "Private leaderboard will be available after the competition ends."}
-    df = leaderboard.fetch(private=lb == "private")
-    logger.info(df)
+    df = leaderboard.fetch(private=user_lb.lb == "private")
+
     if len(df) == 0:
         return {"response": "No teams yet. Why not make a submission?"}
     resp = {"response": df.to_markdown(index=False)}
@@ -261,7 +272,7 @@ async def new_submission(
     start_date = datetime.datetime.strptime(START_DATE, "%Y-%m-%d")
     if todays_date < start_date:
         comp_org = COMPETITION_ID.split("/")[0]
-        if not utils.can_user_submit_before_start(token, comp_org):
+        if not utils.is_user_admin(token, comp_org):
             return {"response": "Competition has not started yet!"}
 
     sub = Submissions(

competitions/templates/index.html

@@ -66,19 +66,32 @@
                         articleLoadingSpinner.classList.add('hidden');
                     });
             }
-
-            function fetchAndDisplayPublicLeaderboard() {
+            function fetchAndDisplayLeaderboard(leaderboardType) {
                 const articleLoadingSpinner = document.getElementById('articleLoadingSpinner');
                 articleLoadingSpinner.classList.remove('hidden');
-                fetch('/leaderboard/public')
+
+                const userToken = document.getElementById('user_token').value;
+                const payload = {
+                    user_lb: {
+                        lb: leaderboardType,
+                        user_token: userToken
+                    }
+                };
+
+                fetch('/leaderboard', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    body: JSON.stringify(payload)
+                })
                     .then(response => {
                         if (!response.ok) {
                             throw new Error('Network response was not ok');
                         }
-                        return response.json(); // Parse the JSON response
+                        return response.json();
                     })
                     .then(data => {
-                        // Populate the 'content' div with the HTML from the response
                         const contentDiv = document.getElementById('content');
                         contentDiv.innerHTML = marked.parse(data.response);
                         articleLoadingSpinner.classList.add('hidden');
@@ -89,27 +102,14 @@
                     });
             }
 
+            function fetchAndDisplayPublicLeaderboard() {
+                fetchAndDisplayLeaderboard('public');
+            }
+
             function fetchAndDisplayPrivateLeaderboard() {
-                const articleLoadingSpinner = document.getElementById('articleLoadingSpinner');
-                articleLoadingSpinner.classList.remove('hidden');
-                fetch('/leaderboard/private')
-                    .then(response => {
-                        if (!response.ok) {
-                            throw new Error('Network response was not ok');
-                        }
-                        return response.json(); // Parse the JSON response
-                    })
-                    .then(data => {
-                        // Populate the 'content' div with the HTML from the response
-                        const contentDiv = document.getElementById('content');
-                        contentDiv.innerHTML = marked.parse(data.response);
-                        articleLoadingSpinner.classList.add('hidden');
-                    })
-                    .catch(error => {
-                        console.error('There has been a problem with your fetch operation:', error);
-                        articleLoadingSpinner.classList.add('hidden');
-                    });
+                fetchAndDisplayLeaderboard('private');
             }
+
             function fetchAndDisplaySubmissions() {
                 const userToken = document.getElementById('user_token').value;
                 const apiEndpoint = '/my_submissions';

competitions/utils.py

@@ -224,7 +224,7 @@ def install_requirements(requirements_fname):
     return
 
 
-def can_user_submit_before_start(user_token, competition_organization):
+def is_user_admin(user_token, competition_organization):
     user_info = user_authentication(token=user_token)
     user_orgs = user_info.get("orgs", [])
     for org in user_orgs: