From e3c09a3bb3248f1bff11bce48ed14708d17c919f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= Date: Thu, 4 Jul 2024 17:10:04 +0200 Subject: [PATCH 01/21] More general exception in views.py --- src/apps/pages/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py index 30a0f21ed..1a46e34af 100644 --- a/src/apps/pages/views.py +++ b/src/apps/pages/views.py @@ -111,7 +111,7 @@ def format_file_size(self, file_size): """ try: n = float(file_size) - except ValueError: + except Exception as e: return "" units = ['KB', 'MB', 'GB'] From e1d8bc6faddaf89e98004c4bad2f0dc4d228fad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= Date: Thu, 4 Jul 2024 17:14:59 +0200 Subject: [PATCH 02/21] Update views.py --- src/apps/pages/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py index 1a46e34af..4afa0c11d 100644 --- a/src/apps/pages/views.py +++ b/src/apps/pages/views.py @@ -111,7 +111,7 @@ def format_file_size(self, file_size): """ try: n = float(file_size) - except Exception as e: + except Exception: return "" units = ['KB', 'MB', 'GB'] From 545d5cab07132ee0abdd7f84b65868628d083910 Mon Sep 17 00:00:00 2001 From: didayolo Date: Tue, 9 Jul 2024 15:43:33 +0200 Subject: [PATCH 03/21] Remove Dockerfile.celery --- Dockerfile.celery | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 Dockerfile.celery diff --git a/Dockerfile.celery b/Dockerfile.celery deleted file mode 100644 index f9fee6f41..000000000 --- a/Dockerfile.celery +++ /dev/null @@ -1,5 +0,0 @@ -FROM python:3.6 -ENV PYTHONUNBUFFERED 1 -ENV C_FORCE_ROOT True -ADD requirements.txt . -RUN pip install -r requirements.txt From 14c845e74d63eec8b7ae5135a4514e9049122844 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Fri, 12 Jul 2024 13:17:05 +0500 Subject: [PATCH 04/21] show leaderboard and detailed result page to approved participants --- src/apps/api/views/submissions.py | 8 +++---- .../riot/competitions/detail/leaderboards.tag | 21 ++++++++++++++++++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/apps/api/views/submissions.py b/src/apps/api/views/submissions.py index fccaeefd4..e52034493 100644 --- a/src/apps/api/views/submissions.py +++ b/src/apps/api/views/submissions.py @@ -325,14 +325,14 @@ def get_detail_result(self, request, pk): submission = Submission.objects.get(pk=pk) # Check if competition show visualization is true if submission.phase.competition.enable_detailed_results: - # get submission's competition participants - participants = submission.phase.competition.participants.all() - participant_usernames = [participant.user.username for participant in participants] + # get submission's competition approved participants + approved_participants = submission.phase.competition.participants.filter(status=CompetitionParticipant.APPROVED) + participant_usernames = [participant.user.username for participant in approved_participants] # check if in this competition # user is collaborator # or - # user is participant + # user is approved participant # or # user is creator # or diff --git a/src/static/riot/competitions/detail/leaderboards.tag b/src/static/riot/competitions/detail/leaderboards.tag index 95b4fc793..8573a9243 100644 --- a/src/static/riot/competitions/detail/leaderboards.tag +++ b/src/static/riot/competitions/detail/leaderboards.tag @@ -41,7 +41,24 @@ - + + + + + Your request to participate in this competition is waiting for an approval from the competition organizer. + + + + + + + + Your request to participate in this competition is denied. Please contact the competition organizer for more details. + + + + + No submissions have been added to this leaderboard yet! @@ -71,6 +88,7 @@ + + + \ No newline at end of file diff --git a/src/static/riot/management.tag b/src/static/riot/management.tag index 904093abf..7e0d3a549 100644 --- a/src/static/riot/management.tag +++ b/src/static/riot/management.tag @@ -4,6 +4,7 @@
Submissions
Datasets and programs
+
Bundles
Tasks
@@ -19,6 +20,9 @@
+
+ +
From cbf0ff253cab0cd9f8e1101c86248d7b021cd513 Mon Sep 17 00:00:00 2001 From: didayolo Date: Tue, 23 Jul 2024 19:02:59 +0200 Subject: [PATCH 20/21] Improve formatting --- src/apps/api/views/submissions.py | 7 +------ src/apps/competitions/tasks.py | 7 +++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/apps/api/views/submissions.py b/src/apps/api/views/submissions.py index bee68ddd2..745cdb521 100644 --- a/src/apps/api/views/submissions.py +++ b/src/apps/api/views/submissions.py @@ -312,25 +312,20 @@ def re_run_many_submissions(self, request): submission.re_run() return Response({}) - - # # New methods impleted !! + # New methods impleted! @action(detail=False, methods=['get']) def download_many(self, request): pks = request.query_params.get('pks') if pks: pks = json.loads(pks) # Convert JSON string to list - # Doing a local import here to avoid circular imports from competitions.tasks import stream_batch_download - # Call the task and get the result (stream) # in_memory_zip = stream_batch_download.apply_async((pks,)).get() in_memory_zip = stream_batch_download(pks) - # Stream the response response = StreamingHttpResponse(in_memory_zip, content_type='application/zip') response['Content-Disposition'] = 'attachment; filename="bulk_submissions.zip"' - return response @action(detail=True, methods=('GET',)) diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py index e4db5fb2c..1e5544b7b 100644 --- a/src/apps/competitions/tasks.py +++ b/src/apps/competitions/tasks.py @@ -267,14 +267,13 @@ def send_child_id(submission, child_id): }) -def retrieve_data(url,data=None): +def retrieve_data(url, data=None): with closing(urlopen(url, data)) as fp: headers = fp.info() - bs = 1024*8 + bs = 1024 * 8 size = -1 read = 0 - blocknum = 0 if "content-length" in headers: size = int(headers["Content-Length"]) @@ -309,7 +308,7 @@ def zip_generator(submission_pks): return in_memory_zip -@app.task(queue='site-worker', soft_time_limit=60*60) +@app.task(queue='site-worker', soft_time_limit=60 * 60) def stream_batch_download(submission_pks): # logger.info("In stream_batch_download") # logger.info(submission_pks) From f1bc022bd7750e480ecb2929d7f60144ebb17b7a Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Wed, 24 Jul 2024 19:41:05 +0500 Subject: [PATCH 21/21] leaderboard api 500 error resolved (#1527) * leaderboard api 500 error resolved * flake issues resolved --- src/apps/api/views/leaderboards.py | 34 ++++++++++++++++++------------ 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/apps/api/views/leaderboards.py b/src/apps/api/views/leaderboards.py index 2b7ed2524..87753a3b4 100644 --- a/src/apps/api/views/leaderboards.py +++ b/src/apps/api/views/leaderboards.py @@ -1,7 +1,7 @@ -from rest_framework.permissions import IsAuthenticated from rest_framework.viewsets import ModelViewSet from rest_framework.response import Response -from api.permissions import LeaderboardNotHidden, LeaderboardIsOrganizerOrCollaborator +from rest_framework.status import HTTP_405_METHOD_NOT_ALLOWED +from api.permissions import LeaderboardNotHidden from api.serializers.leaderboards import LeaderboardEntriesSerializer from api.serializers.submissions import SubmissionScoreSerializer from leaderboards.models import Leaderboard, SubmissionScore @@ -10,24 +10,32 @@ class LeaderboardViewSet(ModelViewSet): queryset = Leaderboard.objects.all() serializer_class = LeaderboardEntriesSerializer + http_method_names = ['get'] # Only allow GET requests - # TODO: The retrieve and list actions are the only ones used, apparently. Delete other permission checks soon! - def get_permissions(self): - if self.action in ['update', 'partial_update', 'destroy']: - raise Exception('Unexpected code branch execution.') - self.permission_classes = [LeaderboardIsOrganizerOrCollaborator] - elif self.action in ['create']: - raise Exception('Unexpected code branch execution.') - self.permission_classes = [IsAuthenticated] - elif self.action in ['retrieve', 'list']: - self.permission_classes = [LeaderboardNotHidden] + def create(self, request, *args, **kwargs): + return Response({'detail': 'Method not allowed.'}, status=HTTP_405_METHOD_NOT_ALLOWED) - return [permission() for permission in self.permission_classes] + def update(self, request, *args, **kwargs): + return Response({'detail': 'Method not allowed.'}, status=HTTP_405_METHOD_NOT_ALLOWED) + + def partial_update(self, request, *args, **kwargs): + return Response({'detail': 'Method not allowed.'}, status=HTTP_405_METHOD_NOT_ALLOWED) + + def destroy(self, request, *args, **kwargs): + return Response({'detail': 'Method not allowed.'}, status=HTTP_405_METHOD_NOT_ALLOWED) def list(self, request, *args, **kwargs): # Return an empty list for the leaderboard-list endpoint return Response([]) + def get_permissions(self): + if self.action in ['create', 'update', 'partial_update', 'destroy']: + return [] # No permissions, effectively disables the action + elif self.action in ['retrieve', 'list']: + self.permission_classes = [LeaderboardNotHidden] + + return [permission() for permission in self.permission_classes] + class SubmissionScoreViewSet(ModelViewSet): queryset = SubmissionScore.objects.all()