feat: update resgiter

competitions/app.py

@@ -3,7 +3,7 @@ import os
 import threading
 import time
 import io
-from typing import Dict, Any
+from typing import Dict, Any, List, Optional
 from urllib.parse import urlencode
 
 from fastapi import Depends, FastAPI, Form, HTTPException, Request, UploadFile, Body, Query
@@ -14,7 +14,7 @@ from huggingface_hub import hf_hub_download
 from huggingface_hub.utils import disable_progress_bars
 from huggingface_hub.utils._errors import EntryNotFoundError
 from loguru import logger
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 from requests.exceptions import RequestException
 from filelock import FileLock, Timeout as FileLockTimeout
 
@@ -66,6 +66,47 @@ class UpdateSelectedSubmissionsRequest(BaseModel):
 class UpdateTeamNameRequest(BaseModel):
     new_team_name: str
 
+    #   "majar": {
+    #     "type": "string",
+    #     "title": "Majar",
+    #     "minLength": 1,
+    #   },
+    #   "degree": {
+    #     "type": "string",
+    #     "title": "Degree",
+    #     "enum": ["Bachelor", "Master", "PhD"]
+    #   },
+    #   "advising_professor": {
+    #     "type": "string",
+    #     "title": "Advising Professo",
+    #     "minLength": 1,
+    #   },
+    #   "grade": {
+    #     "type": "string",
+    #     "title": "Grade",
+    #     "minLength": 1,
+    #   },
+    #   "expected_graduation_year": {
+    #     "type": "string",
+    #     "title": "Expected Graduation Year",
+    #     "minLength": 1,
+    #   }
+
+class TeamMember(BaseModel):
+    name: str = Field(..., max_length=50, description="Name of the team member")
+    email: str = Field(..., max_length=100, description="Email of the team member")
+    institution: str = Field(..., max_length=100, description="Institution of the team member")
+    is_student: bool = Field(..., description="Is the team member a student?")
+    majar: Optional[str] = Field(None, max_length=50, description="Major of the team member")
+    degree: Optional[str] = Field(None, description="Degree of the team member")
+    advising_professor: Optional[str] = Field(None, max_length=50, description="Advising professor of the team member")
+    grade: Optional[str] = Field(None, max_length=50, description="Grade of the team member")
+    expected_graduation_year: Optional[str] = Field(None, max_length=4, description="Expected graduation year of the team member")
+
+class RegisterRequest(BaseModel):
+    team_name: str = Field(..., max_length=20, description="Name of the team")
+    team_members: List[TeamMember] = Field(min_length=1, max_length=4, description="List of team members")
+
 
 def run_job_runner():
     job_runner = JobRunner(
@@ -461,23 +502,20 @@ def register_example_file():
 
 @app.post("/register")
 def register(
-    teamname: str = Form(..., max_length=20),
-    file: UploadFile = Form(...),
-    email: str = Form(..., max_length=100),
+    request: RegisterRequest,
     user_token: str = Depends(utils.user_authentication)
 ):
     if user_token is None:
         return {"success": False, "response": "Please login."}
 
-    file_bytes = file.file.read()
-    file_stream = io.BytesIO(file_bytes)
-    file_stream.seek(0)
+    team_info = utils.team_file_api.get_team_info(user_token)
+    if team_info is not None:
+        return {"success": False, "response": "You have already registered your team."}
 
     utils.team_file_api.create_team(
         user_token,
-        teamname,
-        file_stream,
-        email
+        request.team_name,
+        request.model_dump()
     )
 
     return {"success": True, "response": "Team created successfully."}
@@ -497,3 +535,17 @@ def get_error_log(token: str = Query(..., description="Token to access the error
     except Exception as e:
         logger.error(f"Error while fetching log file: {e}")
         raise HTTPException(status_code=500, detail="Internal server error.")
+
+
+@app.get("/register_page", response_class=HTMLResponse)
+def register_page(request: Request):
+    """
+    This function is used to render the registration HTML page.
+    """
+    if HF_TOKEN is None:
+        return HTTPException(status_code=500, detail="HF_TOKEN is not set.")
+    context = {
+        "request": request,
+        "version": __version__,
+    }
+    return templates.TemplateResponse("register_page.html", context)

competitions/templates/index.html

@@ -687,58 +687,6 @@
             </div>
         </div>
     </div>
-    <div id="register-modal" tabindex="-1"
-        class="hidden fixed inset-0 z-40 flex items-center justify-center w-full h-full bg-black bg-opacity-50">
-        <div class="relative w-full max-w-xl p-4">
-            <div class="relative bg-white rounded-lg shadow-2xl">
-                <button type="button"
-                    class="absolute top-3 right-3 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 inline-flex justify-center items-center"
-                    data-modal-hide="register-modal">
-                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none"
-                        viewBox="0 0 14 14">
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                            d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6" />
-                    </svg>
-                    <span class="sr-only">Close</span>
-                </button>
-                <div class="p-6 md:p-8 text-center">
-                    <form id="registerForm" class="max-w-md mx-auto p-6 bg-white rounded-lg shadow space-y-4">
-                        <div class="grid grid-cols-3 items-center gap-4">
-                          <label for="teamname" class="text-sm font-medium text-gray-700 text-right">Team Name</label>
-                          <input type="text" id="teamname" name="teamname"
-                            class="col-span-2 px-4 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                        <div class="grid grid-cols-3 items-center gap-4">
-                          <label for="email" class="text-sm font-medium text-gray-700 text-right">Email</label>
-                          <input type="text" id="email" name="email"
-                            class="col-span-2 px-4 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                        </div>
-                      
-                        <div class="grid grid-cols-3 items-center gap-4">
-                          <label for="reigsterFile" class="text-sm font-medium text-gray-700 text-right">Team Datas</label>
-                          <input type="file" id="reigsterFile" name="reigsterFile"
-                            class="col-span-2 text-sm text-gray-500 file:mr-4 file:py-2 file:px-4
-                                   file:rounded-md file:border-0
-                                   file:text-sm file:font-semibold
-                                   file:bg-blue-50 file:text-blue-700
-                                   hover:file:bg-blue-100">
-                        </div>
-                        <p class="mt-1 text-xs text-gray-500">
-                            Please upload a .xlsx file with the following format: <br> 
-                            <a href="/register_template_file" download class="text-blue-600 hover:underline">Download here</a>.
-                        </p>
-                        <p id="errorMessage" class="text-red-600 text-sm hidden"></p>
-                        <button type="submit"
-                          id="submitRegisterButton"
-                          class="w-full bg-blue-600 text-white py-2 px-4 rounded-md hover:bg-blue-700 transition disabled:bg-blue-800 disabled:opacity-80 disabled:cursor-not-allowed">
-                          Submit
-                        </button>
-                      </form>
-                      
-                </div>
-            </div>
-        </div>
-    </div>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.2.1/flowbite.min.js"></script>
     <script>
         document.addEventListener("DOMContentLoaded", function () {
@@ -1040,64 +988,7 @@
 
 <script>
     document.getElementById("registerButton").addEventListener("click", function () {
-        document.getElementById("register-modal").classList.remove("hidden");
-    });
-
-    document.querySelector("[data-modal-hide='register-modal']").addEventListener("click", function () {
-        document.getElementById("register-modal").classList.add("hidden");
-    });
-
-    document.getElementById('registerForm').addEventListener('submit', function (e) {
-        e.preventDefault();
-
-        const teamname = document.getElementById('teamname').value.trim();
-        const email = document.getElementById('email').value.trim();
-        const fileInput = document.getElementById('reigsterFile');
-        const file = fileInput.files[0];
-        const errorMessage = document.getElementById('errorMessage');
-        const submitBtn = document.getElementById('submitRegisterButton');
-
-        submitBtn.disabled = true;
-        submitBtn.textContent = 'Submiting...';
-
-        errorMessage.textContent = '';
-        errorMessage.classList.add('hidden');
-
-        if (!teamname) {
-            errorMessage.textContent = 'Team name is required.';
-            errorMessage.classList.remove('hidden');
-            return;
-        }
-
-        if (!email) {
-            errorMessage.textContent = 'Email is required.';
-            errorMessage.classList.remove('hidden');
-            return;
-        }
-
-        if (!file) {
-            errorMessage.textContent = 'Please upload a file.';
-            errorMessage.classList.remove('hidden');
-            return;
-        }
-
-        const formData = new FormData();
-        formData.append('teamname', teamname);
-        formData.append('email', email);
-        formData.append('file', file);
-        fetch('/register', { method: 'POST', body: formData })
-            .then(response => response.json())
-            .then(data => {
-                if (data.success) {
-                    document.getElementById('register-modal').classList.add("hidden");
-                    window.location.reload();
-                } else {
-                    submitBtn.disabled = false;
-                    submitBtn.textContent = 'Submit';
-                    errorMessage.textContent = data.response || 'An error occurred.';
-                    errorMessage.classList.remove('hidden');
-                }
-            })
+        window.location.href = "/register_page";
     });
 </script>
 

competitions/templates/register_page.html

@@ -0,0 +1,187 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <title>Team Registration - JSON Editor</title>
+  <!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/json-editor@latest/dist/jsoneditor.min.css"> -->
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/spectre.css@latest/dist/spectre.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/spectre.css@latest/dist/spectre-exp.min.css">
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css">
+
+
+  <style>
+    body { font-family: Arial, sans-serif; padding: 20px; }
+    #editor_holder { margin-bottom: 20px; }
+    .btn-group-custom {
+      display: flex;
+      justify-content: center;
+      gap: 1rem;
+      margin-top: 3rem;
+    }
+  </style>
+</head>
+<body>
+  <h1>Team Registration Form</h1>
+  <div id="editor_holder"></div>
+  <div class="btn-group btn-group-custom ">
+    <button id="submit" class="btn btn-primary">Submit</button>
+    <button id="cancel" class="btn btn-error">Cancel</button>
+  </div>
+  <script src="https://cdn.jsdelivr.net/npm/@json-editor/json-editor@latest/dist/jsoneditor.min.js"></script>
+</body>
+
+<script>
+const schema = {
+  "title": "Team Registration",
+  "type": "object",
+  "definitions": {
+    "student": {
+    "type": "object",
+    "id": "student",
+    "properties": {
+      "majar": {
+        "type": "string",
+        "title": "Majar",
+        "minLength": 1,
+      },
+      "degree": {
+        "type": "string",
+        "title": "Degree",
+        "enum": ["Bachelor", "Master", "PhD"]
+      },
+      "advising_professor": {
+        "type": "string",
+        "title": "Advising Professo",
+        "minLength": 1,
+      },
+      "grade": {
+        "type": "string",
+        "title": "Grade",
+        "minLength": 1,
+      },
+      "expected_graduation_year": {
+        "type": "string",
+        "title": "Expected Graduation Year",
+        "minLength": 1,
+      }
+    }
+  }
+  },
+  "properties": {
+    "team_name": {
+      "type": "string",
+      "title": "Team Name",
+      "minLength": 1,
+    },
+    "team_members": {
+      "type": "array",
+      "title": "Team Members",
+      "minItems": 1,
+      "maxItems": 4,
+      "format": "tabs",
+      "items": {
+        "type": "object",
+        "title": "Member",
+        "properties": {
+          "name": {
+            "type": "string",
+            "title": "Name",
+            "minLength": 1
+          },
+          "email": {
+            "type": "string",
+            "title": "Email",
+            "format": "email",
+            "minLength": 1
+          },
+          "institution": {
+            "type": "string",
+            "title": "Institution",
+            "minLength": 1
+          },
+            "student_info": {
+            "title": "Is Student",
+                "oneOf": [
+                    {
+                        "title": "no",
+                        "type": "null"
+                    },
+                    {
+                        "title": "yes",
+                        "$ref": "#/definitions/student"
+                    }
+                ]
+            }
+        }
+      }
+    }
+  }
+}
+
+const editor = new JSONEditor(document.getElementById('editor_holder'), {
+    schema: schema,
+    theme: 'spectre',
+    iconlib: 'fontawesome5',
+    disable_array_delete_all_rows: true,
+    disable_array_delete_last_row: true,
+    disable_collapse: true,
+    disable_edit_json: true,
+    disable_properties: true,
+    disable_array_reorder: true,
+    prompt_before_delete: false,
+    required_by_default: true,
+    array_controls_top: true,
+    remove_button_labels: true,
+    show_errors: "change",
+});
+
+submitButton = document.getElementById('submit');
+cancelButton = document.getElementById('cancel');
+
+submitButton.addEventListener('click', () => {
+  const errors = editor.validate();
+  editor.showValidationErrors(errors);
+  if (errors.length > 0) {
+    return;
+  }
+  const regsiterData = editor.getValue();
+  regsiterData.team_members = regsiterData.team_members.map(member => {
+    return {
+      name: member.name,
+      email: member.email,
+      institution: member.institution,
+      is_student: member.student_info !== null,
+      ...member.student_info
+    };
+  });
+  
+  submitButton.textContent = "Submitting...";
+  submitButton.classList.add('disabled');
+  cancelButton.classList.add('disabled');
+  fetch('/register', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(regsiterData) })
+      .then(response => {
+        if (response.status !== 200) {
+          throw new Error('Network response was not ok');
+        }
+        return response.json();
+      })
+      .then(data => {
+          if (data.success) {
+            window.location.href = "/"
+          } else {
+            alert("Registration failed: " + data.response);
+          }
+      })
+      .finally(() => {
+          setTimeout(() => {
+            submitButton.textContent = "Submit";
+            submitButton.classList.remove('disabled');
+            cancelButton.classList.remove('disabled');
+          }, 2000);
+      })
+});
+cancelButton.addEventListener('click', () => {
+  window.location.href = "/";
+});
+</script>
+</html>

competitions/utils.py

@@ -303,7 +303,7 @@ class TeamFileApi:
 
         return team_metadata[team_id]
 
-    def _create_team(self, user_id: str, team_name: str, team_file: Optional[io.BytesIO], email: str) -> str:
+    def _create_team(self, user_id: str, team_name: str, other_data: Dict[str, Any]) -> str:
         with self._lock:
             user_team = hf_hub_download(
                 repo_id=self.competition_id,
@@ -333,7 +333,7 @@ class TeamFileApi:
                 "name": team_name,
                 "members": [user_id],
                 "leader": user_id,
-                "email": email,
+                "other_data": other_data,
             }
 
             user_team_json = json.dumps(user_team, indent=4)
@@ -357,19 +357,11 @@ class TeamFileApi:
                 repo_id=self.competition_id,
                 repo_type="dataset",
             )
-
-            if team_file is not None:
-                resp = api.upload_file(
-                    path_or_fileobj=team_file,
-                    path_in_repo=f"team_datas/{team_id}.xlsx",
-                    repo_id=self.competition_id,
-                    repo_type="dataset",
-                )
         return team_id
     
-    def create_team(self, user_token: str, team_name: str, team_file: io.BytesIO, email: str) -> str:
+    def create_team(self, user_token: str, team_name: str, other_data: Dict[str, Any]) -> str:
         user_info = token_information(token=user_token)
-        return self._create_team(user_info["id"], team_name, team_file, email)
+        return self._create_team(user_info["id"], team_name, other_data)
 
     def get_team_info(self, user_token: str) -> Optional[Dict[str, Any]]:
         user_info = token_information(token=user_token)