Merge pull request #9615 from cvat-ai/release-2.40.1

cvat-bot[bot] · web-flow · commit 73e6cf074add · 2025-07-07T19:13:32.000Z
Release v2.40.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-2.40.1'></a>
+## \[2.40.1\] - 2025-07-07
+
+### Fixed
+
+- Low performance of DELELE `/api/tasks/<id>` and GET `/api/jobs(tasks)/<id>/annotations`
+  Because of inefficient database queries (<https://github.com/cvat-ai/cvat/pull/9612>)
+
 <a id='changelog-2.40.0'></a>
 ## \[2.40.0\] - 2025-06-25
 
diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt
@@ -1,4 +1,4 @@
-cvat-sdk==2.40.0
+cvat-sdk==2.40.1
 
 attrs>=24.2.0
 Pillow>=10.3.0
diff --git a/cvat-cli/src/cvat_cli/version.py b/cvat-cli/src/cvat_cli/version.py
@@ -1 +1 @@
-VERSION = "2.40.0"
+VERSION = "2.40.1"
diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh
@@ -8,7 +8,7 @@ set -e
 
 GENERATOR_VERSION="v6.0.1"
 
-VERSION="2.40.0"
+VERSION="2.40.1"
 LIB_NAME="cvat_sdk"
 LAYER1_LIB_NAME="${LIB_NAME}/api_client"
 DST_DIR="$(cd "$(dirname -- "$0")/.." && pwd)"
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "2.40.0",
+  "version": "2.40.1",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {
diff --git a/cvat/__init__.py b/cvat/__init__.py
@@ -4,6 +4,6 @@
 
 from cvat.utils.version import get_version
 
-VERSION = (2, 40, 0, "final", 0)
+VERSION = (2, 40, 1, "final", 0)
 
 __version__ = get_version(VERSION)
diff --git a/cvat/apps/dataset_manager/task.py b/cvat/apps/dataset_manager/task.py
@@ -268,7 +268,9 @@ def create_tracks(tracks, parent_track=None):
                 self._validate_label_for_existence(db_track.label_id)
 
                 for attr in track_attributes:
-                    db_attr_val = models.LabeledTrackAttributeVal(**attr, track_id=len(db_tracks))
+                    db_attr_val = models.LabeledTrackAttributeVal(
+                        **attr, job_id=self.db_job.id, track_id=len(db_tracks)
+                    )
 
                     self._validate_attribute_for_existence(
                         db_attr_val, db_track.label_id, "immutable"
@@ -282,7 +284,9 @@ def create_tracks(tracks, parent_track=None):
 
                     for attr in shape_attributes:
                         db_attr_val = models.TrackedShapeAttributeVal(
-                            **attr, shape_id=len(db_shapes)
+                            **attr,
+                            shape_id=len(db_shapes),
+                            job_id=self.db_job.id,
                         )
 
                         self._validate_attribute_for_existence(
@@ -345,7 +349,9 @@ def create_shapes(shapes, parent_shape=None):
                 self._validate_label_for_existence(db_shape.label_id)
 
                 for attr in attributes:
-                    db_attr_val = models.LabeledShapeAttributeVal(**attr, shape_id=len(db_shapes))
+                    db_attr_val = models.LabeledShapeAttributeVal(
+                        **attr, job_id=self.db_job.id, shape_id=len(db_shapes)
+                    )
 
                     self._validate_attribute_for_existence(db_attr_val, db_shape.label_id, "all")
 
@@ -382,7 +388,7 @@ def _save_tags_to_db(self, tags):
             self._validate_label_for_existence(db_tag.label_id)
 
             for attr in attributes:
-                db_attr_val = models.LabeledImageAttributeVal(**attr)
+                db_attr_val = models.LabeledImageAttributeVal(**attr, job_id=self.db_job.id)
 
                 self._validate_attribute_for_existence(db_attr_val, db_tag.label_id, "all")
 
@@ -574,35 +580,39 @@ def _extend_attributes(attributeval_set, default_attribute_values):
                 )
 
     def _init_tags_from_db(self):
-        # NOTE: do not use .prefetch_related() with .values() since it's useless:
-        # https://github.com/cvat-ai/cvat/pull/7748#issuecomment-2063695007
-        db_tags = (
-            self.db_job.labeledimage_set.values(
+        db_tags = {
+            row["id"]: dotdict(row, attributes=[])
+            for row in self.db_job.labeledimage_set.values(
                 "id",
                 "frame",
                 "label_id",
                 "group",
                 "source",
-                "attribute__spec_id",
-                "attribute__value",
-                "attribute__id",
             )
             .order_by("frame")
             .iterator(chunk_size=2000)
-        )
+        }
 
-        db_tags = merge_table_rows(
-            rows=db_tags,
-            keys_for_merge={
-                "attributes": [
-                    "attribute__spec_id",
-                    "attribute__value",
-                    "attribute__id",
-                ],
-            },
-            field_id="id",
-        )
+        for attr in self.db_job.labeledimageattributeval_set.values(
+            "image_id",
+            "spec_id",
+            "value",
+            "id",
+        ).iterator(chunk_size=2000):
+            if attr["image_id"] not in db_tags:
+                continue
+
+            db_tags[attr["image_id"]]["attributes"].append(
+                dotdict(
+                    {
+                        "id": attr["id"],
+                        "spec_id": attr["spec_id"],
+                        "value": attr["value"],
+                    }
+                )
+            )
 
+        db_tags = list(db_tags.values())
         for db_tag in db_tags:
             self._extend_attributes(
                 db_tag.attributes, self.db_attributes[db_tag.label_id]["all"].values()
@@ -612,10 +622,9 @@ def _init_tags_from_db(self):
         self.ir_data.tags = serializer.data
 
     def _init_shapes_from_db(self):
-        # NOTE: do not use .prefetch_related() with .values() since it's useless:
-        # https://github.com/cvat-ai/cvat/pull/7748#issuecomment-2063695007
-        db_shapes = (
-            self.db_job.labeledshape_set.values(
+        db_shapes = {
+            row["id"]: dotdict(row, attributes=[])
+            for row in self.db_job.labeledshape_set.values(
                 "id",
                 "label_id",
                 "type",
@@ -628,29 +637,33 @@ def _init_shapes_from_db(self):
                 "rotation",
                 "points",
                 "parent",
-                "attribute__spec_id",
-                "attribute__value",
-                "attribute__id",
             )
             .order_by("frame")
             .iterator(chunk_size=2000)
-        )
+        }
 
-        db_shapes = merge_table_rows(
-            rows=db_shapes,
-            keys_for_merge={
-                "attributes": [
-                    "attribute__spec_id",
-                    "attribute__value",
-                    "attribute__id",
-                ],
-            },
-            field_id="id",
-        )
+        for attr in self.db_job.labeledshapeattributeval_set.values(
+            "shape_id",
+            "spec_id",
+            "value",
+            "id",
+        ).iterator(chunk_size=2000):
+            if attr["shape_id"] not in db_shapes:
+                continue
+
+            db_shapes[attr["shape_id"]]["attributes"].append(
+                dotdict(
+                    {
+                        "id": attr["id"],
+                        "spec_id": attr["spec_id"],
+                        "value": attr["value"],
+                    }
+                )
+            )
 
         shapes = {}
         elements = {}
-        for db_shape in db_shapes:
+        for db_shape in db_shapes.values():
             self._extend_attributes(
                 db_shape.attributes, self.db_attributes[db_shape.label_id]["all"].values()
             )
diff --git a/cvat/apps/engine/migrations/0092_labeledimageattributeval_job_and_more.py b/cvat/apps/engine/migrations/0092_labeledimageattributeval_job_and_more.py
@@ -0,0 +1,124 @@
+# Generated by Django 4.2.21 on 2025-07-07 09:30
+
+import django.db.models.deletion
+from django.db import connection, migrations, models
+from django.db.models import F, OuterRef, Subquery
+
+
+def set_attributeval_job_id(apps, schema_editor):
+    LabeledImage = apps.get_model("engine", "LabeledImage")
+    LabeledShape = apps.get_model("engine", "LabeledShape")
+    LabeledTrack = apps.get_model("engine", "LabeledTrack")
+    TrackedShape = apps.get_model("engine", "TrackedShape")
+
+    LabeledImageAttributeVal = apps.get_model("engine", "LabeledImageAttributeVal")
+    LabeledShapeAttributeVal = apps.get_model("engine", "LabeledShapeAttributeVal")
+    LabeledTrackAttributeVal = apps.get_model("engine", "LabeledTrackAttributeVal")
+    TrackedShapeAttributeVal = apps.get_model("engine", "TrackedShapeAttributeVal")
+
+    LabeledImageAttributeVal.objects.annotate(
+        related_job_id=Subquery(
+            LabeledImage.objects.filter(id=OuterRef("image_id")).values("job_id")[:1]
+        )
+    ).update(job_id=F("related_job_id"))
+
+    LabeledShapeAttributeVal.objects.annotate(
+        related_job_id=Subquery(
+            LabeledShape.objects.filter(id=OuterRef("shape_id")).values("job_id")[:1]
+        )
+    ).update(job_id=F("related_job_id"))
+
+    LabeledTrackAttributeVal.objects.annotate(
+        related_job_id=Subquery(
+            LabeledTrack.objects.filter(id=OuterRef("track_id")).values("job_id")[:1]
+        )
+    ).update(job_id=F("related_job_id"))
+
+    TrackedShapeAttributeVal.objects.annotate(
+        related_job_id=Subquery(
+            TrackedShape.objects.filter(id=OuterRef("shape_id")).values("track__job_id")[:1]
+        )
+    ).update(job_id=F("related_job_id"))
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("engine", "0091_profile_last_activity_date"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="labeledimageattributeval",
+            name="job",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                to="engine.job",
+            ),
+        ),
+        migrations.AddField(
+            model_name="labeledshapeattributeval",
+            name="job",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                to="engine.job",
+            ),
+        ),
+        migrations.AddField(
+            model_name="labeledtrackattributeval",
+            name="job",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                to="engine.job",
+            ),
+        ),
+        migrations.AddField(
+            model_name="trackedshapeattributeval",
+            name="job",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                to="engine.job",
+            ),
+        ),
+        migrations.RunPython(set_attributeval_job_id, reverse_code=migrations.RunPython.noop),
+        migrations.AlterField(
+            model_name="labeledimageattributeval",
+            name="job",
+            field=models.ForeignKey(
+                null=False,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                to="engine.job",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="labeledshapeattributeval",
+            name="job",
+            field=models.ForeignKey(
+                null=False,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                to="engine.job",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="labeledtrackattributeval",
+            name="job",
+            field=models.ForeignKey(
+                null=False,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                to="engine.job",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="trackedshapeattributeval",
+            name="job",
+            field=models.ForeignKey(
+                null=False,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                to="engine.job",
+            ),
+        ),
+    ]
diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py
@@ -459,13 +459,13 @@ def get_tmp_dirname(self) -> str:
 @transaction.atomic(savepoint=False)
 def clear_annotations_in_jobs(job_ids: Iterable[int]):
     for job_ids_chunk in take_by(job_ids, chunk_size=1000):
-        TrackedShapeAttributeVal.objects.filter(shape__track__job_id__in=job_ids_chunk).delete()
+        TrackedShapeAttributeVal.objects.filter(job_id__in=job_ids_chunk).delete()
         TrackedShape.objects.filter(track__job_id__in=job_ids_chunk).delete()
-        LabeledTrackAttributeVal.objects.filter(track__job_id__in=job_ids_chunk).delete()
+        LabeledTrackAttributeVal.objects.filter(job_id__in=job_ids_chunk).delete()
         LabeledTrack.objects.filter(job_id__in=job_ids_chunk).delete()
-        LabeledShapeAttributeVal.objects.filter(shape__job_id__in=job_ids_chunk).delete()
+        LabeledShapeAttributeVal.objects.filter(job_id__in=job_ids_chunk).delete()
         LabeledShape.objects.filter(job_id__in=job_ids_chunk).delete()
-        LabeledImageAttributeVal.objects.filter(image__job_id__in=job_ids_chunk).delete()
+        LabeledImageAttributeVal.objects.filter(job_id__in=job_ids_chunk).delete()
         LabeledImage.objects.filter(job_id__in=job_ids_chunk).delete()
 
 
@@ -477,15 +477,15 @@ def clear_annotations_on_frames_in_honeypot_task(db_task: Task, frames: Sequence
 
     for frames_batch in take_by(frames, chunk_size=1000):
         LabeledShapeAttributeVal.objects.filter(
-            shape__job_id__segment__task_id=db_task.id,
+            job_id__segment__task_id=db_task.id,
             shape__frame__in=frames_batch,
         ).delete()
         LabeledShape.objects.filter(
             job_id__segment__task_id=db_task.id,
             frame__in=frames_batch,
         ).delete()
         LabeledImageAttributeVal.objects.filter(
-            image__job_id__segment__task_id=db_task.id,
+            job_id__segment__task_id=db_task.id,
             image__frame__in=frames_batch,
         ).delete()
         LabeledImage.objects.filter(
@@ -1075,6 +1075,7 @@ class AttributeVal(models.Model):
     # TODO: add a validator here to be sure that it corresponds to self.label
     id = models.BigAutoField(primary_key=True)
     spec = models.ForeignKey(AttributeSpec, on_delete=models.CASCADE)
+    job = models.ForeignKey(Job, on_delete=models.DO_NOTHING, null=False)
     value = SafeCharField(max_length=4096)
 
     class Meta:
diff --git a/cvat/schema.yml b/cvat/schema.yml
@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: CVAT REST API
-  version: 2.40.0
+  version: 2.40.1
   description: REST API for Computer Vision Annotation Tool (CVAT)
   termsOfService: https://www.google.com/policies/terms/
   contact:
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
diff --git a/tests/python/shared/assets/cvat_db/data.json b/tests/python/shared/assets/cvat_db/data.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cvat-sdk==2.40.0`
	`1`	`+cvat-sdk==2.40.1`
`2`	`2`
`3`	`3`	`attrs>=24.2.0`
`4`	`4`	`Pillow>=10.3.0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-VERSION = "2.40.0"`
	`1`	`+VERSION = "2.40.1"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cvat-ui",`
`3`		`- "version": "2.40.0",`
	`3`	`+ "version": "2.40.1",`
`4`	`4`	`"description": "CVAT single-page application",`
`5`	`5`	`"main": "src/index.tsx",`
`6`	`6`	`"scripts": {`