uiprotect 1.5.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

uiprotect/data/base.py

@@ -139,34 +139,25 @@ class ProtectBaseObject(BaseModel):
     @classmethod
     def construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self:
         api: ProtectApiClient | None = values.pop("api", None)
-        values_set = set(values)
-
-        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()
-                    }
+        unifi_objs = cls._get_protect_objs()
+        has_unifi_objs = bool(unifi_objs)
+        unifi_lists = cls._get_protect_lists()
+        has_unifi_lists = bool(unifi_lists)
+        unifi_dicts = cls._get_protect_dicts()
+        has_unifi_dicts = bool(unifi_dicts)
+        for key, value in values.items():
+            if has_unifi_objs and key in unifi_objs and isinstance(value, dict):
+                values[key] = unifi_objs[key].construct(**value)
+            elif has_unifi_lists and key in unifi_lists and isinstance(value, list):
+                values[key] = [
+                    unifi_lists[key].construct(**v) if isinstance(v, dict) else v
+                    for v in value
+                ]
+            elif has_unifi_dicts and key in unifi_dicts and isinstance(value, dict):
+                values[key] = {
+                    k: unifi_dicts[key].construct(**v) if isinstance(v, dict) else v
+                    for k, v in value.items()
+                }
 
         obj = super().construct(_fields_set=_fields_set, **values)
         if api is not None:
@@ -341,16 +332,16 @@ class ProtectBaseObject(BaseModel):
             cls._api if isinstance(cls, ProtectBaseObject) else None
         )
 
-        # remap keys that will not be converted correctly by snake_case convert
-        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)
-
+        remaps = cls._get_unifi_remaps()
         # convert to snake_case and remove extra fields
         _fields = cls.__fields__
         for key in list(data):
+            if key in remaps:
+                # remap keys that will not be converted correctly by snake_case convert
+                remapped_key = remaps[key]
+                data[remapped_key] = data.pop(key)
+                key = remapped_key
+
             new_key = to_snake_case(key)
             data[new_key] = data.pop(key)
             key = new_key
@@ -363,36 +354,23 @@ class ProtectBaseObject(BaseModel):
                 continue
             data[key] = convert_unifi_data(data[key], _fields[key])
 
-        # clean child UFP objs
-        data_set = set(data)
+        if not data:
+            return data
 
-        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)
-
-        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,
-                    )
+        # clean child UFP objs
+        unifi_objs = cls._get_protect_objs()
+        has_unifi_objs = bool(unifi_objs)
+        unifi_lists = cls._get_protect_lists()
+        has_unifi_lists = bool(unifi_lists)
+        unifi_dicts = cls._get_protect_dicts()
+        has_unifi_dicts = bool(unifi_dicts)
+        for key, value in data.items():
+            if has_unifi_objs and key in unifi_objs:
+                data[key] = cls._clean_protect_obj(value, unifi_objs[key], api)
+            elif has_unifi_lists and key in unifi_lists and isinstance(value, list):
+                data[key] = cls._clean_protect_obj_list(value, unifi_lists[key], api)
+            elif has_unifi_dicts and key in unifi_dicts and isinstance(value, dict):
+                data[key] = cls._clean_protect_obj_dict(value, unifi_dicts[key], api)
 
         return data
 
@@ -518,36 +496,27 @@ class ProtectBaseObject(BaseModel):
         api: ProtectApiClient | None,
     ) -> dict[str, Any]:
         data["api"] = api
-        data_set = set(data)
-
-        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
-
-        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]:
+        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
-                    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():
+            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
-                    inner_dict[item_key] = item
 
         return data
 
@@ -776,6 +745,14 @@ class ProtectModelWithId(ProtectModel):
         revert_on_fail: bool = True,
     ) -> None:
         """Saves the current device changes to UFP."""
+        _LOGGER.debug(
+            "Saving device changes for %s (%s) data_before_changes=%s updated=%s",
+            self.id,
+            self.model,
+            data_before_changes,
+            updated,
+        )
+
         assert (
             self._update_lock.locked()
         ), "save_device_changes should only be called when the update lock is held"

uiprotect/data/nvr.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import asyncio
 import logging
 import zoneinfo
