Abhishek Thakur
commited on
Commit
·
d812604
1
Parent(s):
50cb770
fix
Browse files- competitions/competitions.py +10 -2
- competitions/errors.py +4 -0
- competitions/leaderboard.py +5 -1
- competitions/submissions.py +5 -1
competitions/competitions.py
CHANGED
|
@@ -4,7 +4,7 @@ from functools import partial
|
|
| 4 |
import gradio as gr
|
| 5 |
|
| 6 |
from . import AUTOTRAIN_BACKEND_API, AUTOTRAIN_TOKEN, AUTOTRAIN_USERNAME, COMPETITION_ID, competition_info
|
| 7 |
-
from .errors import SubmissionError, SubmissionLimitError
|
| 8 |
from .leaderboard import Leaderboard
|
| 9 |
from .submissions import Submissions
|
| 10 |
from .text import (
|
|
@@ -77,7 +77,15 @@ def _update_selected_submissions(user_token, submission_ids):
|
|
| 77 |
raise ValueError(
|
| 78 |
f"You can select only {competition_info.selection_limit} submissions. You selected {len(submission_ids)} submissions."
|
| 79 |
)
|
| 80 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 81 |
return _my_submissions(user_token)
|
| 82 |
|
| 83 |
|
|
|
|
| 4 |
import gradio as gr
|
| 5 |
|
| 6 |
from . import AUTOTRAIN_BACKEND_API, AUTOTRAIN_TOKEN, AUTOTRAIN_USERNAME, COMPETITION_ID, competition_info
|
| 7 |
+
from .errors import PastDeadlineError, SubmissionError, SubmissionLimitError
|
| 8 |
from .leaderboard import Leaderboard
|
| 9 |
from .submissions import Submissions
|
| 10 |
from .text import (
|
|
|
|
| 77 |
raise ValueError(
|
| 78 |
f"You can select only {competition_info.selection_limit} submissions. You selected {len(submission_ids)} submissions."
|
| 79 |
)
|
| 80 |
+
try:
|
| 81 |
+
submissions.update_selected_submissions(user_token, submission_ids)
|
| 82 |
+
except PastDeadlineError:
|
| 83 |
+
return [
|
| 84 |
+
gr.Markdown.update(visible=True, value="You can no longer select submissions after the deadline."),
|
| 85 |
+
gr.DataFrame.update(visible=False),
|
| 86 |
+
gr.TextArea.update(visible=False),
|
| 87 |
+
gr.Button.update(visible=False),
|
| 88 |
+
]
|
| 89 |
return _my_submissions(user_token)
|
| 90 |
|
| 91 |
|
competitions/errors.py
CHANGED
|
@@ -12,3 +12,7 @@ class SubmissionError(Exception):
|
|
| 12 |
|
| 13 |
class SubmissionLimitError(Exception):
|
| 14 |
pass
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 12 |
|
| 13 |
class SubmissionLimitError(Exception):
|
| 14 |
pass
|
| 15 |
+
|
| 16 |
+
|
| 17 |
+
class PastDeadlineError(Exception):
|
| 18 |
+
pass
|
competitions/leaderboard.py
CHANGED
|
@@ -50,6 +50,8 @@ class Leaderboard:
|
|
| 50 |
submission_info = json.load(f)
|
| 51 |
# only select submissions that are done
|
| 52 |
submission_info["submissions"] = [sub for sub in submission_info["submissions"] if sub["status"] == "done"]
|
|
|
|
|
|
|
| 53 |
submission_info["submissions"].sort(
|
| 54 |
key=lambda x: x["public_score"],
|
| 55 |
reverse=True if self.eval_higher_is_better else False,
|
|
@@ -89,6 +91,8 @@ class Leaderboard:
|
|
| 89 |
submission_info["submissions"] = [
|
| 90 |
sub for sub in submission_info["submissions"] if sub["status"] == "done"
|
| 91 |
]
|
|
|
|
|
|
|
| 92 |
# count the number of submissions which are selected
|
| 93 |
selected_submissions = 0
|
| 94 |
for sub in submission_info["submissions"]:
|
|
@@ -121,7 +125,7 @@ class Leaderboard:
|
|
| 121 |
key=lambda x: x["public_score"],
|
| 122 |
reverse=True if self.eval_higher_is_better else False,
|
| 123 |
)
|
| 124 |
-
missing_candidates = self.max_selected_submissions - temp_selected_submissions
|
| 125 |
temp_best_public_submissions = temp_best_public_submissions[:missing_candidates]
|
| 126 |
submission_info["submissions"] = temp_selected_submissions + temp_best_public_submissions
|
| 127 |
submission_info["submissions"].sort(
|
|
|
|
| 50 |
submission_info = json.load(f)
|
| 51 |
# only select submissions that are done
|
| 52 |
submission_info["submissions"] = [sub for sub in submission_info["submissions"] if sub["status"] == "done"]
|
| 53 |
+
if len(submission_info["submissions"]) == 0:
|
| 54 |
+
continue
|
| 55 |
submission_info["submissions"].sort(
|
| 56 |
key=lambda x: x["public_score"],
|
| 57 |
reverse=True if self.eval_higher_is_better else False,
|
|
|
|
| 91 |
submission_info["submissions"] = [
|
| 92 |
sub for sub in submission_info["submissions"] if sub["status"] == "done"
|
| 93 |
]
|
| 94 |
+
if len(submission_info["submissions"]) == 0:
|
| 95 |
+
continue
|
| 96 |
# count the number of submissions which are selected
|
| 97 |
selected_submissions = 0
|
| 98 |
for sub in submission_info["submissions"]:
|
|
|
|
| 125 |
key=lambda x: x["public_score"],
|
| 126 |
reverse=True if self.eval_higher_is_better else False,
|
| 127 |
)
|
| 128 |
+
missing_candidates = self.max_selected_submissions - len(temp_selected_submissions)
|
| 129 |
temp_best_public_submissions = temp_best_public_submissions[:missing_candidates]
|
| 130 |
submission_info["submissions"] = temp_selected_submissions + temp_best_public_submissions
|
| 131 |
submission_info["submissions"].sort(
|
competitions/submissions.py
CHANGED
|
@@ -10,7 +10,7 @@ from huggingface_hub import HfApi, hf_hub_download
|
|
| 10 |
from huggingface_hub.utils._errors import EntryNotFoundError
|
| 11 |
from loguru import logger
|
| 12 |
|
| 13 |
-
from .errors import AuthenticationError, NoSubmissionError, SubmissionError, SubmissionLimitError
|
| 14 |
from .utils import http_get, http_post, user_authentication
|
| 15 |
|
| 16 |
|
|
@@ -157,6 +157,10 @@ class Submissions:
|
|
| 157 |
return user_submission_info["submissions"]
|
| 158 |
|
| 159 |
def update_selected_submissions(self, user_token, selected_submission_ids):
|
|
|
|
|
|
|
|
|
|
|
|
|
| 160 |
user_info = self._get_user_info(user_token)
|
| 161 |
user_id = user_info["id"]
|
| 162 |
|
|
|
|
| 10 |
from huggingface_hub.utils._errors import EntryNotFoundError
|
| 11 |
from loguru import logger
|
| 12 |
|
| 13 |
+
from .errors import AuthenticationError, NoSubmissionError, PastDeadlineError, SubmissionError, SubmissionLimitError
|
| 14 |
from .utils import http_get, http_post, user_authentication
|
| 15 |
|
| 16 |
|
|
|
|
| 157 |
return user_submission_info["submissions"]
|
| 158 |
|
| 159 |
def update_selected_submissions(self, user_token, selected_submission_ids):
|
| 160 |
+
current_datetime = datetime.now()
|
| 161 |
+
if current_datetime > self.end_date:
|
| 162 |
+
raise PastDeadlineError("Competition has ended.")
|
| 163 |
+
|
| 164 |
user_info = self._get_user_info(user_token)
|
| 165 |
user_id = user_info["id"]
|
| 166 |
|