uiprotect 1.18.0__py3-none-any.whl → 1.18.1__py3-none-any.whl

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.18.0.dist-info → uiprotect-1.18.1.dist-info}/METADATA

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

{uiprotect-1.18.0.dist-info → uiprotect-1.18.1.dist-info}/RECORD

@@ -15,7 +15,7 @@ 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=q5lpNJ4keAQ4oDjalwg9eL3kaVzEapfwtcTzZZlrN_M,35691
-uiprotect/data/bootstrap.py,sha256=epMt3lRNCp4mu_gkyjV12Ec62snB1FUOP_obVIsWp-w,21723
+uiprotect/data/bootstrap.py,sha256=GnLBsdgkpeT4P_ND_0mWtK-eAQTYs3FbPQ-84_FvByI,22380
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
 uiprotect/data/devices.py,sha256=c32wLGkjP-9IiWSlofKqesMVhsyAtrKwsdzwDsncQS0,110387
 uiprotect/data/nvr.py,sha256=zCEAI-rKLEpp9P63QDvJi0hGRsuv-PWGssgHw1POYeQ,47648
@@ -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=kVRJwvHP683Sjhi2pnxwCwbaRl_uMQ2qFYSvt9kpfoU,18426
 uiprotect/websocket.py,sha256=JHI_2EZeRPqPyQopsBZS0dr3tu0HaTiqeLazfBXhW_8,7339
-uiprotect-1.18.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-1.18.0.dist-info/METADATA,sha256=-XSKOa6e4RDLO-07RvVVy26J7ujyabN9FhC0UqneUa0,10985
-uiprotect-1.18.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-1.18.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-1.18.0.dist-info/RECORD,,
+uiprotect-1.18.1.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-1.18.1.dist-info/METADATA,sha256=YOcBNTMbJa-wwtUfAJ_lP3fIRVIM2FOKfIaAf10sluI,10985
+uiprotect-1.18.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-1.18.1.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-1.18.1.dist-info/RECORD,,