From 08b1d8e601aa2dfce4c89b82b252e33474ed8862 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Wed, 23 Oct 2024 17:30:13 +0500 Subject: [PATCH 1/5] upload task interface added and placeholder api and functions created --- src/apps/api/views/tasks.py | 4 +++ src/static/js/ours/client.js | 3 ++ src/static/riot/tasks/management.tag | 47 ++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/src/apps/api/views/tasks.py b/src/apps/api/views/tasks.py index 71bfb59bd..2495e1e65 100644 --- a/src/apps/api/views/tasks.py +++ b/src/apps/api/views/tasks.py @@ -137,6 +137,10 @@ def delete_many(self, request): status=status.HTTP_400_BAD_REQUEST if errors else status.HTTP_200_OK ) + @action(detail=False, methods=('POST',)) + def upload_task(self, request): + pass + # This function allows for multiple errors when deleting multiple objects def check_delete_permissions(self, request, task): if request.user != task.created_by: diff --git a/src/static/js/ours/client.js b/src/static/js/ours/client.js index 489a01273..c1fb8c64d 100644 --- a/src/static/js/ours/client.js +++ b/src/static/js/ours/client.js @@ -257,6 +257,9 @@ CODALAB.api = { create_task: (data) => { return CODALAB.api.request('POST', `${URLS.API}tasks/`, data) }, + upload_task: (data_file) => { + return CODALAB.api.request('POST', URLS.API + 'tasks/upload_task/') + }, share_task: (pk, data) => { return CODALAB.api.request('PATCH', `${URLS.API}tasks/${pk}/`, data) }, diff --git a/src/static/riot/tasks/management.tag b/src/static/riot/tasks/management.tag index 927bdad3b..dd22598cd 100644 --- a/src/static/riot/tasks/management.tag +++ b/src/static/riot/tasks/management.tag @@ -7,6 +7,9 @@ +
+ Upload Task +
Create Task
@@ -167,6 +170,35 @@ + +
+
Upload Task
+ +
+ +
+

Upload a zip of your task including a yaml file.

+ + +
+ +
+
+
{ upload_progress }%
+
+
+ +
+
+ + +
+
+
@@ -431,6 +463,15 @@ /*--------------------------------------------------------------------- Modal Methods ---------------------------------------------------------------------*/ + + self.show_upload_task_modal = () => { + $(self.refs.upload_task_modal).modal('show') + } + self.close_upload_task_modal = () => { + $(self.refs.upload_task_modal).modal('hide') + // Reset file input + $('input-file[ref="data_file"]').find("input").val('') + } self.show_modal = () => { $('.menu .item', self.root).tab('change tab', 'details') self.form_datasets = {} @@ -454,6 +495,12 @@ self.modal_is_valid = false } + self.upload_task = () => { + // get selected file from the input + var data_file = self.refs.data_file.refs.file_input.files[0] + + } + self.create_task = () => { let data = get_form_data($(self.refs.form)) _.assign(data, self.form_datasets) From 061d8a074e1c0b70a18e5547a4c5a1fbcd515ce3 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Thu, 24 Oct 2024 14:21:54 +0500 Subject: [PATCH 2/5] upload function completed on client side, client.js upload_task api function completed, backend upload_task function constructed with error handling and quota check --- src/apps/api/views/tasks.py | 25 ++++++++++++- src/static/js/ours/client.js | 27 ++++++++++++-- src/static/riot/tasks/management.tag | 56 ++++++++++++++++++++++++++-- 3 files changed, 100 insertions(+), 8 deletions(-) diff --git a/src/apps/api/views/tasks.py b/src/apps/api/views/tasks.py index 2495e1e65..6805fa112 100644 --- a/src/apps/api/views/tasks.py +++ b/src/apps/api/views/tasks.py @@ -14,6 +14,7 @@ from competitions.models import Submission, Phase from profiles.models import User from tasks.models import Task +from utils.data import pretty_bytes # TODO:// TaskViewSimple uses simple serializer from tasks, which exists purely for the use of Select2 on phase modal @@ -139,7 +140,29 @@ def delete_many(self, request): @action(detail=False, methods=('POST',)) def upload_task(self, request): - pass + + # Access uploaded file + uploaded_file = request.FILES.get('file') + + # Check if a file is provided + if not uploaded_file: + return Response({"error": "No Task uploaded"}, status=status.HTTP_400_BAD_REQUEST) + + storage_used = float(request.user.get_used_storage_space()) + quota = float(request.user.quota) + file_size = uploaded_file.size + # Check if user has enough quota + if storage_used + file_size > quota: + available_space = pretty_bytes(quota - storage_used) + file_size = pretty_bytes(file_size) + message = f'Insufficient space. Your available space is {available_space}. The file size is {file_size}. Please free up some space and try again. You can manage your files in the Resources page.' + return Response({'error': message}, status=status.HTTP_507_INSUFFICIENT_STORAGE) + + # Print file details (you can print this to your console/log for now) + print(f"Received file: {uploaded_file.name}") + + # Dummy response: just return the file name + return Response({"message": f"File '{uploaded_file.name}' uploaded successfully!"}) # This function allows for multiple errors when deleting multiple objects def check_delete_permissions(self, request, task): diff --git a/src/static/js/ours/client.js b/src/static/js/ours/client.js index c1fb8c64d..c0addcc44 100644 --- a/src/static/js/ours/client.js +++ b/src/static/js/ours/client.js @@ -257,9 +257,30 @@ CODALAB.api = { create_task: (data) => { return CODALAB.api.request('POST', `${URLS.API}tasks/`, data) }, - upload_task: (data_file) => { - return CODALAB.api.request('POST', URLS.API + 'tasks/upload_task/') - }, + upload_task: (data_file, progress_update_callback) => { + var form_data = new FormData() + form_data.append('file', data_file) + return $.ajax({ + type: 'POST', + url: URLS.API + 'tasks/upload_task/', + data: form_data, + processData: false, + contentType: false, + xhr: function () { + var xhr = new window.XMLHttpRequest(); + // Track upload progress + xhr.upload.addEventListener('progress', function (event) { + if (event.lengthComputable) { + var percent_complete = (event.loaded / event.total) * 100; + if (progress_update_callback) { + progress_update_callback(percent_complete); + } + } + }, false); + return xhr; + } + }); + }, share_task: (pk, data) => { return CODALAB.api.request('PATCH', `${URLS.API}tasks/${pk}/`, data) }, diff --git a/src/static/riot/tasks/management.tag b/src/static/riot/tasks/management.tag index dd22598cd..fb59f609a 100644 --- a/src/static/riot/tasks/management.tag +++ b/src/static/riot/tasks/management.tag @@ -179,7 +179,7 @@

Upload a zip of your task including a yaml file.

-
@@ -191,7 +191,7 @@
- @@ -366,6 +366,7 @@