uiprotect 1.1.0__py3-none-any.whl → 1.2.1__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/nvr.py

@@ -1198,16 +1198,15 @@ class NVR(ProtectDeviceModel):
 
     async def _read_cache_file(self, file_path: Path) -> set[Version] | None:
         versions: set[Version] | None = None
-
-        if file_path.is_file():
-            try:
-                _LOGGER.debug("Reading release cache file: %s", file_path)
-                async with aiofiles.open(file_path, "rb") as cache_file:
-                    versions = {
-                        Version(v) for v in orjson.loads(await cache_file.read())
-                    }
-            except Exception:
-                _LOGGER.warning("Failed to parse cache file: %s", file_path)
+        try:
+            _LOGGER.debug("Reading release cache file: %s", file_path)
+            async with aiofiles.open(file_path, "rb") as cache_file:
+                versions = {Version(v) for v in orjson.loads(await cache_file.read())}
+        except FileNotFoundError:
+            # ignore missing file
+            pass
+        except Exception:
+            _LOGGER.warning("Failed to parse cache file: %s", file_path)
 
         return versions
 

{uiprotect-1.1.0.dist-info → uiprotect-1.2.1.dist-info}/METADATA

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

{uiprotect-1.1.0.dist-info → uiprotect-1.2.1.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=p75RcPjVTmHEk6BVWApougBC2RBwUdFq8x_gL4zr8xc,37313
+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
+uiprotect/data/nvr.py,sha256=jwJEl4o2kbvoYFB9wSJPghNj0905847-86ElT51nNs0,47580
 uiprotect/data/types.py,sha256=6Z5ZqWTbH4Igy0l4QJShqQZ_zvrJKD0G-hZLjoBNP-U,16193
 uiprotect/data/user.py,sha256=Y7DnnxwUOJRJYw5FntztAtwN-o-Fs48SNS3mHi4Y5To,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.1.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-1.1.0.dist-info/METADATA,sha256=--s4fFpQ0KbuDx6VYuPnkko1w4_f2hRpGR-IJOvZrt4,10984
-uiprotect-1.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-1.1.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-1.1.0.dist-info/RECORD,,
+uiprotect-1.2.1.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-1.2.1.dist-info/METADATA,sha256=_aAWqaI4jL6xC1WCho7ucWk62VDpwc_O5C4ImBcNZv0,10984
+uiprotect-1.2.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-1.2.1.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-1.2.1.dist-info/RECORD,,