Optimise download many

src/apps/api/views/submissions.py

@@ -15,11 +15,10 @@
 from rest_framework.viewsets import ModelViewSet
 from rest_framework_csv import renderers
 from django.core.files.base import ContentFile
-from django.http import StreamingHttpResponse
 
 from profiles.models import Organization, Membership
 from tasks.models import Task
-from api.serializers.submissions import SubmissionCreationSerializer, SubmissionSerializer, SubmissionFilesSerializer
+from api.serializers.submissions import SubmissionCreationSerializer, SubmissionSerializer, SubmissionFilesSerializer, SubmissionDetailSerializer
 from competitions.models import Submission, SubmissionDetails, Phase, CompetitionParticipant
 from leaderboards.strategies import put_on_leaderboard_by_submission_rule
 from leaderboards.models import SubmissionScore, Column, Leaderboard
@@ -349,26 +348,27 @@ def re_run_many_submissions(self, request):
             submission.re_run()
         return Response({})
 
-    @action(detail=False, methods=['get'])
+    @action(detail=False, methods=('POST',))
     def download_many(self, request):
-        """
-        Download a ZIP containing several submissions.
-        """
-        pks = request.query_params.get('pks')
-        if pks:
-            pks = json.loads(pks)  # Convert JSON string to list
-        else:
-            return Response({"error": "`pks` query parameter is required"}, status=400)
+        pks = request.data.get('pks')
+        if not pks:
+            return Response({"error": "`pks` field is required"}, status=400)
+
+        # pks is already parsed as a list if JSON was sent properly
+        if not isinstance(pks, list):
+            return Response({"error": "`pks` must be a list"}, status=400)
 
         # Get submissions
         submissions = Submission.objects.filter(pk__in=pks).select_related(
             "owner",
-            "phase__competition",
-            "phase__competition__created_by",
-        ).prefetch_related("phase__competition__collaborators")
-        if submissions.count() != len(pks):
+            "phase",
+            "data"
+        )
+
+        if len(list(submissions)) != len(pks):
             return Response({"error": "One or more submission IDs are invalid"}, status=404)
 
+        # Nicolas Homberg : should create a function for this ?
         # Check permissions
         if not request.user.is_authenticated:
             raise PermissionDenied("You must be logged in to download submissions")
@@ -389,12 +389,17 @@ def download_many(self, request):
                 "You do not have permission to download one or more of the requested submissions"
             )
 
-        # Download
-        from competitions.tasks import stream_batch_download
-        in_memory_zip = stream_batch_download(pks)
-        response = StreamingHttpResponse(in_memory_zip, content_type='application/zip')
-        response['Content-Disposition'] = 'attachment; filename="bulk_submissions.zip"'
-        return response
+        files = []
+
+        for sub in submissions:
+            file_path = sub.data.data_file.name.split('/')[-1]
+            short_name = f"{sub.id}_{sub.owner}_PhaseId{sub.phase.id}_{sub.data.created_when.strftime('%Y-%m-%d:%M-%S')}_{file_path}"
+            # url = sub.data.data_file.url
+            url = SubmissionDetailSerializer(sub.data, context=self.get_serializer_context()).data['data_file']
+            # url = SubmissionFilesSerializer(sub, context=self.get_serializer_context()).data['data_file']
+            files.append({"name": short_name, "url": url})
+
+        return Response(files)
 
     @action(detail=True, methods=('GET',))
     def get_details(self, request, pk):

src/apps/competitions/tasks.py

@@ -20,10 +20,6 @@
 from django.utils.timezone import now
 from rest_framework.exceptions import ValidationError
 
-from urllib.request import urlopen
-from contextlib import closing
-from urllib.error import ContentTooShortError
-
 from celery_config import app
 from competitions.models import Submission, CompetitionCreationTaskStatus, SubmissionDetails, Competition, \
     CompetitionDump, Phase
@@ -280,49 +276,6 @@ def send_child_id(submission, child_id):
     })
 
 
-def retrieve_data(url, data=None):
-    with closing(urlopen(url, data)) as fp:
-        headers = fp.info()
-
-        bs = 1024 * 8
-        size = -1
-        read = 0
-        if "content-length" in headers:
-            size = int(headers["Content-Length"])
-
-        while True:
-            block = fp.read(bs)
-            if not block:
-                break
-            read += len(block)
-            yield(block)
-
-    if size >= 0 and read < size:
-        raise ContentTooShortError(
-            "retrieval incomplete: got only %i out of %i bytes"
-            % (read, size))
-
-
-def zip_generator(submission_pks):
-    in_memory_zip = BytesIO()
-    with zipfile.ZipFile(in_memory_zip, 'w', zipfile.ZIP_DEFLATED) as zip_file:
-        for submission_id in submission_pks:
-            submission = Submission.objects.get(id=submission_id)
-            short_name = "ID_" + str(submission_id) + '_' + submission.data.data_file.name.split('/')[-1]
-            url = make_url_sassy(path=submission.data.data_file.name)
-            for block in retrieve_data(url):
-                zip_file.writestr(short_name, block)
-
-    in_memory_zip.seek(0)
-
-    return in_memory_zip
-
-
-@app.task(queue='site-worker', soft_time_limit=60 * 60)
-def stream_batch_download(submission_pks):
-    return zip_generator(submission_pks)
-
-
 @app.task(queue='site-worker', soft_time_limit=60)
 def _run_submission(submission_pk, task_pks=None, is_scoring=False):
     """This function is wrapped so that when we run tests we can run this function not

src/static/js/ours/client.js

@@ -128,31 +128,13 @@ CODALAB.api = {
         return CODALAB.api.request('GET', `${URLS.API}submissions/${id}/get_detail_result/`)
     },
     download_many_submissions: function (pks) {
-        console.log('Request bulk');
-        const params = new URLSearchParams({ pks: JSON.stringify(pks) });
-        const url = `${URLS.API}submissions/download_many/?${params}`;
-        return fetch(url, {
-            method: 'GET',
-            headers: {
-                'Content-Type': 'application/json'
-            }
-        }).then(response => {
-            if (!response.ok) {
-                throw new Error('Network response was not ok ' + response.statusText);
-            }
-            return response.blob();
-        }).then(blob => {
-            const link = document.createElement('a');
-            link.href = window.URL.createObjectURL(blob);
-            link.download = 'bulk_submissions.zip';
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-        }).catch(error => {
-            console.error('Error downloading submissions:', error);
-        });
+        return CODALAB.api.request(
+            'POST',
+            URLS.API + "submissions/download_many/",
+            { pks: pks }   // body is JSON by convention
+        );
     },
-
+        
     /*---------------------------------------------------------------------
          Leaderboards
     ---------------------------------------------------------------------*/