feat: add submission lock

competitions/app.py

@@ -15,6 +15,7 @@ from huggingface_hub.utils._errors import EntryNotFoundError
 from loguru import logger
 from pydantic import BaseModel
 from requests.exceptions import RequestException
+from filelock import FileLock, Timeout as FileLockTimeout
 
 from competitions import __version__, utils
 from competitions.errors import AuthenticationError, PastDeadlineError, SubmissionError, SubmissionLimitError
@@ -24,6 +25,8 @@ from competitions.oauth import attach_oauth
 from competitions.runner import JobRunner
 from competitions.submissions import Submissions
 from competitions.text import SUBMISSION_SELECTION_TEXT, SUBMISSION_TEXT
+from competitions.utils import team_file_api, submission_api
+from competitions.enums import SubmissionStatus
 
 
 HF_TOKEN = os.environ.get("HF_TOKEN", None)
@@ -298,22 +301,26 @@ def new_submission(
         if not utils.is_user_admin(user_token, comp_org):
             return {"response": "Competition has not started yet!"}
 
-    competition_info = CompetitionInfo(competition_id=COMPETITION_ID, autotrain_token=HF_TOKEN)
-    sub = Submissions(
-        end_date=competition_info.end_date,
-        submission_limit=competition_info.submission_limit,
-        competition_id=COMPETITION_ID,
-        token=HF_TOKEN,
-        competition_type=competition_info.competition_type,
-        hardware=competition_info.hardware,
-    )
+    team_id = team_file_api.get_team_info(user_token)["id"]
+
+    lock = FileLock(f"./submission_lock/{team_id}.lock", blocking=False)
     try:
-        if competition_info.competition_type == "generic":
-            resp = sub.new_submission(user_token, submission_file, submission_comment)
-            return {"response": f"Success! You have {resp} submissions remaining today."}
-        if competition_info.competition_type == "script":
-            resp = sub.new_submission(user_token, hub_model, submission_comment)
-            return {"response": f"Success! You have {resp} submissions remaining today."}
+        with lock:
+            if submission_api.count_by_status(team_id, [SubmissionStatus.QUEUED, SubmissionStatus.PENDING, SubmissionStatus.PROCESSING]) > 0:
+                return {"response": "Another submission is being processed. Please wait a moment."}
+            competition_info = CompetitionInfo(competition_id=COMPETITION_ID, autotrain_token=HF_TOKEN)
+            sub = Submissions(
+                end_date=competition_info.end_date,
+                submission_limit=competition_info.submission_limit,
+                competition_id=COMPETITION_ID,
+                token=HF_TOKEN,
+                competition_type=competition_info.competition_type,
+                hardware=competition_info.hardware,
+            )
+            if competition_info.competition_type == "script":
+                resp = sub.new_submission(user_token, hub_model, submission_comment)
+                return {"response": f"Success! You have {resp} submissions remaining today."}
+            return {"response": "Invalid competition type"}
     except RequestException:
         return {"response": "Hugging Face Hub is unreachable, please try again later"}
     except AuthenticationError:
@@ -324,7 +331,8 @@ def new_submission(
         return {"response": "Invalid submission file"}
     except SubmissionLimitError:
         return {"response": "Submission limit reached"}
-    return {"response": "Invalid competition type"}
+    except FileLockTimeout:
+        return {"response": "Another submission is being processed. Please wait a moment."}
 
 
 @app.post("/update_selected_submissions", response_class=JSONResponse)

competitions/utils.py

@@ -189,70 +189,6 @@ def delete_space(params):
             api.delete_repo(repo_id=os.environ["SPACE_ID"], repo_type="space")
 
 
-def download_submission_info(params):
-    user_fname = hf_hub_download(
-        repo_id=params.competition_id,
-        filename=f"submission_info/{params.team_id}.json",
-        token=params.token,
-        repo_type="dataset",
-    )
-    with open(user_fname, "r", encoding="utf-8") as f:
-        user_submission_info = json.load(f)
-
-    return user_submission_info
-
-
-def upload_submission_info(params, user_submission_info):
-    user_submission_info_json = json.dumps(user_submission_info, indent=4)
-    user_submission_info_json_bytes = user_submission_info_json.encode("utf-8")
-    user_submission_info_json_buffer = io.BytesIO(user_submission_info_json_bytes)
-    api = HfApi(token=params.token)
-    api.upload_file(
-        path_or_fileobj=user_submission_info_json_buffer,
-        path_in_repo=f"submission_info/{params.team_id}.json",
-        repo_id=params.competition_id,
-        repo_type="dataset",
-    )
-
-
-def update_submission_status(params, status):
-    user_submission_info = download_submission_info(params)
-    for submission in user_submission_info["submissions"]:
-        if submission["submission_id"] == params.submission_id:
-            submission["status"] = status
-            break
-    upload_submission_info(params, user_submission_info)
-
-
-def update_submission_score(params, public_score, private_score):
-    user_submission_info = download_submission_info(params)
-    for submission in user_submission_info["submissions"]:
-        if submission["submission_id"] == params.submission_id:
-            submission["public_score"] = public_score
-            submission["private_score"] = private_score
-            submission["status"] = "done"
-            break
-    upload_submission_info(params, user_submission_info)
-
-
-def monitor(func):
-    def wrapper(*args, **kwargs):
-        params = kwargs.get("params", None)
-        if params is None and len(args) > 0:
-            params = args[0]
-
-        try:
-            return func(*args, **kwargs)
-        except Exception as e:
-            error_message = f"""{func.__name__} has failed due to an exception: {traceback.format_exc()}"""
-            logger.error(error_message)
-            logger.error(str(e))
-            update_submission_status(params, SubmissionStatus.FAILED.value)
-            pause_space(params)
-
-    return wrapper
-
-
 def uninstall_requirements(requirements_fname):
     if os.path.exists(requirements_fname):
         # read the requirements.txt
@@ -583,6 +519,11 @@ class SubmissionApi:
                 submission["status"] = status
                 break
         self.upload_submission_info(team_id, user_submission_info)
+    
+    def count_by_status(self, team_id: str, status_list: List[SubmissionStatus]) -> int:
+        user_submission_info = self.download_submission_info(team_id)
+        count = sum(1 for submission in user_submission_info["submissions"] if SubmissionStatus(submission["status"]) in status_list)
+        return count
 
 
 submission_api = SubmissionApi(

requirements.txt

@@ -15,3 +15,4 @@ gradio==4.37.2
 authlib==1.3.1
 itsdangerous==2.2.0
 hf-transfer
+filelock>=3.17.0