uiprotect 1.13.0__tar.gz → 1.15.0__tar.gz

{uiprotect-1.13.0 → uiprotect-1.15.0}/PKG-INFO

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

{uiprotect-1.13.0 → uiprotect-1.15.0}/pyproject.toml

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

{uiprotect-1.13.0 → uiprotect-1.15.0}/src/uiprotect/data/base.py

@@ -485,68 +485,44 @@ class ProtectBaseObject(BaseModel):
 
         return new_data
 
-    def _inject_api(
-        self,
-        data: dict[str, Any],
-        api: ProtectApiClient | None,
-    ) -> dict[str, Any]:
-        data["api"] = api
-        unifi_objs_sets = self._get_protect_objs_set()
-        has_unifi_objs = bool(unifi_objs_sets)
-        unifi_lists_sets = self._get_protect_lists_set()
-        has_unifi_lists = bool(unifi_lists_sets)
-        unifi_dicts_sets = self._get_protect_dicts_set()
-        has_unifi_dicts = bool(unifi_dicts_sets)
-        for key, value in data.items():
-            if has_unifi_objs and key in unifi_objs_sets and isinstance(value, dict):
-                value["api"] = api
-            elif (
-                has_unifi_lists and key in unifi_lists_sets and isinstance(value, list)
-            ):
-                for item in value:
-                    if isinstance(item, dict):
-                        item["api"] = api
-            elif (
-                has_unifi_dicts and key in unifi_dicts_sets and isinstance(value, dict)
-            ):
-                for item in value.values():
-                    if isinstance(item, dict):
-                        item["api"] = api
+    def update_from_dict(cls: ProtectObject, data: dict[str, Any]) -> ProtectObject:
+        """
+        Updates current object from a cleaned UFP JSON dict.
 
-        return data
+        The api client is injected into each dict for any child
+        UFP objects that are detected.
+        """
+        unifi_objs = cls._get_protect_objs()
+        has_unifi_objs = bool(unifi_objs)
+        unifi_lists = cls._get_protect_lists()
+        has_unifi_lists = bool(unifi_lists)
 
-    def update_from_dict(self: ProtectObject, data: dict[str, Any]) -> ProtectObject:
-        """Updates current object from a cleaned UFP JSON dict"""
-        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, ProtectBaseObject):
-                item = data.pop(key)
-                if item is not None:
-                    item = unifi_obj.update_from_dict(item)
-                setattr(self, key, item)
-
-        data = self._inject_api(data, self._api)
-        unifi_lists = self._get_protect_lists()
-        for key in self._get_protect_lists_set().intersection(data_set):
-            if not isinstance(data[key], list):
-                continue
-            klass = unifi_lists[key]
-            new_items = []
-            for item in data.pop(key):
-                if item is not None and isinstance(item, ProtectBaseObject):
-                    new_items.append(item)
-                elif isinstance(item, dict):
-                    new_items.append(klass(**item))
-            setattr(self, key, new_items)
-
-        # Always injected above
-        del data["api"]
-
-        for key in data:
-            setattr(self, key, convert_unifi_data(data[key], self.__fields__[key]))
-
-        return self
+        api = cls._api
+        _fields = cls.__fields__
+        unifi_obj: ProtectBaseObject | None
+        if "api" in data:
+            del data["api"]
+        value: Any
+
+        for key, item in data.items():
+            if has_unifi_objs and key in unifi_objs and isinstance(item, dict):
+                if (unifi_obj := getattr(cls, key)) is not None:
+                    value = unifi_obj.update_from_dict(item)
+                else:
+                    value = None
+            elif has_unifi_lists and key in unifi_lists and isinstance(item, list):
+                klass = unifi_lists[key]
+                value = [
+                    klass(**i, api=api) if isinstance(i, dict) else i
+                    for i in item
+                    if i is not None and isinstance(i, (dict, ProtectBaseObject))
+                ]
+            else:
+                value = convert_unifi_data(item, _fields[key])
+
+            setattr(cls, key, value)
+
+        return cls
 
     def dict_with_excludes(self) -> dict[str, Any]:
         """Returns a dict of the current object without any UFP objects converted to dicts."""

{uiprotect-1.13.0 → uiprotect-1.15.0}/src/uiprotect/data/bootstrap.py

@@ -9,7 +9,7 @@ from copy import deepcopy
 from dataclasses import dataclass
 from datetime import datetime
 from functools import cache
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any
 
 from aiohttp.client_exceptions import ServerDisconnectedError
 
@@ -298,20 +298,20 @@ class Bootstrap(ProtectBaseObject):
 
     def get_device_from_mac(self, mac: str) -> ProtectAdoptableDeviceModel | None:
         """Retrieve a device from MAC address."""
-        ref = self.mac_lookup.get(normalize_mac(mac))
-        if ref is None:
-            return None
-
-        devices: dict[str, ProtectModelWithId] = getattr(self, ref.model.devices_key)
-        return cast(ProtectAdoptableDeviceModel, devices.get(ref.id))
+        return self._get_device_from_ref(self.mac_lookup.get(normalize_mac(mac)))
 
     def get_device_from_id(self, device_id: str) -> ProtectAdoptableDeviceModel | None:
         """Retrieve a device from device ID (without knowing model type)."""
-        ref = self.id_lookup.get(device_id)
+        return self._get_device_from_ref(self.id_lookup.get(device_id))
+
+    def _get_device_from_ref(
+        self, ref: ProtectDeviceRef | None
+    ) -> ProtectAdoptableDeviceModel | None:
         if ref is None:
             return None
-        devices: dict[str, ProtectModelWithId] = getattr(self, ref.model.devices_key)
-        return cast(ProtectAdoptableDeviceModel, devices.get(ref.id))
+        devices_key = ref.model.devices_key
+        devices: dict[str, ProtectAdoptableDeviceModel] = getattr(self, devices_key)
+        return devices[ref.id]
 
     def process_event(self, event: Event) -> None:
         event_type = event.type
@@ -386,9 +386,8 @@ class Bootstrap(ProtectBaseObject):
     def _process_remove_packet(
         self, model_type: ModelType, packet: WSPacket
     ) -> WSSubscriptionMessage | None:
-        devices: dict[str, ProtectDeviceModel] | None = getattr(
-            self, model_type.devices_key, None
-        )
+        devices_key = model_type.devices_key
+        devices: dict[str, ProtectDeviceModel] | None = getattr(self, devices_key, None)
 
         if devices is None:
             return None
@@ -615,9 +614,8 @@ class Bootstrap(ProtectBaseObject):
         if isinstance(device, NVR):
             self.nvr = device
         else:
-            devices: dict[str, ProtectModelWithId] = getattr(
-                self, model_type.devices_key
-            )
+            devices_key = model_type.devices_key
+            devices: dict[str, ProtectModelWithId] = getattr(self, devices_key)
             devices[device.id] = device
         _LOGGER.debug("Successfully refresh model: %s %s", model_type, device_id)