From 8729f45a1b203201e6ae26e4579157c834aa4c18 Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Fri, 22 Mar 2024 15:46:09 +0200 Subject: [PATCH] Remove the per-task `artifacts` directory (#7597) This was only used by the Git synchronization functionality, which was removed in #6904. --- cvat/apps/engine/backup.py | 2 +- cvat/apps/engine/models.py | 3 --- cvat/apps/engine/serializers.py | 2 +- cvat/apps/engine/tests/test_rest_api.py | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cvat/apps/engine/backup.py b/cvat/apps/engine/backup.py index 10dead22404d..42105687de1e 100644 --- a/cvat/apps/engine/backup.py +++ b/cvat/apps/engine/backup.py @@ -663,7 +663,7 @@ def _write_data(zip_object): if os.path.isdir(task_path): shutil.rmtree(task_path) - os.makedirs(self._db_task.get_task_artifacts_dirname()) + os.makedirs(task_path) if not self._labels_mapping: self._labels_mapping = self._create_labels(db_task=self._db_task, labels=labels) diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py index 08147dfc7512..5ad10cbe9373 100644 --- a/cvat/apps/engine/models.py +++ b/cvat/apps/engine/models.py @@ -432,9 +432,6 @@ def get_labels(self): def get_dirname(self): return os.path.join(settings.TASKS_ROOT, str(self.id)) - def get_task_artifacts_dirname(self): - return os.path.join(self.get_dirname(), 'artifacts') - def get_tmp_dirname(self): return os.path.join(self.get_dirname(), "tmp") diff --git a/cvat/apps/engine/serializers.py b/cvat/apps/engine/serializers.py index 431a2c45be41..9643a36f6317 100644 --- a/cvat/apps/engine/serializers.py +++ b/cvat/apps/engine/serializers.py @@ -1143,7 +1143,7 @@ def create(self, validated_data): if os.path.isdir(task_path): shutil.rmtree(task_path) - os.makedirs(db_task.get_task_artifacts_dirname()) + os.makedirs(task_path) LabelSerializer.create_labels(labels, parent_instance=db_task) diff --git a/cvat/apps/engine/tests/test_rest_api.py b/cvat/apps/engine/tests/test_rest_api.py index a809450992b0..17113f3851a1 100644 --- a/cvat/apps/engine/tests/test_rest_api.py +++ b/cvat/apps/engine/tests/test_rest_api.py @@ -90,7 +90,6 @@ def create_db_task(data): db_task = Task.objects.create(**data) shutil.rmtree(db_task.get_dirname(), ignore_errors=True) os.makedirs(db_task.get_dirname()) - os.makedirs(db_task.get_task_artifacts_dirname()) db_task.data = db_data db_task.save()