uiprotect 1.0.1__py3-none-any.whl → 1.2.0__py3-none-any.whl

uiprotect/data/base.py

@@ -141,26 +141,32 @@ class ProtectBaseObject(BaseModel):
         api: ProtectApiClient | None = values.pop("api", None)
         values_set = set(values)
 
-        unifi_objs = cls._get_protect_objs()
-        for key in cls._get_protect_objs_set().intersection(values_set):
-            if isinstance(values[key], dict):
-                values[key] = unifi_objs[key].construct(**values[key])
-
-        unifi_lists = cls._get_protect_lists()
-        for key in cls._get_protect_lists_set().intersection(values_set):
-            if isinstance(values[key], list):
-                values[key] = [
-                    unifi_lists[key].construct(**v) if isinstance(v, dict) else v
-                    for v in values[key]
-                ]
-
-        unifi_dicts = cls._get_protect_dicts()
-        for key in cls._get_protect_dicts_set().intersection(values_set):
-            if isinstance(values[key], dict):
-                values[key] = {
-                    k: unifi_dicts[key].construct(**v) if isinstance(v, dict) else v
-                    for k, v in values[key].items()
-                }
+        if (unifi_objs := cls._get_protect_objs()) and (
+            intersections := cls._get_protect_objs_set().intersection(values_set)
+        ):
+            for key in intersections:
+                if isinstance(values[key], dict):
+                    values[key] = unifi_objs[key].construct(**values[key])
+
+        if (unifi_lists := cls._get_protect_lists()) and (
+            intersections := cls._get_protect_lists_set().intersection(values_set)
+        ):
+            for key in intersections:
+                if isinstance(values[key], list):
+                    values[key] = [
+                        unifi_lists[key].construct(**v) if isinstance(v, dict) else v
+                        for v in values[key]
+                    ]
+
+        if (unifi_dicts := cls._get_protect_dicts()) and (
+            intersections := cls._get_protect_dicts_set().intersection(values_set)
+        ):
+            for key in intersections:
+                if isinstance(values[key], dict):
+                    values[key] = {
+                        k: unifi_dicts[key].construct(**v) if isinstance(v, dict) else v
+                        for k, v in values[key].items()
+                    }
 
         obj = super().construct(_fields_set=_fields_set, **values)
         if api is not None:
@@ -336,11 +342,14 @@ class ProtectBaseObject(BaseModel):
         )
 
         # remap keys that will not be converted correctly by snake_case convert
-        remaps = cls._get_unifi_remaps()
-        for from_key in cls._get_unifi_remaps_set().intersection(data):
-            data[remaps[from_key]] = data.pop(from_key)
+        if (remaps := cls._get_unifi_remaps()) and (
+            intersections := cls._get_unifi_remaps_set().intersection(data)
+        ):
+            for from_key in intersections:
+                data[remaps[from_key]] = data.pop(from_key)
 
         # convert to snake_case and remove extra fields
+        _fields = cls.__fields__
         for key in list(data):
             new_key = to_snake_case(key)
             data[new_key] = data.pop(key)
@@ -349,35 +358,41 @@ class ProtectBaseObject(BaseModel):
             if key == "api":
                 continue
 
-            if key not in cls.__fields__:
+            if key not in _fields:
                 del data[key]
                 continue
-            data[key] = convert_unifi_data(data[key], cls.__fields__[key])
+            data[key] = convert_unifi_data(data[key], _fields[key])
 
         # clean child UFP objs
         data_set = set(data)
 
-        unifi_objs = cls._get_protect_objs()
-        for key in cls._get_protect_objs_set().intersection(data_set):
-            data[key] = cls._clean_protect_obj(data[key], unifi_objs[key], api)
-
-        unifi_lists = cls._get_protect_lists()
-        for key in cls._get_protect_lists_set().intersection(data_set):
-            if isinstance(data[key], list):
-                data[key] = cls._clean_protect_obj_list(
-                    data[key],
-                    unifi_lists[key],
-                    api,
-                )
+        if (unifi_objs := cls._get_protect_objs()) and (
+            intersections := cls._get_protect_objs_set().intersection(data_set)
+        ):
+            for key in intersections:
+                data[key] = cls._clean_protect_obj(data[key], unifi_objs[key], api)
 
