add rules, check oauth

competitions/app.py

@@ -2,6 +2,7 @@ import datetime
 import os
 import threading
 
+import requests
 from fastapi import FastAPI, File, Form, Request, UploadFile
 from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
@@ -34,7 +35,7 @@ VERSION_COMMIT_ID = os.environ.get("VERSION_COMMIT_ID", "0687567")
 disable_progress_bars()
 
 COMP_INFO = CompetitionInfo(competition_id=COMPETITION_ID, autotrain_token=HF_TOKEN)
-
+RULES_AVAILABLE = COMP_INFO.rules is not None
 
 try:
     REQUIREMENTS_FNAME = hf_hub_download(
@@ -99,6 +100,7 @@ async def read_form(request: Request):
         "logo": COMP_INFO.logo_url,
         "competition_type": COMP_INFO.competition_type,
         "version_commit_id": VERSION_COMMIT_ID[:7],
+        "rules_available": RULES_AVAILABLE,
     }
     return templates.TemplateResponse("index.html", context)
 
@@ -125,7 +127,11 @@ async def oauth_logout(request: Request):
 async def use_oauth(request: Request):
     if USE_OAUTH == 1:
         if request.session.get("oauth_info") is not None:
-            return {"response": 2}
+            try:
+                utils.user_authentication(request.session.get("oauth_info")["access_token"])
+                return {"response": 2}
+            except requests.exceptions.JSONDecodeError:
+                return {"response": USE_OAUTH}
     return {"response": USE_OAUTH}
 
 
@@ -145,6 +151,13 @@ async def get_dataset_info(request: Request):
     return resp
 
 
+@app.get("/rules", response_class=JSONResponse)
+async def get_rules(request: Request):
+    if COMP_INFO.rules is not None:
+        return {"response": COMP_INFO.rules}
+    return {"response": "No rules available."}
+
+
 @app.get("/submission_info", response_class=JSONResponse)
 async def get_submission_info(request: Request):
     info = COMP_INFO.submission_desc

competitions/info.py

@@ -43,6 +43,17 @@ class CompetitionInfo:
         except Exception:
             self.submission_desc = None
 
+        try:
+            rules_md = hf_hub_download(
+                repo_id=self.competition_id,
+                filename="RULES.md",
+                use_auth_token=self.autotrain_token,
+                repo_type="dataset",
+            )
+            self.rules_md = self.load_md(rules_md)
+        except Exception:
+            self.rules_md = None
+
         if self.config["EVAL_METRIC"] == "custom":
             if "SCORING_METRIC" not in self.config:
                 raise ValueError(
@@ -144,3 +155,7 @@ class CompetitionInfo:
                 raise Exception("Please provide a single SCORING_METRIC in the competition config file: conf.json")
             return self.config["SCORING_METRIC"]
         return self.config["EVAL_METRIC"]
+
+    @property
+    def rules(self):
+        return self.rules_md

competitions/templates/index.html

@@ -240,7 +240,28 @@
                     });
             }
 
-            // Find the 'Home' link in the sidebar
+            function fetchAndDisplayRules() {
+                const articleLoadingSpinner = document.getElementById('articleLoadingSpinner');
+                articleLoadingSpinner.classList.remove('hidden');
+                fetch('/rules')
+                    .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');
+                    });
+            }
+
             const homeLink = document.getElementById('home');
             const datasetLink = document.getElementById('dataset');
             const publicLBLink = document.getElementById('public_lb');
@@ -248,6 +269,7 @@
             const newSubmission = document.getElementById('new_submission');
             const mySubmissions = document.getElementById('my_submissions');
             const submissionInfo = document.getElementById('submission_info');
+            const rulesLink = document.getElementById('rules');
 
             // Add a click event listener to the 'Home' link
             homeLink.addEventListener('click', function (event) {
@@ -282,6 +304,10 @@
                 event.preventDefault(); // Prevent the default link behavior
                 fetchAndDisplaySubmissionInfo(); // Fetch and display info on click
             });
+            rulesLink.addEventListener('click', function (event) {
+                event.preventDefault(); // Prevent the default link behavior
+                fetchAndDisplayRules(); // Fetch and display info on click
+            });
 
             // Fetch and display info when the page loads
             fetchAndDisplayCompetitionInfo();
@@ -358,6 +384,20 @@
                         <span class="flex-1 ms-3 whitespace-nowrap">Dataset</span>
                     </a>
                 </li>
+                {% if rules_available %}
+                <li>
+                    <a href="#" id="rules"
+                        class="flex items-center p-2 text-gray-900 rounded-lg hover:bg-gray-100 group">
+                        <svg class="flex-shrink-0 w-5 h-5 text-gray-500 transition duration-75 group-hover:text-gray-900"
+                            aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor"
+                            viewBox="0 0 18 18">
+                            <path
+                                d="M6.143 0H1.857A1.857 1.857 0 0 0 0 1.857v4.286C0 7.169.831 8 1.857 8h4.286A1.857 1.857 0 0 0 8 6.143V1.857A1.857 1.857 0 0 0 6.143 0Zm10 0h-4.286A1.857 1.857 0 0 0 10 1.857v4.286C10 7.169 10.831 8 11.857 8h4.286A1.857 1.857 0 0 0 18 6.143V1.857A1.857 1.857 0 0 0 16.143 0Zm-10 10H1.857A1.857 1.857 0 0 0 0 11.857v4.286C0 17.169.831 18 1.857 18h4.286A1.857 1.857 0 0 0 8 16.143v-4.286A1.857 1.857 0 0 0 6.143 10Zm10 0h-4.286A1.857 1.857 0 0 0 10 11.857v4.286c0 1.026.831 1.857 1.857 1.857h4.286A1.857 1.857 0 0 0 18 16.143v-4.286A1.857 1.857 0 0 0 16.143 10Z" />
+                        </svg>
+                        <span class="flex-1 ms-3 whitespace-nowrap">Rules</span>
+                    </a>
+                </li>
+                {% endif %}
                 <li>
                     <button type="button"
                         class="flex items-center w-full p-2 text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100"