+from collections.abc import Callable
 from datetime import datetime, timedelta, tzinfo
 from functools import cache
 from ipaddress import IPv4Address, IPv6Address
@@ -1169,26 +1170,32 @@ class NVR(ProtectDeviceModel):
         if message in self.doorbell_settings.custom_messages:
             raise BadRequest("Custom doorbell message already exists")
 
-        async with self._update_lock:
-            await asyncio.sleep(
-                0,
-            )  # yield to the event loop once we have the look to ensure websocket updates are processed
-            data_before_changes = self.dict_with_excludes()
-            self.doorbell_settings.custom_messages.append(DoorbellText(message))
-            await self.save_device(data_before_changes)
-            self.update_all_messages()
+        await self._update_doorbell_messages(
+            lambda: self.doorbell_settings.custom_messages.append(
+                DoorbellText(message)
+            ),
+        )
 
     async def remove_custom_doorbell_message(self, message: str) -> None:
         """Removes custom doorbell message"""
         if message not in self.doorbell_settings.custom_messages:
             raise BadRequest("Custom doorbell message does not exists")
 
+        await self._update_doorbell_messages(
+            lambda: self.doorbell_settings.custom_messages.remove(
+                DoorbellText(message)
+            ),
+        )
+
+    async def _update_doorbell_messages(
+        self, update_callback: Callable[[], None]
+    ) -> None:
+        """Updates doorbell messages and saves to Protect."""
         async with self._update_lock:
-            await asyncio.sleep(
-                0,
-            )  # yield to the event loop once we have the look to ensure websocket updates are processed
+            # yield to the event loop once we have the lock to ensure websocket updates are processed
+            await asyncio.sleep(0)
             data_before_changes = self.dict_with_excludes()
-            self.doorbell_settings.custom_messages.remove(DoorbellText(message))
+            update_callback()
             await self.save_device(data_before_changes)
             self.update_all_messages()
 

{uiprotect-1.5.0.dist-info → uiprotect-1.7.0.dist-info}/METADATA

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

{uiprotect-1.5.0.dist-info → uiprotect-1.7.0.dist-info}/RECORD

@@ -14,11 +14,11 @@ 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=CidfMMC7GdNCPUK6Mcy2BHYtNF2C_wY3WtdLUip8DCM,38379
+uiprotect/data/base.py,sha256=McmQHwbb-gY2y9IjQ85HVBE6Vo0WkBzcXt6JDw5HijE,37708
 uiprotect/data/bootstrap.py,sha256=INRUEbLWnsEJuzlcoFlm7RAT-WPx6odje3aD092QKGo,21465
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
 uiprotect/data/devices.py,sha256=Nq3bOko5PFf5LvEBoD4JV8kmbq50laRdh3VHMWX7t-0,111809
-uiprotect/data/nvr.py,sha256=jwJEl4o2kbvoYFB9wSJPghNj0905847-86ElT51nNs0,47580
+uiprotect/data/nvr.py,sha256=XC4NO1c_Mom-hIpzj9ksKFcgKbHd6ToqWjkgzxJ1PJY,47636
 uiprotect/data/types.py,sha256=-hhrnPZheC81eKIJOIZIGCb-A7jOBqa0zLWsmh9_vFQ,17220
 uiprotect/data/user.py,sha256=Wb-ZWSwIJbyUbfVuENtUYbuW-uftHNDcoMH85dvEjkw,7071
 uiprotect/data/websocket.py,sha256=WZJVA7EfYuKYMv-9jmvGgMWXKzE9ES25SKv1NQ2eHjc,6281
@@ -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.5.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-1.5.0.dist-info/METADATA,sha256=sRZeCoyCRuBH87vpfwPn4nP_TeRo8CVp0dx2nnS9CEU,10984
-uiprotect-1.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-1.5.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-1.5.0.dist-info/RECORD,,
+uiprotect-1.7.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-1.7.0.dist-info/METADATA,sha256=vzHyVx6DDhJCUu03RWBahUFumcx854dPYB_SQMwGztk,10984
+uiprotect-1.7.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-1.7.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-1.7.0.dist-info/RECORD,,