Fixing coco keypoints export with absent points (#9565)

Author: Eldies

changelog.d/20250624_000752_dmitrii.lavrukhin_update_datumaro.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Fixing COCO keypoints export for case when some keypoints are absent
+  (<https://github.com/cvat-ai/cvat/pull/9565>)

cvat/apps/dataset_manager/task.py

@@ -259,6 +259,8 @@ def create_tracks(tracks, parent_track=None):
 
             self._sync_frames(tracks, parent_track)
 
+            tracks = [track for track in tracks if track["shapes"]]
+
             for track in tracks:
                 track_attributes = track.pop("attributes", [])
                 shapes = track.pop("shapes")
@@ -731,6 +733,8 @@ def _init_tracks_from_db(self):
         tracks = {}
         elements = {}
         for db_track in db_tracks:
+            if not db_track["shapes"]:
+                continue
             db_track["shapes"] = merge_table_rows(
                 db_track["shapes"],
                 {

cvat/requirements/base.in

@@ -11,7 +11,7 @@ av==9.2.0
 azure-storage-blob==12.13.0
 boto3~=1.37
 clickhouse-connect==0.6.8
-datumaro @ git+https://github.com/cvat-ai/datumaro.git@bdf703d0f6eac472aa94da18b8feca9678671151
+datumaro @ git+https://github.com/cvat-ai/datumaro.git@61e8a29fc8af5bb9c12d2712cce6be6e48eee83a
 dj-pagination==2.5.0
 # Despite direct indication allauth in requirements we should keep 'with_social' for dj-rest-auth
 # to avoid possible further versions conflicts (we use registration functionality)

cvat/requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:2420e62fe29e6854892ae81ad27c6d909485a979
+# SHA1:32a9f11e8eb690acd2fdd851d1a40ca1c32f2ef1
 #
 # This file is automatically generated.
 # To update it, refer to cvat/requirements/README.txt.
@@ -19,15 +19,15 @@ azure-core==1.34.0
     #   msrest
 azure-storage-blob==12.13.0
     # via -r cvat/requirements/base.in
-boto3==1.38.23
+boto3==1.38.42
     # via -r cvat/requirements/base.in
-botocore==1.38.23
+botocore==1.38.42
     # via
     #   boto3
     #   s3transfer
 cachetools==5.5.2
     # via google-auth
-certifi==2025.4.26
+certifi==2025.6.15
     # via
     #   clickhouse-connect
     #   msrest
@@ -46,14 +46,14 @@ contourpy==1.2.1
     # via matplotlib
 crontab==1.0.4
     # via rq-scheduler
-cryptography==45.0.3
+cryptography==45.0.4
     # via
     #   azure-storage-blob
     #   datumaro
     #   pyjwt
 cycler==0.12.1
     # via matplotlib
-datumaro @ git+https://github.com/cvat-ai/datumaro.git@bdf703d0f6eac472aa94da18b8feca9678671151
+datumaro @ git+https://github.com/cvat-ai/datumaro.git@61e8a29fc8af5bb9c12d2712cce6be6e48eee83a
     # via -r cvat/requirements/base.in
 defusedxml==0.7.1
     # via
@@ -65,7 +65,7 @@ dj-pagination==2.5.0
     # via -r cvat/requirements/base.in
 dj-rest-auth[with-social]==5.0.2
     # via -r cvat/requirements/base.in
-django==4.2.21
+django==4.2.23
     # via
     #   -r cvat/requirements/base.in
     #   dj-rest-auth
@@ -96,7 +96,7 @@ django-crum==0.7.9
     # via -r cvat/requirements/base.in
 django-filter==2.4.0
     # via -r cvat/requirements/base.in
-django-health-check==3.18.3
+django-health-check==3.20.0
     # via -r cvat/requirements/base.in
 django-rq==2.8.1
     # via -r cvat/requirements/base.in
@@ -113,17 +113,17 @@ easyprocess==1.1
     # via pyunpack
 entrypoint2==1.1
     # via pyunpack
-fonttools==4.58.0
+fonttools==4.58.4
     # via matplotlib
 freezegun==1.5.2
     # via rq-scheduler
 furl==2.1.0
     # via -r cvat/requirements/base.in
-google-api-core==2.25.0rc1
+google-api-core==2.25.1
     # via
     #   google-cloud-core
     #   google-cloud-storage
-google-auth==2.40.2
+google-auth==2.40.3
     # via
     #   google-api-core
     #   google-cloud-core
@@ -138,7 +138,7 @@ google-resumable-media==2.7.2
     # via google-cloud-storage
 googleapis-common-protos==1.70.0
     # via google-api-core
-h5py==3.13.0
+h5py==3.14.0
     # via datumaro
 idna==3.10
     # via requests
@@ -170,7 +170,7 @@ jsonschema==4.17.3
     # via drf-spectacular
 kiwisolver==1.4.8
     # via matplotlib
-limits==5.2.0
+limits==5.4.0
     # via python-logstash-async
 lxml==5.4.0
     # via
@@ -181,9 +181,7 @@ lxml==5.4.0
 lz4==4.4.4
     # via clickhouse-connect
 matplotlib==3.8.4
-    # via
-    #   datumaro
-    #   pycocotools
+    # via datumaro
 mmh3==5.1.0
     # via pottery
 msrest==0.7.1
@@ -194,7 +192,7 @@ nibabel==5.3.2
     # via datumaro
 nltk==3.9.1
     # via datumaro
-oauthlib==3.2.2
+oauthlib==3.3.1
     # via requests-oauthlib
 orderedmultidict==1.0.1
     # via furl
@@ -206,19 +204,19 @@ packaging==25.0
     #   matplotlib
     #   nibabel
     #   tensorboardx
-pandas==2.2.3
+pandas==2.3.0
     # via datumaro
 patool==1.12
     # via -r cvat/requirements/base.in
 pdf2image==1.14.0
     # via -r cvat/requirements/base.in
-portalocker==3.1.1
+portalocker==3.2.0
     # via datumaro
 pottery==3.0.1
     # via -r cvat/requirements/base.in
 proto-plus==1.26.1
     # via google-api-core
-protobuf==6.31.0
+protobuf==6.31.1
     # via
     #   datumaro
     #   google-api-core
@@ -240,7 +238,7 @@ pyasn1-modules==0.4.2
     # via
     #   google-auth
     #   python-ldap
-pycocotools==2.0.8
+pycocotools==2.0.10
     # via datumaro
 pycparser==2.22
     # via cffi
@@ -295,7 +293,7 @@ redis==4.6.0
     #   rq
 regex==2024.11.6
     # via nltk
-requests==2.32.3
+requests==2.32.4
     # via
     #   -r cvat/requirements/base.in
     #   azure-core
@@ -321,15 +319,15 @@ rq-scheduler==0.13.1
     # via -r cvat/requirements/base.in
 rsa==4.9.1
     # via google-auth
-ruamel-yaml==0.18.11
+ruamel-yaml==0.18.14
     # via datumaro
 ruamel-yaml-clib==0.2.12
     # via ruamel-yaml
 rules==3.5
     # via -r cvat/requirements/base.in
 s3transfer==0.13.0
     # via boto3
-scikit-learn==1.6.1
+scikit-learn==1.7.0
     # via datumaro
 scipy==1.13.1
     # via
@@ -349,11 +347,11 @@ sqlparse==0.5.3
     # via django
 tabulate==0.9.0
     # via datumaro
-tensorboardx==2.6.2.2
+tensorboardx==2.6.4
     # via datumaro
 threadpoolctl==3.6.0
     # via scikit-learn
-typing-extensions==4.13.2
+typing-extensions==4.14.0
     # via
     #   asgiref
     #   azure-core
@@ -363,9 +361,9 @@ typing-extensions==4.13.2
     #   pottery
 tzdata==2025.2
     # via pandas
-uritemplate==4.1.1
+uritemplate==4.2.0
     # via drf-spectacular
-urllib3==2.4.0
+urllib3==2.5.0
     # via
     #   botocore
     #   clickhouse-connect
@@ -376,7 +374,7 @@ xmlsec==1.3.15
     # via
     #   -r cvat/requirements/base.in
     #   python3-saml
-zipp==3.22.0
+zipp==3.23.0
     # via importlib-metadata
 zstandard==0.23.0
     # via clickhouse-connect

cvat/requirements/development.txt

@@ -4,21 +4,15 @@
 # To update it, refer to cvat/requirements/README.txt.
 #
 -r base.txt
-autopep8==2.3.2
-    # via django-silk
 django-extensions==3.0.8
     # via -r cvat/requirements/development.in
-django-silk==5.3.2
+django-silk==5.4.0
     # via -r cvat/requirements/development.in
 gprof2dot==2025.4.14
     # via django-silk
-pycodestyle==2.13.0
-    # via autopep8
 rope==0.17.0
     # via -r cvat/requirements/development.in
 snakeviz==2.1.0
     # via -r cvat/requirements/development.in
-tomli==2.2.1
-    # via autopep8
 tornado==6.5.1
     # via snakeviz

cvat/requirements/production.txt

@@ -22,7 +22,7 @@ uvicorn[standard]==0.22.0
     # via -r cvat/requirements/production.in
 uvloop==0.21.0
     # via uvicorn
-watchfiles==1.0.5
+watchfiles==1.1.0
     # via uvicorn
 websockets==15.0.1
     # via uvicorn

cvat/requirements/testing.txt

@@ -6,9 +6,9 @@
 -r development.txt
 coverage==7.2.3
     # via -r cvat/requirements/testing.in
-fakeredis[lua]==2.29.0
+fakeredis[lua]==2.30.1
     # via -r cvat/requirements/testing.in
-lupa==2.4
+lupa==2.5
     # via fakeredis
 sortedcontainers==2.4.0
     # via fakeredis

tests/python/rest_api/utils.py

@@ -471,7 +471,13 @@ def create_task(username, spec, data, content_type="application/json", **kwargs)
 
 
 def compare_annotations(a: dict, b: dict) -> dict:
-    def _exclude_cb(obj, path):
+    def _exclude_cb(obj, path: str):
+        # ignoring track elements which do not have shapes
+        split_path = path.rsplit("['elements']", maxsplit=1)
+        if len(split_path) == 2:
+            if split_path[1].count("[") == 1 and not obj["shapes"]:
+                return True
+
         return path.endswith("['elements']") and not obj
 
     return DeepDiff(