-        unifi_dicts = cls._get_protect_dicts()
-        for key in cls._get_protect_dicts_set().intersection(data_set):
-            if isinstance(data[key], dict):
-                data[key] = cls._clean_protect_obj_dict(
-                    data[key],
-                    unifi_dicts[key],
-                    api,
-                )
+        if (unifi_lists := cls._get_protect_lists()) and (
+            intersections := cls._get_protect_lists_set().intersection(data_set)
+        ):
+            for key in intersections:
+                if isinstance(data[key], list):
+                    data[key] = cls._clean_protect_obj_list(
+                        data[key],
+                        unifi_lists[key],
+                        api,
+                    )
+
+        if (unifi_dicts := cls._get_protect_dicts()) and (
+            intersections := cls._get_protect_dicts_set().intersection(data_set)
+        ):
+            for key in intersections:
+                if isinstance(data[key], dict):
+                    data[key] = cls._clean_protect_obj_dict(
+                        data[key],
+                        unifi_dicts[key],
+                        api,
+                    )
 
         return data
 
@@ -505,24 +520,34 @@ class ProtectBaseObject(BaseModel):
         data["api"] = api
         data_set = set(data)
 
-        for key in self._get_protect_objs_set().intersection(data_set):
-            unifi_obj: Any | None = getattr(self, key)
-            if unifi_obj is not None and isinstance(unifi_obj, dict):
-                unifi_obj["api"] = api
+        if (unifi_objs_sets := self._get_protect_objs_set()) and (
+            intersections := unifi_objs_sets.intersection(data_set)
+        ):
+            for key in intersections:
+                unifi_obj: Any | None = getattr(self, key)
+                if unifi_obj is not None and isinstance(unifi_obj, dict):
+                    unifi_obj["api"] = api
 
-        for key in self._get_protect_lists_set().intersection(data_set):
-            new_items = []
-            for item in data[key]:
-                if isinstance(item, dict):
-                    item["api"] = api
-                new_items.append(item)
-            data[key] = new_items
-
-        for key in self._get_protect_dicts_set().intersection(data_set):
-            for item_key, item in data[key].items():
-                if isinstance(item, dict):
-                    item["api"] = api
-                data[key][item_key] = item
+        if (unifi_lists_sets := self._get_protect_lists_set()) and (
+            intersections := unifi_lists_sets.intersection(data_set)
+        ):
+            for key in intersections:
+                new_items = []
+                for item in data[key]:
+                    if isinstance(item, dict):
+                        item["api"] = api
+                    new_items.append(item)
+                data[key] = new_items
+
+        if (unifi_dicts_sets := self._get_protect_dicts_set()) and (
+            intersections := unifi_dicts_sets.intersection(data_set)
+        ):
+            for key in intersections:
+                inner_dict: dict[str, Any] = data[key]
+                for item_key, item in inner_dict.items():
+                    if isinstance(item, dict):
+                        item["api"] = api
+                    inner_dict[item_key] = item
 
         return data
 

uiprotect/data/bootstrap.py

@@ -22,6 +22,7 @@ from ..utils import normalize_mac, utc_now
 from .base import (
     RECENT_EVENT_MAX,
     ProtectBaseObject,
+    ProtectDeviceModel,
     ProtectModel,
     ProtectModelWithId,
 )
@@ -65,6 +66,7 @@ STATS_KEYS = {
     "recordingSchedules",
 }
 IGNORE_DEVICE_KEYS = {"nvrMac", "guid"}
