uiprotect 1.17.0__tar.gz → 1.18.1__tar.gz

{uiprotect-1.17.0 → uiprotect-1.18.1}/PKG-INFO

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

{uiprotect-1.17.0 → uiprotect-1.18.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "1.17.0"
+version = "1.18.1"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 license = "MIT"

{uiprotect-1.17.0 → uiprotect-1.18.1}/src/uiprotect/data/bootstrap.py

@@ -66,9 +66,34 @@ STATS_KEYS = {
     "lastSeen",
     "recordingSchedules",
 }
+
 IGNORE_DEVICE_KEYS = {"nvrMac", "guid"}
 STATS_AND_IGNORE_DEVICE_KEYS = STATS_KEYS | IGNORE_DEVICE_KEYS
 
+_IGNORE_KEYS_BY_MODEL_TYPE = {
+    #
+    # `lastMotion` from cameras update every 100 milliseconds when a motion event is active
+    # this overrides the behavior to only update `lastMotion` when a new event starts
+    #
+    ModelType.CAMERA: {"lastMotion"},
+    #
+    # `cameraIds` is updated every 10s, but we don't need to process it since bootstrap
+    # is resynced every so often anyways.
+    #
+    ModelType.CHIME: {"cameraIds"},
+}
+
+
+IGNORE_DEVICE_KEYS_BY_MODEL_TYPE = {
+    model_type: IGNORE_DEVICE_KEYS | keys
+    for model_type, keys in _IGNORE_KEYS_BY_MODEL_TYPE.items()
+}
+STATS_AND_IGNORE_DEVICE_KEYS_BY_MODEL_TYPE = {
+    model_type: STATS_AND_IGNORE_DEVICE_KEYS | keys
+    for model_type, keys in _IGNORE_KEYS_BY_MODEL_TYPE.items()
+}
+
+
 CAMERA_EVENT_ATTR_MAP: dict[EventType, tuple[str, str]] = {
     EventType.MOTION: ("last_motion", "last_motion_event_id"),
     EventType.SMART_DETECT: ("last_smart_detect", "last_smart_detect_event_id"),
@@ -453,15 +478,18 @@ class Bootstrap(ProtectBaseObject):
         that was generated internally as a result of an event
         that will expire and result in a state change.
         """
-        remove_keys = (
-            STATS_AND_IGNORE_DEVICE_KEYS if ignore_stats else IGNORE_DEVICE_KEYS
-        )
+        if ignore_stats:
+            remove_keys = STATS_AND_IGNORE_DEVICE_KEYS_BY_MODEL_TYPE.get(
+                model_type, STATS_AND_IGNORE_DEVICE_KEYS
+            )
+        else:
+            remove_keys = IGNORE_DEVICE_KEYS_BY_MODEL_TYPE.get(
+                model_type, IGNORE_DEVICE_KEYS
+            )
+
         for key in remove_keys.intersection(data):
             del data[key]
-        # `last_motion` from cameras update every 100 milliseconds when a motion event is active
-        # this overrides the behavior to only update `last_motion` when a new event starts
-        if model_type is ModelType.CAMERA and "lastMotion" in data:
-            del data["lastMotion"]
+
         # nothing left to process
         if not data and not is_ping_back:
             self._create_stat(packet, None, True)

{uiprotect-1.17.0 → uiprotect-1.18.1}/src/uiprotect/data/devices.py

@@ -474,14 +474,9 @@ class SmartDetectSettings(ProtectBaseObject):
 
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
-        if "objectTypes" in data:
-            data["objectTypes"] = convert_smart_types(data.pop("objectTypes"))
-        if "audioTypes" in data:
-            data["audioTypes"] = convert_smart_audio_types(data.pop("audioTypes"))
-        if "autoTrackingObjectTypes" in data:
-            data["autoTrackingObjectTypes"] = convert_smart_types(
-                data.pop("autoTrackingObjectTypes"),
-            )
+        for key in ("objectTypes", "audioTypes", "autoTrackingObjectTypes"):
+            if key in data:
+                data[key] = convert_smart_types(data[key])
 
         return super().unifi_dict_to_dict(data)
 
@@ -578,22 +573,18 @@ class VideoStats(ProtectBaseObject):
 
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
-        if "recordingStart" in data:
-            data["recordingStart"] = convert_to_datetime(data["recordingStart"])
-        if "recordingEnd" in data:
-            data["recordingEnd"] = convert_to_datetime(data["recordingEnd"])
-        if "recordingStartLQ" in data:
-            data["recordingStartLQ"] = convert_to_datetime(data["recordingStartLQ"])
-        if "recordingEndLQ" in data:
-            data["recordingEndLQ"] = convert_to_datetime(data["recordingEndLQ"])
-        if "timelapseStart" in data:
-            data["timelapseStart"] = convert_to_datetime(data["timelapseStart"])
-        if "timelapseEnd" in data:
-            data["timelapseEnd"] = convert_to_datetime(data["timelapseEnd"])
-        if "timelapseStartLQ" in data:
-            data["timelapseStartLQ"] = convert_to_datetime(data["timelapseStartLQ"])
-        if "timelapseEndLQ" in data:
-            data["timelapseEndLQ"] = convert_to_datetime(data["timelapseEndLQ"])
+        for key in (
+            "recordingStart",
+            "recordingEnd",
+            "recordingStartLQ",
+            "recordingEndLQ",
+            "timelapseStart",
+            "timelapseEnd",
+            "timelapseStartLQ",
+            "timelapseEndLQ",
+        ):
+            if key in data:
+                data[key] = convert_to_datetime(data[key])
 
         return super().unifi_dict_to_dict(data)
 

{uiprotect-1.17.0 → uiprotect-1.18.1}/src/uiprotect/data/websocket.py

@@ -56,6 +56,9 @@ class BaseWSPacketFrame:
     is_deflated: bool = False
     length: int = 0
 
+    def __repr__(self) -> str:
+        return f"<{self.__class__.__name__} header={self.header} data={self.data}>"
+
     def set_data_from_binary(self, data: bytes) -> None:
         self.data = data
         if self.header is not None and self.header.deflated:
@@ -188,6 +191,9 @@ class WSPacket:
     def __init__(self, data: bytes) -> None:
         self._raw = data
 
+    def __repr__(self) -> str:
+        return f"<{self.__class__.__name__} action_frame={self.action_frame} data_frame={self.data_frame}>"
+
     def decode(self) -> None:
         data = self._raw
         self._action_frame = WSRawPacketFrame.from_binary(data)