uiprotect 1.7.2__py3-none-any.whl → 1.9.0__py3-none-any.whl

uiprotect/data/base.py

@@ -55,13 +55,6 @@ if TYPE_CHECKING:
     from ..data.nvr import Event
     from ..data.user import User
 
-    try:
-        from pydantic.v1.typing import DictStrAny
-    except ImportError:
-        from pydantic.typing import (  # type: ignore[assignment, no-redef]
-            DictStrAny,
-        )
-
 
 ProtectObject = TypeVar("ProtectObject", bound="ProtectBaseObject")
 RECENT_EVENT_MAX = timedelta(seconds=30)
@@ -91,7 +84,6 @@ class ProtectBaseObject(BaseModel):
     _protect_objs: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
     _protect_lists: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
     _protect_dicts: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
-    _to_unifi_remaps: ClassVar[DictStrAny | None] = None
 
     class Config:
         arbitrary_types_allowed = True
@@ -197,6 +189,7 @@ class ProtectBaseObject(BaseModel):
         return set(self._get_unifi_remaps())
 
     @classmethod
+    @cache
     def _get_to_unifi_remaps(cls) -> dict[str, str]:
         """
         Helper method for overriding in child classes for reversing remap UFP
@@ -208,12 +201,9 @@ class ProtectBaseObject(BaseModel):
             "python_name": "ufpJsonName"
         }
         """
-        if cls._to_unifi_remaps is None:
-            cls._to_unifi_remaps = {
-                to_key: from_key for from_key, to_key in cls._get_unifi_remaps().items()
-            }
-
-        return cls._to_unifi_remaps
+        return {
+            to_key: from_key for from_key, to_key in cls._get_unifi_remaps().items()
+        }
 
     @classmethod
     def _set_protect_subtypes(cls) -> None:
@@ -630,6 +620,7 @@ class ProtectModelWithId(ProtectModel):
         return obj
 
     @classmethod
+    @cache
     def _get_read_only_fields(cls) -> set[str]:
         return set()
 

uiprotect/data/bootstrap.py

@@ -154,10 +154,6 @@ class ProtectDeviceRef(ProtectBaseObject):
     id: str
 
 
-_ModelType_NVR_value = ModelType.NVR.value
-_ModelType_Event_value = ModelType.EVENT.value
-
-
 class Bootstrap(ProtectBaseObject):
     auth_user_id: str
     access_key: str
@@ -197,8 +193,8 @@ class Bootstrap(ProtectBaseObject):
         )
         data["macLookup"] = {}
         data["idLookup"] = {}