+STATS_AND_IGNORE_DEVICE_KEYS = STATS_KEYS | IGNORE_DEVICE_KEYS
 
 CAMERA_EVENT_ATTR_MAP: dict[EventType, tuple[str, str]] = {
     EventType.MOTION: ("last_motion", "last_motion_event_id"),
@@ -78,56 +80,36 @@ CAMERA_EVENT_ATTR_MAP: dict[EventType, tuple[str, str]] = {
 }
 
 
-def _remove_stats_keys(data: dict[str, Any]) -> None:
-    for key in STATS_KEYS.intersection(data):
-        del data[key]
-
-
 def _process_light_event(event: Event) -> None:
     if event.light is None:
         return
 
-    dt = event.light.last_motion
-    if dt is None or event.start >= dt or (event.end is not None and event.end >= dt):
+    if _event_is_in_range(event, event.light.last_motion):
         event.light.last_motion_event_id = event.id
 
 
+def _event_is_in_range(event: Event, dt: datetime | None) -> bool:
+    """Check if event is in range of datetime."""
+    return (
+        dt is None or event.start >= dt or (event.end is not None and event.end >= dt)
+    )
+
+
 def _process_sensor_event(event: Event) -> None:
     if event.sensor is None:
         return
-
-    if event.type == EventType.MOTION_SENSOR:
-        dt = event.sensor.motion_detected_at
-        if (
-            dt is None
-            or event.start >= dt
-            or (event.end is not None and event.end >= dt)
-        ):
+    if event.type is EventType.MOTION_SENSOR:
+        if _event_is_in_range(event, event.sensor.motion_detected_at):
             event.sensor.last_motion_event_id = event.id
     elif event.type in {EventType.SENSOR_CLOSED, EventType.SENSOR_OPENED}:
-        dt = event.sensor.open_status_changed_at
-        if (
-            dt is None
-            or event.start >= dt
-            or (event.end is not None and event.end >= dt)
-        ):
+        if _event_is_in_range(event, event.sensor.open_status_changed_at):
             event.sensor.last_contact_event_id = event.id
-    elif event.type == EventType.SENSOR_EXTREME_VALUE:
-        dt = event.sensor.extreme_value_detected_at
-        if (
-            dt is None
-            or event.start >= dt
-            or (event.end is not None and event.end >= dt)
-        ):
+    elif event.type is EventType.SENSOR_EXTREME_VALUE:
+        if _event_is_in_range(event, event.sensor.extreme_value_detected_at):
             event.sensor.extreme_value_detected_at = event.end
             event.sensor.last_value_event_id = event.id
-    elif event.type == EventType.SENSOR_ALARM:
-        dt = event.sensor.alarm_triggered_at
-        if (
-            dt is None
-            or event.start >= dt
-            or (event.end is not None and event.end >= dt)
-        ):
+    elif event.type is EventType.SENSOR_ALARM:
+        if _event_is_in_range(event, event.sensor.alarm_triggered_at):
             event.sensor.last_value_event_id = event.id
 
 
@@ -144,21 +126,25 @@ def _process_camera_event(event: Event) -> None:
 
     event_type = event.type
     dt_attr, event_attr = CAMERA_EVENT_ATTR_MAP[event_type]
-    dt = getattr(camera, dt_attr)
-    if dt is None or event.start >= dt or (event.end is not None and event.end >= dt):
-        setattr(camera, event_attr, event.id)
-        setattr(camera, dt_attr, event.start)
-        if event_type in _CAMERA_SMART_AND_LINE_EVENTS:
-            for smart_type in event.smart_detect_types:
-                camera.last_smart_detect_event_ids[smart_type] = event.id
-                camera.last_smart_detects[smart_type] = event.start
-        elif event_type is _CAMERA_SMART_AUDIO_EVENT:
-            for smart_type in event.smart_detect_types:
-                audio_type = smart_type.audio_type
-                if audio_type is None:
-                    continue
-                camera.last_smart_audio_detect_event_ids[audio_type] = event.id
-                camera.last_smart_audio_detects[audio_type] = event.start
+    dt: datetime | None = getattr(camera, dt_attr)
+    if not _event_is_in_range(event, dt):
+        return
+
+    event_id = event.id
+    event_start = event.start
+
+    setattr(camera, event_attr, event_id)
+    setattr(camera, dt_attr, event_start)
+    if event_type in _CAMERA_SMART_AND_LINE_EVENTS:
+        for smart_type in event.smart_detect_types:
+            camera.last_smart_detect_event_ids[smart_type] = event_id
+            camera.last_smart_detects[smart_type] = event_start
+    elif event_type is _CAMERA_SMART_AUDIO_EVENT:
+        for smart_type in event.smart_detect_types:
+            if (audio_type := smart_type.audio_type) is None:
+                continue
+            camera.last_smart_audio_detect_event_ids[audio_type] = event_id
+            camera.last_smart_audio_detects[audio_type] = event_start
 
 
 @dataclass
@@ -324,7 +310,7 @@ class Bootstrap(ProtectBaseObject):
         if ref is None:
             return None
 
-        devices = getattr(self, f"{ref.model.value}s")
+        devices: dict[str, ProtectModelWithId] = getattr(self, f"{ref.model.value}s")
         return cast(ProtectAdoptableDeviceModel, devices.get(ref.id))
 
     def get_device_from_id(self, device_id: str) -> ProtectAdoptableDeviceModel | None:
@@ -332,7 +318,7 @@ class Bootstrap(ProtectBaseObject):
         ref = self.id_lookup.get(device_id)
         if ref is None:
             return None
-        devices = getattr(self, f"{ref.model.value}s")
+        devices: dict[str, ProtectModelWithId] = getattr(self, f"{ref.model.value}s")
         return cast(ProtectAdoptableDeviceModel, devices.get(ref.id))
 
     def process_event(self, event: Event) -> None:
@@ -363,14 +349,6 @@ class Bootstrap(ProtectBaseObject):
                 ),
             )
 
