supervisely 6.73.296__py3-none-any.whl → 6.73.298__py3-none-any.whl

supervisely/convert/base_converter.py

@@ -426,20 +426,17 @@ class BaseConverter:
         """
         existing = meta1.project_settings.labeling_interface
         new = meta2.project_settings.labeling_interface
-        if existing == new:
+        if existing == new or new == LabelingInterface.DEFAULT:
             return meta1
 
-        if new is None or new == LabelingInterface.DEFAULT:
-            return meta1
-
-        if existing == LabelingInterface.DEFAULT:
-            group_tag_name = meta2.project_settings.multiview_tag_name
-            if group_tag_name and renamed_tags:
-                group_tag_name = renamed_tags.get(group_tag_name, group_tag_name)
+        group_tag_name = meta2.project_settings.multiview_tag_name
+        if group_tag_name:
+            group_tag_name = renamed_tags.get(group_tag_name, group_tag_name)
             new_settings = meta2.project_settings.clone(multiview_tag_name=group_tag_name)
+        else:
+            new_settings = meta2.project_settings
 
-            return meta1.clone(project_settings=new_settings)
-        return meta1
+        return meta1.clone(project_settings=new_settings)
 
     def _download_remote_ann_files(self) -> None:
         """

supervisely/video_annotation/frame_collection.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 
 from typing import Any, Dict, List, Optional, Tuple
 
+from supervisely.sly_logger import logger
 from supervisely.api.module_api import ApiField
 from supervisely.collection.key_indexed_collection import KeyIndexedCollection
 from supervisely.video_annotation.frame import Frame
@@ -244,6 +245,7 @@ class FrameCollection(KeyIndexedCollection):
         objects: VideoObjectCollection,
         frames_count: Optional[int] = None,
         key_id_map: Optional[KeyIdMap] = None,
+        skip_corrupted: Optional[bool] = False,
     ) -> FrameCollection:
         """
         Convert a list of json dicts to FrameCollection. Read more about `Supervisely format <https://docs.supervise.ly/data-organization/00_ann_format_navi>`_.
@@ -279,10 +281,17 @@ class FrameCollection(KeyIndexedCollection):
             objects = []
             fr_collection = sly.FrameCollection.from_json(fr_collection_json, objects)
         """
-        frames = [
-            cls.item_type.from_json(frame_json, objects, frames_count, key_id_map)
-            for frame_json in data
-        ]
+        frames = []
+        for frame_json in data:
+            try:
+                frame = cls.item_type.from_json(frame_json, objects, frames_count, key_id_map)
+                frames.append(frame)
+            except Exception as e:
+                if skip_corrupted:
+                    logger.warning(f"Skipping corrupted frame: {e}", exc_info=True)
+                    continue
+                else:
+                    raise e
         return cls(frames)
 
     def __str__(self):

supervisely/video_annotation/video_annotation.py

