uiprotect 0.6.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

uiprotect/api.py

@@ -818,23 +818,26 @@ class ProtectApiClient(BaseApiClient):
         return self._bootstrap
 
     def emit_message(self, msg: WSSubscriptionMessage) -> None:
-        if msg.new_obj is not None:
-            _LOGGER.debug(
-                "emitting message: %s:%s:%s:%s",
-                msg.action,
-                msg.new_obj.model,
-                msg.new_obj.id,
-                list(msg.changed_data.keys()),
-            )
-        elif msg.old_obj is not None:
-            _LOGGER.debug(
-                "emitting message: %s:%s:%s",
-                msg.action,
-                msg.old_obj.model,
-                msg.old_obj.id,
-            )
-        else:
-            _LOGGER.debug("emitting message: %s", msg.action)
+        """Emit message to all subscriptions."""
+        if _LOGGER.isEnabledFor(logging.DEBUG):
+            if msg.new_obj is not None:
+                _LOGGER.debug(
+                    "emitting message: %s:%s:%s:%s",
+                    msg.action,
+                    msg.new_obj.model,
+                    msg.new_obj.id,
+                    list(msg.changed_data),
+                )
+            elif msg.old_obj is not None:
+                _LOGGER.debug(
+                    "emitting message: %s:%s:%s",
+                    msg.action,
+                    msg.old_obj.model,
+                    msg.old_obj.id,
+                )
+            else:
+                _LOGGER.debug("emitting message: %s", msg.action)
+
         for sub in self._ws_subscriptions:
             try:
                 sub(msg)

uiprotect/cli/backup.py

@@ -814,7 +814,7 @@ def _add_metadata(path: Path, creation: datetime, title: str) -> bool:
                 in_to_out[stream] = output_file.add_stream(template=stream)  # type: ignore[index]
                 in_to_out[stream].metadata["creation_time"] = creation.isoformat()  # type: ignore[index]
 
-            for packet in input_file.demux(list(in_to_out.keys())):
+            for packet in input_file.demux(list(in_to_out)):
                 if packet.dts is None:
                     continue
 

uiprotect/data/base.py

@@ -56,11 +56,10 @@ if TYPE_CHECKING:
     from ..data.user import User
 
     try:
-        from pydantic.v1.typing import DictStrAny, SetStr
+        from pydantic.v1.typing import DictStrAny
     except ImportError:
         from pydantic.typing import (  # type: ignore[assignment, no-redef]
             DictStrAny,
-            SetStr,
         )
 
 
@@ -88,11 +87,8 @@ class ProtectBaseObject(BaseModel):
     _api: ProtectApiClient | None = PrivateAttr(None)
 
     _protect_objs: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
-    _protect_objs_set: ClassVar[SetStr | None] = None
     _protect_lists: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
-    _protect_lists_set: ClassVar[SetStr | None] = None
     _protect_dicts: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
-    _protect_dicts_set: ClassVar[SetStr | None] = None
     _to_unifi_remaps: ClassVar[DictStrAny | None] = None
 
     class Config:
@@ -192,6 +188,12 @@ class ProtectBaseObject(BaseModel):
         """
         return {}
 
+    @classmethod
+    @cache
+    def _get_unifi_remaps_set(self) -> set[str]:
+        """Helper method to get set of all child UFP objects."""
+        return set(self._get_unifi_remaps())
+
     @classmethod
     def _get_to_unifi_remaps(cls) -> dict[str, str]:
         """
@@ -231,55 +233,49 @@ class ProtectBaseObject(BaseModel):
                 pass
 
     @classmethod
+    @cache
     def _get_protect_objs(cls) -> dict[str, type[ProtectBaseObject]]:
         """Helper method to get all child UFP objects"""