-    def _get_frame_data(
-        self,
-        packet: WSPacket,
-    ) -> tuple[dict[str, Any], dict[str, Any] | None]:
-        if self.capture_ws_stats:
-            return deepcopy(packet.action_frame.data), deepcopy(packet.data_frame.data)
-        return packet.action_frame.data, packet.data_frame.data
-
     def _process_add_packet(
         self,
         packet: WSPacket,
@@ -412,7 +390,7 @@ class Bootstrap(ProtectBaseObject):
 
     def _process_remove_packet(self, packet: WSPacket) -> WSSubscriptionMessage | None:
         model: str | None = packet.action_frame.data.get("modelKey")
-        devices = getattr(self, f"{model}s", None)
+        devices: dict[str, ProtectDeviceModel] | None = getattr(self, f"{model}s", None)
 
         if devices is None:
             return None
@@ -439,7 +417,8 @@ class Bootstrap(ProtectBaseObject):
         ignore_stats: bool,
     ) -> WSSubscriptionMessage | None:
         if ignore_stats:
-            _remove_stats_keys(data)
+            for key in STATS_KEYS.intersection(data):
+                del data[key]
         # nothing left to process
         if not data:
             self._create_stat(packet, None, True)
@@ -477,9 +456,10 @@ class Bootstrap(ProtectBaseObject):
         ignore_stats: bool,
     ) -> WSSubscriptionMessage | None:
         model_type = action["modelKey"]
-        if ignore_stats:
-            _remove_stats_keys(data)
-        for key in IGNORE_DEVICE_KEYS.intersection(data):
+        remove_keys = (
+            STATS_AND_IGNORE_DEVICE_KEYS if ignore_stats else 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
@@ -491,12 +471,12 @@ class Bootstrap(ProtectBaseObject):
             return None
 
         key = f"{model_type}s"
-        devices = getattr(self, key)
+        devices: dict[str, ProtectModelWithId] = getattr(self, key)
         action_id: str = action["id"]
         if action_id in devices:
             if action_id not in devices:
                 raise ValueError(f"Unknown device update for {model_type}: {action_id}")
-            obj: ProtectModelWithId = devices[action_id]
+            obj = devices[action_id]
             data = obj.unifi_dict_to_dict(data)
             old_obj = obj.copy()
             obj = obj.update_from_dict(deepcopy(data))
@@ -542,7 +522,12 @@ class Bootstrap(ProtectBaseObject):
         ignore_stats: bool = False,
     ) -> WSSubscriptionMessage | None:
         """Process a WS packet."""
-        action, data = self._get_frame_data(packet)
+        action = packet.action_frame.data
+        data = packet.data_frame.data
+        if self.capture_ws_stats:
+            action = deepcopy(action)
+            data = deepcopy(data)
+
         new_update_id: str = action["newUpdateId"]
         if new_update_id is not None:
             self.last_update_id = new_update_id
@@ -629,7 +614,9 @@ class Bootstrap(ProtectBaseObject):
         if isinstance(device, NVR):
             self.nvr = device
         else:
-            devices = getattr(self, f"{model_type.value}s")
+            devices: dict[str, ProtectModelWithId] = getattr(
+                self, f"{model_type.value}s"
+            )
             devices[device.id] = device
         _LOGGER.debug("Successfully refresh model: %s %s", model_type, device_id)
 

{uiprotect-1.0.1.dist-info → uiprotect-1.2.0.dist-info}/METADATA

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

{uiprotect-1.0.1.dist-info → uiprotect-1.2.0.dist-info}/RECORD

@@ -14,8 +14,8 @@ 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=p75RcPjVTmHEk6BVWApougBC2RBwUdFq8x_gL4zr8xc,37313
-uiprotect/data/bootstrap.py,sha256=lxijgYGOEhGzbgnBaJdmCJcmzEKIJnGbIBx_LQzNEMU,21547
+uiprotect/data/base.py,sha256=kkPrRhvJV7igGyB3wv1fDvWH26Xzlbz94BjJkDiTvU4,38375
+uiprotect/data/bootstrap.py,sha256=NH4jSEm44M0aijmViLHip2PKhVchuZJEeqWI3bcZwq0,21285
 uiprotect/data/convert.py,sha256=rOQplUMIdTMD2SbAx_iI9BNPDscnhDvyRVLEMDhtADg,2047
 uiprotect/data/devices.py,sha256=Nq3bOko5PFf5LvEBoD4JV8kmbq50laRdh3VHMWX7t-0,111809
 uiprotect/data/nvr.py,sha256=aIi4d0KCJ55r1EP-33sBhvEa8lx-41jDGrDpAq5VnOE,47598
@@ -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.0.1.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-1.0.1.dist-info/METADATA,sha256=Fuv9_e3d1EdTq9JNQSCU2qTWAuBogazwWwdphvEHtZg,10984
-uiprotect-1.0.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-1.0.1.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-1.0.1.dist-info/RECORD,,
+uiprotect-1.2.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-1.2.0.dist-info/METADATA,sha256=N0K6ocu5Xe5y1qvGrBIqu00xfu0ZseOmTMTXccG3cnQ,10984
+uiprotect-1.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-1.2.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-1.2.0.dist-info/RECORD,,