@@ -587,7 +587,11 @@ class VideoAnnotation:
 
     @classmethod
     def from_json(
-        cls, data: Dict, project_meta: ProjectMeta, key_id_map: KeyIdMap = None
+        cls,
+        data: Dict,
+        project_meta: ProjectMeta,
+        key_id_map: KeyIdMap = None,
+        skip_corrupted: Optional[bool] = False,
     ) -> VideoAnnotation:
         """
         Convert a json dict to VideoAnnotation. Read more about `Supervisely format <https://docs.supervise.ly/data-organization/00_ann_format_navi>`_.
@@ -598,6 +602,8 @@ class VideoAnnotation:
         :type project_meta: ProjectMeta
         :param key_id_map: KeyIdMap object.
         :type key_id_map: Union[KeyIdMap, None]
+        :param skip_corrupted: Skip corrupted items (currently only frames) during conversion.
+        :type skip_corrupted: bool, optional
         :return: VideoAnnotation object
         :rtype: :class:`VideoAnnotation`
 
@@ -638,7 +644,7 @@ class VideoAnnotation:
 
         tags = VideoTagCollection.from_json(data[TAGS], project_meta.tag_metas, key_id_map)
         objects = VideoObjectCollection.from_json(data[OBJECTS], project_meta, key_id_map)
-        frames = FrameCollection.from_json(data[FRAMES], objects, frames_count, key_id_map)
+        frames = FrameCollection.from_json(data[FRAMES], objects, frames_count, key_id_map, skip_corrupted)
 
         return cls(
             img_size=img_size,

{supervisely-6.73.296.dist-info → supervisely-6.73.298.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.296
+Version: 6.73.298
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely

{supervisely-6.73.296.dist-info → supervisely-6.73.298.dist-info}/RECORD

@@ -561,7 +561,7 @@ supervisely/collection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 supervisely/collection/key_indexed_collection.py,sha256=x2UVlkprspWhhae9oLUzjTWBoIouiWY9UQSS_MozfH0,37643
 supervisely/collection/str_enum.py,sha256=Zp29yFGvnxC6oJRYNNlXhO2lTSdsriU1wiGHj6ahEJE,1250
 supervisely/convert/__init__.py,sha256=pF1bOrg8SzkdFn90AWGRmVa9OQrHABY0gTlgurJ86Tw,962
-supervisely/convert/base_converter.py,sha256=m4wh1BZIW_wbzZk4eS3PN50TMIsb2ZPud2RjVcPfQxY,18627
+supervisely/convert/base_converter.py,sha256=eCFnvyoMI96rWjB5amFPZX2fI_TSdr__ruqxwQIbfFo,18537
 supervisely/convert/converter.py,sha256=tWxTDfFv7hwzQhUQrBxzfr6WP8FUGFX_ewg5T2HbUYo,8959
 supervisely/convert/image/__init__.py,sha256=JEuyaBiiyiYmEUYqdn8Mog5FVXpz0H1zFubKkOOm73I,1395
 supervisely/convert/image/image_converter.py,sha256=8vak8ZoKTN1ye2ZmCTvCZ605-Rw1AFLIEo7bJMfnR68,10426
@@ -1036,9 +1036,9 @@ supervisely/video/video.py,sha256=4dHlMYvXtiMQYqrCnF-u61C6bmfnXfOyCTdISMlsxWM,16
 supervisely/video_annotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/video_annotation/constants.py,sha256=_gW9iMhVk1w_dUaFiaiyXn66mt13S6bkxC64xpjP-CU,529
 supervisely/video_annotation/frame.py,sha256=H1G7Wl4LEEmQE-E0B2QWD8kyzZ4-w-GJSUdq7v_Qs2g,10568
-supervisely/video_annotation/frame_collection.py,sha256=_iGFyZV0Vz7JnGNdtJaTKjI5H0Ci1fS-cNN2iunCEbY,14654
+supervisely/video_annotation/frame_collection.py,sha256=RZrnw7lURgvzRrskwvnEIQQfJkp9htMhircU3hLiHVY,15031
 supervisely/video_annotation/key_id_map.py,sha256=KayYOhTtAe3ITq1-NQ82T6YIiBjmu4aJm8t4UxdvI8U,37712
-supervisely/video_annotation/video_annotation.py,sha256=w_3JnK1rYSY5iqPXSB_9hF7fBkZyomlmBQ2L3tAZZs4,28638
+supervisely/video_annotation/video_annotation.py,sha256=syqfhIerzhMWNh8scM_kWskBl8R2E-pfOSW_jN2Lb1Y,28867
 supervisely/video_annotation/video_figure.py,sha256=j1ZoDnMLO_bFRUI19GDK3A2CzTWGr5pGYbd3NjC7ztE,23766
 supervisely/video_annotation/video_object.py,sha256=i-oiliNpDr2X4Wcy9DJ7sBbuVUT3QYiSrtklCCJGVsY,16736
 supervisely/video_annotation/video_object_collection.py,sha256=Epu9MAC9uZiThfBn4NxKbQ7JRbW4eFZHglTzaJJ9WUQ,9047
@@ -1070,9 +1070,9 @@ supervisely/worker_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 supervisely/worker_proto/worker_api_pb2.py,sha256=VQfi5JRBHs2pFCK1snec3JECgGnua3Xjqw_-b3aFxuM,59142
 supervisely/worker_proto/worker_api_pb2_grpc.py,sha256=3BwQXOaP9qpdi0Dt9EKG--Lm8KGN0C5AgmUfRv77_Jk,28940
 supervisely_lib/__init__.py,sha256=7-3QnN8Zf0wj8NCr2oJmqoQWMKKPKTECvjH9pd2S5vY,159
-supervisely-6.73.296.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.296.dist-info/METADATA,sha256=jw6IjeK21DXTFEgbISalLDxHn7BWvWAQkZ3rbhAMJ5g,33573
-supervisely-6.73.296.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.296.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.296.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.296.dist-info/RECORD,,
+supervisely-6.73.298.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.298.dist-info/METADATA,sha256=KRpOS5RHRzEpuetnO0yl7tAhP8BG9Ndpqz3zUNRAZDw,33573
+supervisely-6.73.298.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.298.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.298.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.298.dist-info/RECORD,,