Got idea to separate FileUpload and Json part.

https://www.trell.se/blog/file-uploads-json-apis-django-rest-framework/

cvat/apps/dashboard/static/dashboard/js/dashboard.js

@@ -545,11 +545,11 @@ function setupTaskCreator() {
             taskData.append("image_quality", compressQuality);
         }
 
-        for (let file of files) {
+        for (let j = 0; j < files.length; j++) {
             if (source === "local") {
-                taskData.append("client_files", file);
+                taskData.append(`client_files[${j}]`, files[j]);
             } else {
-                taskData.append("server_files", file);
+                taskData.append(`server_files[${j}]`, files[j]);
             }
         }
 

cvat/apps/engine/models.py

@@ -85,13 +85,13 @@ def __str__(self):
         return self.name
 
 def upload_path_handler(instance, filename):
-    return os.path.join(instance.get_upload_dirname(), filename)
+    return os.path.join(instance.task.get_upload_dirname(), filename)
 
 # For client files which the user is uploaded
 class ClientFile(models.Model):
     task = models.ForeignKey(Task, on_delete=models.CASCADE)
     file = models.FileField(upload_to=upload_path_handler,
-        storage=FileSystemStorage)
+        storage=FileSystemStorage())
 
     class Meta:
         default_permissions = ()

cvat/apps/engine/serializers.py

@@ -57,7 +57,7 @@ class Meta:
 class ClientFileSerializer(serializers.ModelSerializer):
     class Meta:
         model = ClientFile
-        fields = ('path', )
+        fields = ('file', )
 
     def to_internal_value(self, data):
         return { 'file': data }
@@ -121,14 +121,16 @@ def create(self, validated_data):
             for attr in attributes:
                 AttributeSpec.objects.create(label=db_label, **attr)
 
-        for file in client_files:
-            ClientFile.objects.create(task=db_task, file=file)
+        for obj in client_files:
+            serializer = ClientFileSerializer(data=obj['file'])
+            if serializer.is_valid(raise_exception=True):
+                serializer.save()
 
-        for file in server_files:
-            ServerFile.objects.create(task=db_task, file=file)
+        for path in server_files:
+            ServerFile.objects.create(task=db_task, file=path)
 
-        for file in remote_files:
-            RemoteFile.objects.create(task=db_task, file=file)
+        for path in remote_files:
+            RemoteFile.objects.create(task=db_task, file=path)
 
         task_path = db_task.get_task_dirname()
         if os.path.isdir(task_path):

cvat/apps/engine/task.py

@@ -62,7 +62,7 @@ def create(tid, params):
     """Schedule the task"""
     q = django_rq.get_queue('default')
     q.enqueue_call(func=_create_thread, args=(tid, params),
-        job_id="task.create/{}".format(tid))
+        job_id="/api/v1/tasks/{}".format(tid))
 
 def check(tid):
     """Check status of the scheduled task"""

cvat/apps/engine/urls.py

@@ -40,6 +40,9 @@
     path( # GET, DELETE, PATCH
         REST_API_PREFIX + 'tasks/<int:pk>', views.TaskDetail.as_view(),
         name='task-detail'),
+    path( # PUT
+        REST_API_PREFIX + 'tasks/<int:pk>/data/', views.TaskDetail.as_view(),
+        name='task-data'),
     path( # GET
         REST_API_PREFIX + 'tasks/<int:pk>/status', views.TaskStatus.as_view(),
         name='task-status'),

cvat/apps/engine/views.py

@@ -58,6 +58,8 @@ def perform_create(self, serializer):
             serializer.save()
         else:
             serializer.save(owner=self.request.user)
+        tid = serializer.data["id"]
+        task.create(tid, serializer.data)
 
 class TaskDetail(generics.RetrieveUpdateDestroyAPIView):
     queryset = Task.objects.all()
@@ -69,7 +71,7 @@ class TaskStatus(APIView):
     def get(self, request, version, pk):
         db_task = get_object_or_404(Task, pk=pk)
         response = self._get_response(queue="default",
-            job_id="api/{}/tasks/{}".format(version, pk))
+            job_id="/api/{}/tasks/{}".format(version, pk))
         serializer = TaskStatus.serializer_class(data=response)
 
         if serializer.is_valid(raise_exception=True):