Fix some other comments

cvat-ai · Sep 27, 2024 · 128c78a · 128c78a
1 parent 12a3fe0
commit 128c78a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/cvat/apps/dataset_manager/task.py b/cvat/apps/dataset_manager/task.py
@@ -857,9 +857,9 @@ def _preprocess_input_annotations_for_gt_pool_task(
                 models.ValidationMode.GT_POOL
             ))
 
-        gt_job = next(
-            db_job for db_job in self.db_jobs if db_job.type == models.JobType.GROUND_TRUTH
-        )
+        gt_job = self.db_task.gt_job
+        if gt_job is None:
+            raise AssertionError(f"Can't find GT job in the task {self.db_task.id}")
 
         # Copy GT pool annotations into other jobs, with replacement of any existing annotations
         gt_pool_frames = gt_job.segment.frame_set

diff --git a/cvat/apps/dataset_manager/util.py b/cvat/apps/dataset_manager/util.py
@@ -89,7 +89,7 @@ def faster_deepcopy(v):
     if t is dict:
         return {k: faster_deepcopy(vv) for k, vv in v.items()}
     elif t in (list, tuple, set):
-        return type(v)(faster_deepcopy(vv) for vv in v)
+        return t(faster_deepcopy(vv) for vv in v)
     elif isinstance(v, (int, float, str, bool)) or v is None:
         return v
     else:

diff --git a/cvat/apps/engine/backup.py b/cvat/apps/engine/backup.py
@@ -362,7 +362,7 @@ def _write_data(self, zip_object, target_dir=None):
         if self._db_data.storage == StorageChoice.LOCAL:
             data_dir = self._db_data.get_upload_dirname()
             self._write_directory(
-                source_dir=self._db_data.get_upload_dirname(),
+                source_dir=data_dir,
                 zip_object=zip_object,
                 target_dir=target_data_dir,
                 exclude_files=[self.MEDIA_MANIFEST_INDEX_FILENAME]

diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py
@@ -831,8 +831,13 @@ class TaskViewSet(viewsets.GenericViewSet, mixins.ListModelMixin,
     PartialUpdateModelMixin, UploadMixin, DatasetMixin, BackupMixin, CsrfWorkaroundMixin
 ):
     queryset = Task.objects.select_related(
-        'data', 'assignee', 'owner',
-        'target_storage', 'source_storage', 'annotation_guide',
+        'data',
+        'data__validation_layout',
+        'assignee',
+        'owner',
+        'target_storage',
+        'source_storage',
+        'annotation_guide',
     ).prefetch_related(
         'segment_set__job_set',
         'segment_set__job_set__assignee',