-        if cls._protect_objs is not None:
-            return cls._protect_objs
-
-        cls._set_protect_subtypes()
-        return cls._protect_objs  # type: ignore[return-value]
+        if cls._protect_objs is None:
+            cls._set_protect_subtypes()
+            assert cls._protect_objs is not None
+        return cls._protect_objs
 
     @classmethod
+    @cache
     def _get_protect_objs_set(cls) -> set[str]:
         """Helper method to get all child UFP objects"""
-        if cls._protect_objs_set is None:
-            cls._protect_objs_set = set(cls._get_protect_objs().keys())
-
-        return cls._protect_objs_set
+        return set(cls._get_protect_objs())
 
     @classmethod
+    @cache
     def _get_protect_lists(cls) -> dict[str, type[ProtectBaseObject]]:
         """Helper method to get all child of UFP objects (lists)"""
-        if cls._protect_lists is not None:
-            return cls._protect_lists
-
-        cls._set_protect_subtypes()
-        return cls._protect_lists  # type: ignore[return-value]
+        if cls._protect_lists is None:
+            cls._set_protect_subtypes()
+            assert cls._protect_lists is not None
+        return cls._protect_lists
 
     @classmethod
+    @cache
     def _get_protect_lists_set(cls) -> set[str]:
         """Helper method to get all child UFP objects"""
-        if cls._protect_lists_set is None:
-            cls._protect_lists_set = set(cls._get_protect_lists().keys())
-
-        return cls._protect_lists_set
+        return set(cls._get_protect_lists())
 
     @classmethod
+    @cache
     def _get_protect_dicts(cls) -> dict[str, type[ProtectBaseObject]]:
         """Helper method to get all child of UFP objects (dicts)"""
-        if cls._protect_dicts is not None:
-            return cls._protect_dicts
-
-        cls._set_protect_subtypes()
-        return cls._protect_dicts  # type: ignore[return-value]
+        if cls._protect_dicts is None:
+            cls._set_protect_subtypes()
+            assert cls._protect_dicts is not None
+        return cls._protect_dicts
 
     @classmethod
+    @cache
     def _get_protect_dicts_set(cls) -> set[str]:
         """Helper method to get all child UFP objects"""
-        if cls._protect_dicts_set is None:
-            cls._protect_dicts_set = set(cls._get_protect_dicts().keys())
-
-        return cls._protect_dicts_set
+        return set(cls._get_protect_dicts())
 
     @classmethod
     def _clean_protect_obj(
@@ -338,11 +334,11 @@ class ProtectBaseObject(BaseModel):
 
         # remap keys that will not be converted correctly by snake_case convert
         remaps = cls._get_unifi_remaps()
-        for from_key in set(remaps).intersection(data):
+        for from_key in cls._get_unifi_remaps_set().intersection(data):
             data[remaps[from_key]] = data.pop(from_key)
 
         # convert to snake_case and remove extra fields
-        for key in list(data.keys()):
+        for key in list(data):
             new_key = to_snake_case(key)
             data[new_key] = data.pop(key)
             key = new_key
@@ -769,7 +765,7 @@ class ProtectModelWithId(ProtectModel):
         if updated == {}:
             return
 
-        read_only_keys = read_only_fields.intersection(updated.keys())
+        read_only_keys = read_only_fields.intersection(updated)
         if len(read_only_keys) > 0:
             self.revert_changes(data_before_changes)
             raise BadRequest(

uiprotect/data/devices.py

@@ -1034,7 +1034,7 @@ class Camera(ProtectMotionDeviceModel):
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
         # LCD messages comes back as empty dict {}
-        if "lcdMessage" in data and len(data["lcdMessage"].keys()) == 0:
+        if "lcdMessage" in data and len(data["lcdMessage"]) == 0:
             del data["lcdMessage"]
         if "chimeDuration" in data and not isinstance(data["chimeDuration"], timedelta):
             data["chimeDuration"] = timedelta(milliseconds=data["chimeDuration"])

uiprotect/data/nvr.py

@@ -152,7 +152,7 @@ class EventThumbnailAttributes(ProtectBaseObject):
     ) -> dict[str, Any]:
         data = super().unifi_dict(data=data, exclude=exclude)
 
-        for key in DELETE_KEYS_THUMB.intersection(data.keys()):
+        for key in DELETE_KEYS_THUMB.intersection(data):
             if data[key] is None:
                 del data[key]
 
@@ -240,7 +240,7 @@ class EventMetadata(ProtectBaseObject):
 
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
-        for key in cls._collapse_keys.intersection(data.keys()):
+        for key in cls._collapse_keys.intersection(data):
             if isinstance(data[key], dict):
                 data[key] = data[key]["text"]
 
@@ -258,7 +258,7 @@ class EventMetadata(ProtectBaseObject):
             if value is None:
                 del data[key]
 
-        for key in self._collapse_keys.intersection(data.keys()):
+        for key in self._collapse_keys.intersection(data):
             # AI Theta/Hotplug exception
             if key != "type" or data[key] not in {"audio", "video", "extender"}:
                 data[key] = {"text": data[key]}
@@ -308,7 +308,7 @@ class Event(ProtectModelWithId):
 
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
-        for key in {"start", "end", "timestamp", "deletedAt"}.intersection(data.keys()):
+        for key in {"start", "end", "timestamp", "deletedAt"}.intersection(data):
             data[key] = process_datetime(data, key)
 
         return super().unifi_dict_to_dict(data)
@@ -320,7 +320,7 @@ class Event(ProtectModelWithId):
     ) -> dict[str, Any]:
         data = super().unifi_dict(data=data, exclude=exclude)
 