-        for model_type in ModelType.bootstrap_models_types_set():
-            key = model_type.devices_key
+        for model_type in ModelType.bootstrap_models_types_set:
+            key = model_type.devices_key  # type: ignore[attr-defined]
             items: dict[str, ProtectModel] = {}
             for item in data[key]:
                 if (
@@ -234,8 +230,8 @@ class Bootstrap(ProtectBaseObject):
         if "idLookup" in data:
             del data["idLookup"]
 
-        for model_type in ModelType.bootstrap_models_types_set():
-            attr = model_type.devices_key
+        for model_type in ModelType.bootstrap_models_types_set:
+            attr = model_type.devices_key  # type: ignore[attr-defined]
             if attr in data and isinstance(data[attr], dict):
                 data[attr] = list(data[attr].values())
 
@@ -357,17 +353,16 @@ class Bootstrap(ProtectBaseObject):
             if TYPE_CHECKING:
                 assert isinstance(obj, NVR)
             self.nvr = obj
-        elif model_type in ModelType.bootstrap_models_types_set():
+        elif model_type in ModelType.bootstrap_models_types_set:
             if TYPE_CHECKING:
                 assert isinstance(obj, ProtectAdoptableDeviceModel)
-                assert isinstance(obj.model, ModelType)
-            key = obj.model.devices_key
             if not self._api.ignore_unadopted or (
                 obj.is_adopted and not obj.is_adopted_by_other
             ):
-                getattr(self, key)[obj.id] = obj
-                ref = ProtectDeviceRef(model=obj.model, id=obj.id)
-                self.id_lookup[obj.id] = ref
+                id_ = obj.id
+                getattr(self, model_type.devices_key)[id_] = obj
+                ref = ProtectDeviceRef(model=model_type, id=id_)
+                self.id_lookup[id_] = ref
                 self.mac_lookup[normalize_mac(obj.mac)] = ref
         else:
             _LOGGER.debug("Unexpected bootstrap model type for add: %s", model_type)
@@ -555,7 +550,7 @@ class Bootstrap(ProtectBaseObject):
             if action_action == "update":
                 if model_type is ModelType.NVR:
                     return self._process_nvr_update(packet, data, ignore_stats)
-                if model_type in ModelType.bootstrap_models_types_and_event_set():
+                if model_type in ModelType.bootstrap_models_types_and_event_set:
                     return self._process_device_update(
                         model_type,
                         packet,

uiprotect/data/types.py

@@ -109,6 +109,12 @@ class ModelType(str, UnknownValuesEnumMixin, enum.Enum):
     RECORDING_SCHEDULE = "recordingSchedule"
     UNKNOWN = "unknown"
 
+    bootstrap_model_types: tuple[ModelType, ...]
+    bootstrap_models: tuple[str, ...]
+    bootstrap_models_set: set[str]
+    bootstrap_models_types_set: set[ModelType]
+    bootstrap_models_types_and_event_set: set[ModelType]
+
     @cached_property
     def devices_key(self) -> str:
         """Return the devices key."""
@@ -119,9 +125,8 @@ class ModelType(str, UnknownValuesEnumMixin, enum.Enum):
     def from_string(cls, value: str) -> ModelType:
         return cls(value)
 
-    @staticmethod
-    @cache
-    def bootstrap_model_types() -> tuple[ModelType, ...]:
+    @classmethod
+    def _bootstrap_model_types(cls) -> tuple[ModelType, ...]:
         """Return the bootstrap models as a tuple."""
         # TODO:
         # legacyUFV
@@ -139,31 +144,40 @@ class ModelType(str, UnknownValuesEnumMixin, enum.Enum):
             ModelType.CHIME,
         )
 
-    @staticmethod
-    @cache
-    def bootstrap_models() -> tuple[str, ...]:
+    @classmethod
+    def _bootstrap_models(cls) -> tuple[str, ...]:
         """Return the bootstrap models strings as a tuple."""
         return tuple(
-            model_type.value for model_type in ModelType.bootstrap_model_types()
+            model_type.value for model_type in ModelType._bootstrap_model_types()
         )
 
-    @staticmethod
-    @cache
-    def bootstrap_models_set() -> set[str]:
+    @classmethod
+    def _bootstrap_models_set(cls) -> set[str]:
         """Return the set of bootstrap models strings as a set."""
-        return set(ModelType.bootstrap_models())
+        return set(ModelType._bootstrap_models())
 
-    @staticmethod
-    @cache
-    def bootstrap_models_types_set() -> set[ModelType]:
+    @classmethod
+    def _bootstrap_models_types_set(cls) -> set[ModelType]:
         """Return the set of bootstrap models as a set."""
-        return set(ModelType.bootstrap_model_types())
+        return set(ModelType._bootstrap_model_types())
 
-    @staticmethod
-    @cache
-    def bootstrap_models_types_and_event_set() -> set[ModelType]:
+    @classmethod
+    def _bootstrap_models_types_and_event_set(cls) -> set[ModelType]:
         """Return the set of bootstrap models and the event model as a set."""
-        return ModelType.bootstrap_models_types_set() | {ModelType.EVENT}
+        return ModelType._bootstrap_models_types_set() | {ModelType.EVENT}
+
+    def _immutable(self, name: str, value: Any) -> None:
+        raise AttributeError("Cannot modify ModelType")
+
+
+ModelType.bootstrap_model_types = ModelType._bootstrap_model_types()
+ModelType.bootstrap_models = ModelType._bootstrap_models()
+ModelType.bootstrap_models_set = ModelType._bootstrap_models_set()
+ModelType.bootstrap_models_types_set = ModelType._bootstrap_models_types_set()
+ModelType.bootstrap_models_types_and_event_set = (
+    ModelType._bootstrap_models_types_and_event_set()
+)
+ModelType.__setattr__ = ModelType._immutable  # type: ignore[method-assign, assignment]
 
 
 @enum.unique

{uiprotect-1.7.2.dist-info → uiprotect-1.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 1.7.2
+Version: 1.9.0
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 License: MIT

{uiprotect-1.7.2.dist-info → uiprotect-1.9.0.dist-info}/RECORD

@@ -14,12 +14,12 @@ uiprotect/cli/nvr.py,sha256=TwxEg2XT8jXAbOqv6gc7KFXELKadeItEDYweSL4_-e8,4260
 uiprotect/cli/sensors.py,sha256=fQtcDJCVxs4VbAqcavgBy2ABiVxAW3GXtna6_XFBp2k,8153
 uiprotect/cli/viewers.py,sha256=2cyrp104ffIvgT0wYGIO0G35QMkEbFe7fSVqLwDXQYQ,2171
 uiprotect/data/__init__.py,sha256=OcfuJl2qXfHcj_mdnrHhzZ5tEIZrw8auziX5IE7dn-I,2938
-uiprotect/data/base.py,sha256=mC-Nsr9xWSy7oshIOxgo5qQCjfYZutFQWIjTY39w2sQ,37909
-uiprotect/data/bootstrap.py,sha256=UxDAo8hz-Rh8XvgfYvUslrWelGFZ5JQ6bnixT4wKJR0,21468
+uiprotect/data/base.py,sha256=apIXKZHL6dbyXTT4C4lkyo4M-Nf_DwsVXoXBL5jcXVo,37574
+uiprotect/data/bootstrap.py,sha256=864mLxum0BmC3lIeKqHTs_Z5ikeJIDaRs4ukaVOilWw,21372
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
 uiprotect/data/devices.py,sha256=Nq3bOko5PFf5LvEBoD4JV8kmbq50laRdh3VHMWX7t-0,111809
 uiprotect/data/nvr.py,sha256=XC4NO1c_Mom-hIpzj9ksKFcgKbHd6ToqWjkgzxJ1PJY,47636
-uiprotect/data/types.py,sha256=-hhrnPZheC81eKIJOIZIGCb-A7jOBqa0zLWsmh9_vFQ,17220
+uiprotect/data/types.py,sha256=8z8jIoMlfDre7Op1JAN45PLZdAE-4i3gDPSo2uymqu4,17996
 uiprotect/data/user.py,sha256=Wb-ZWSwIJbyUbfVuENtUYbuW-uftHNDcoMH85dvEjkw,7071
 uiprotect/data/websocket.py,sha256=WZJVA7EfYuKYMv-9jmvGgMWXKzE9ES25SKv1NQ2eHjc,6281
 uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
@@ -30,8 +30,8 @@ uiprotect/test_util/__init__.py,sha256=d2g7afa0LSdixQ0kjEDYwafDFME_UlW2LzxpamZ2B
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
 uiprotect/utils.py,sha256=6OLY8hNiCzk418PjJJIlFW7jjPzVt1vxBKEzBSqMeTk,18418
 uiprotect/websocket.py,sha256=IzDPyqbzrkOMREvahN-e2zdvVD0VABSCWy6jSoCwOT0,7299
-uiprotect-1.7.2.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-1.7.2.dist-info/METADATA,sha256=yw8NXd8D4F6yKONwFd-HxZaDrAxZ38Q7Nw_kXHn2-6Y,10984
-uiprotect-1.7.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-1.7.2.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-1.7.2.dist-info/RECORD,,
+uiprotect-1.9.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-1.9.0.dist-info/METADATA,sha256=XaM24hta0s3qHiy9AdwqBBSqN9civ3yV8yLZcRynksQ,10984
+uiprotect-1.9.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-1.9.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-1.9.0.dist-info/RECORD,,