supervisely 6.73.314__py3-none-any.whl → 6.73.315__py3-none-any.whl

supervisely/project/data_version.py

@@ -30,6 +30,7 @@ class VersionInfo(NamedTuple):
     updated_at: str
     project_updated_at: str
     team_id: int
+    name: str
 
 
 class DataVersion(ModuleApiBase):
@@ -67,6 +68,7 @@ class DataVersion(ModuleApiBase):
             ApiField.UPDATED_AT,
             ApiField.PROJECT_UPDATED_AT,
             ApiField.TEAM_ID,
+            ApiField.NAME,
         ]
 
     @staticmethod

supervisely/project/project.py

@@ -73,24 +73,64 @@ from supervisely.task.progress import Progress, tqdm_sly
 
 class CustomUnpickler(pickle.Unpickler):
     """
-    Custom Unpickler to load pickled objects with fields that are not present in the class definition.
-    Used to load old pickled objects that have been pickled with a class that has been updated.
-    Supports loading namedtuple objects with missing fields.
+    Custom Unpickler for loading pickled objects of the same class with differing definitions.
+    Handles cases where a class object is reconstructed using a newer definition with additional fields
+    or an outdated definition missing some fields.
+    Supports loading namedtuple objects with missing or extra fields.
     """
 
+    def __init__(self, file, **kwargs):
+        super().__init__(file, **kwargs)
+        self.warned_classes = set()  # To prevent multiple warnings for the same class
+        self.sdk_update_notified = False
+
     def find_class(self, module, name):
+        prefix = "Pickled"
         cls = super().find_class(module, name)
-        if hasattr(cls, "_fields"):
+        if hasattr(cls, "_fields") and "Info" in cls.__name__:
             orig_new = cls.__new__
 
             def new(cls, *args, **kwargs):
+                orig_class_name = cls.__name__[len(prefix) :]
+                # Case when new definition of class has more fields than the old one
                 if len(args) < len(cls._fields):
+                    default_values = cls._field_defaults
                     # Set missed attrs to None
-                    args = list(args) + [None] * (len(cls._fields) - len(args))
+                    num_missing = len(cls._fields) - len(args)
+                    args = list(args) + [None] * num_missing
+                    # Replace only the added None values with default values where applicable
+                    args[-num_missing:] = [
+                        (
+                            default_values.get(field, arg)
+                            if arg is None and field in default_values
+                            else arg
+                        )
+                        for field, arg in zip(cls._fields[-num_missing:], args[-num_missing:])
+                    ]
+                    if orig_class_name not in self.warned_classes:
+                        new_fields = cls._fields[len(cls._fields) - num_missing :]
+                        logger.warning(
+                            f"New fields {new_fields} for the '{orig_class_name}' class objects are set to their default values or None due to an updated definition of this class."
+                        )
+                        self.warned_classes.add(orig_class_name)
+                # Case when the object of new class definition creating within old class definition
+                elif len(args) > len(cls._fields):
+                    end_index = len(args)
+                    args = args[: len(cls._fields)]
+                    if orig_class_name not in self.warned_classes:
+                        logger.warning(
+                            f"Extra fields idx {list(range(len(cls._fields), end_index))} are ignored for '{orig_class_name}' class objects due to an outdated class definition"
+                        )
+                        self.warned_classes.add(orig_class_name)
+                        if not self.sdk_update_notified:
+                            logger.warning(
+                                "It is recommended to update the SDK version to restore the project version correctly."
+                            )
+                            self.sdk_update_notified = True
                 return orig_new(cls, *args, **kwargs)
 
-            # Create a new class dynamically
-            NewCls = type(f"Pickled{cls.__name__}", (cls,), {"__new__": new})
+            # Create a new subclass dynamically to prevent redefining the current class
+            NewCls = type(f"{prefix}{cls.__name__}", (cls,), {"__new__": new})
             return NewCls
 
         return cls

{supervisely-6.73.314.dist-info → supervisely-6.73.315.dist-info}/METADATA

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

{supervisely-6.73.314.dist-info → supervisely-6.73.315.dist-info}/RECORD

@@ -1009,11 +1009,11 @@ supervisely/pointcloud_annotation/pointcloud_tag_collection.py,sha256=j_TAN23GkT
 supervisely/pointcloud_episodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/pointcloud_episodes/pointcloud_episodes.py,sha256=cRXdtw7bMsbsdVQjxfWxFSESrO-LGiqqsZyyExl2Mbg,3430
 supervisely/project/__init__.py,sha256=hlzdj9Pgy53Q3qdP8LMtGTChvZHQuuShdtui2eRUQeE,2601
-supervisely/project/data_version.py,sha256=nknaWJSUCwoDyNG9_d1KA-GjzidhV9zd9Cn8cg15DOU,19270
+supervisely/project/data_version.py,sha256=6vOz5ovBeCIiMAKUG7lGQ5IXvQnU1GbcnrWxdOvaVlo,19311
 supervisely/project/download.py,sha256=zb8sb4XZ6Qi3CP7fmtLRUAYzaxs_W0WnOfe2x3ZVRMs,24639
 supervisely/project/pointcloud_episode_project.py,sha256=yiWdNBQiI6f1O9sr1pg8JHW6O-w3XUB1rikJNn3Oung,41866
 supervisely/project/pointcloud_project.py,sha256=Kx1Vaes-krwG3BiRRtHRLQxb9G5m5bTHPN9IzRqmNWo,49399
-supervisely/project/project.py,sha256=LHsrMBbMxdMynhuS0RhjiRFxnzikj6esyKFfR8kEZ9Q,203388
+supervisely/project/project.py,sha256=nKnnYVrSx_MWh5G_fObaAegkRxLFJg_J074SaduEYGo,205871
 supervisely/project/project_meta.py,sha256=26s8IiHC5Pg8B1AQi6_CrsWteioJP2in00cRNe8QlW0,51423
 supervisely/project/project_settings.py,sha256=NLThzU_DCynOK6hkHhVdFyezwprn9UqlnrLDe_3qhkY,9347
 supervisely/project/project_type.py,sha256=EZDJFRi4MmC_5epYexBgML5WMZsWdEVk_CjqDQy5m3c,572
@@ -1075,9 +1075,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.314.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.314.dist-info/METADATA,sha256=tkFe5LFrkVUYUTeEIxFSOeaMTKdD2Yd5d5ELJNV7ONo,33596
-supervisely-6.73.314.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.314.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.314.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.314.dist-info/RECORD,,
+supervisely-6.73.315.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.315.dist-info/METADATA,sha256=FgW6GD5UxnnvJGHRPPUQTLUj4Oc-gXyh7tZbGw2E4uE,33596
+supervisely-6.73.315.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.315.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.315.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.315.dist-info/RECORD,,