-        for key in DELETE_KEYS_EVENT.intersection(data.keys()):
+        for key in DELETE_KEYS_EVENT.intersection(data):
             if data[key] is None:
                 del data[key]
 

uiprotect/data/types.py

@@ -50,7 +50,7 @@ class FixSizeOrderedDict(dict[KT, VT]):
         """Set an update up to the max size."""
         dict.__setitem__(self, key, value)
         if self._max_size > 0 and len(self) > 0 and len(self) > self._max_size:
-            del self[next(iter(self.keys()))]
+            del self[next(iter(self))]
 
 
 class ValuesEnumMixin:

uiprotect/utils.py

@@ -278,7 +278,7 @@ def serialize_unifi_obj(value: Any, levels: int = -1) -> Any:
 
 def serialize_dict(data: dict[str, Any], levels: int = -1) -> dict[str, Any]:
     """Serializes UFP data dict"""
-    for key in list(data.keys()):
+    for key in list(data):
         set_key = key
         if set_key not in SNAKE_CASE_KEYS:
             set_key = to_camel_case(set_key)

{uiprotect-0.6.0.dist-info → uiprotect-0.8.0.dist-info}/METADATA

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

{uiprotect-0.6.0.dist-info → uiprotect-0.8.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 uiprotect/__init__.py,sha256=llnQNtiBfwQG8IkQXovvFz4LZeFjrJx7XdmmUhu3a9E,289
 uiprotect/__main__.py,sha256=C_bHCOkv5qj6WMy-6ELoY3Y6HDhLxOa1a30CzmbZhsg,462
-uiprotect/api.py,sha256=1eIAuA4GC32-mpibk-Avd4vU59fT_UgxqjKVP9ISTkY,65943
+uiprotect/api.py,sha256=Ic6Jc4mO4okrGYxdXoHT85fqaNRfhYnoKt9yHUBxx-k,66102
 uiprotect/cli/__init__.py,sha256=sSLW9keVQOkgFcMW18HTDjRrt9sJ0KWjn9DJDA6f9Pc,8658
-uiprotect/cli/backup.py,sha256=SxUyFFwLHcU60qsI8qBS_Xw7RLJeqUEdMAyjwk30MKw,36715
+uiprotect/cli/backup.py,sha256=ZiS7RZnJGKI8TJKLW2cOUzkRM8nyTvE5Ov_jZZGtvSM,36708
 uiprotect/cli/base.py,sha256=zpTm2kyJe_GLixnv3Uadke__iRLh64AEwQzp-2hqS7g,7730
 uiprotect/cli/cameras.py,sha256=YvvMccQEYG3Wih0Ix8tan1R1vfaJ6cogg6YKWLzMUV8,16973
 uiprotect/cli/chimes.py,sha256=XANn21bQVkestkKOm9HjxSM8ZGrRrqvUXLouaQ3LTqs,5326
@@ -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=esEXOzJt2xKOeYASwCcCotjeZLQEPiT08bnGzNv-k8c,37501
+uiprotect/data/base.py,sha256=ex-UC9CJUtzxMFqtYokSiXM8pNHVBqCzq7r8WrEf1Mw,37178
 uiprotect/data/bootstrap.py,sha256=ibfCHqNhH44iw-JsuQs41zBCjb9ksSXz_QQq7qDbLsQ,21876
 uiprotect/data/convert.py,sha256=rOQplUMIdTMD2SbAx_iI9BNPDscnhDvyRVLEMDhtADg,2047
-uiprotect/data/devices.py,sha256=AsCQCoOpswdIU7X5ty1XhhOl2v6CkQCXu2Y-lIS_6_k,111712
-uiprotect/data/nvr.py,sha256=c8WxXpBcMaZ5REzCUb8aqmlLkttFYO1O5jLMhus5rkw,47605
-uiprotect/data/types.py,sha256=MTi9dVzKTp_8XtAmWKtbZujwE5plKGHdjglFGcJ4Yxs,15789
+uiprotect/data/devices.py,sha256=LHVBT8ihMAZen7gIlQNbiYxukRrBpi_TNKNmV_5R6Xc,111705
+uiprotect/data/nvr.py,sha256=OJso6oewA_jY7ovKbD2U2Onp1GqheT5bCW0F6dC53DQ,47570
+uiprotect/data/types.py,sha256=1I5Tu7W0KkS4Y30CuTJJS8jn4KDvDsapVr5ybX7d_zY,15782
 uiprotect/data/user.py,sha256=yBnUQ3qpHL745hLhR41WjWv_Yx51RlmfHapgvK0KSgM,7067
 uiprotect/data/websocket.py,sha256=lkdobRh5SPu7YzLHyhZVe7qlh5W3L8LKzS63Md-4DOk,6048
 uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
@@ -28,10 +28,10 @@ uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,
 uiprotect/stream.py,sha256=McV3XymKyjn-1uV5jdQHcpaDjqLS4zWyMASQ8ubcyb4,4924
 uiprotect/test_util/__init__.py,sha256=d2g7afa0LSdixQ0kjEDYwafDFME_UlW2LzxpamZ2BC0,18556
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
-uiprotect/utils.py,sha256=gCLoZBQ94Yi9PqefiqTZK7WrvT3Byue79a4jvDc0k44,18226
+uiprotect/utils.py,sha256=kXEr1xEoPAwUYuVPd6QoVnTf8MQwzQXQQ4JLyJsiRfY,18219
 uiprotect/websocket.py,sha256=iMTdchymaCgVHsmY1bRbxkcymqt6WQircIHYNxCu178,7289
-uiprotect-0.6.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-0.6.0.dist-info/METADATA,sha256=bWI_c91BlR_JzCp3RhTjbiTUVR-adQJH61fNBqZt5fE,10984
-uiprotect-0.6.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-0.6.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-0.6.0.dist-info/RECORD,,
+uiprotect-0.8.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-0.8.0.dist-info/METADATA,sha256=jPp4COkfIkBfuy1zdZKO1WpfKfJPLuU9bHwT726PoFE,10984
+uiprotect-0.8.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-0.8.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-0.8.0.dist-info/RECORD,,