uiprotect 7.0.0__py3-none-any.whl → 7.0.2__py3-none-any.whl

uiprotect/api.py

@@ -829,21 +829,21 @@ class ProtectApiClient(BaseApiClient):
         async with self._update_lock:
             bootstrap = await self.get_bootstrap()
             if bootstrap.nvr.version >= NFC_FINGERPRINT_SUPPORT_VERSION:
+                try:
+                    keyrings = await self.api_request_list("keyrings")
+                except NotAuthorized as err:
+                    _LOGGER.debug("No access to keyrings %s, skipping", err)
+                    keyrings = []
+                try:
+                    ulp_users = await self.api_request_list("ulp-users")
+                except NotAuthorized as err:
+                    _LOGGER.debug("No access to ulp-users %s, skipping", err)
+                    ulp_users = []
                 bootstrap.keyrings = Keyrings.from_list(
-                    cast(
-                        list[Keyring],
-                        list_from_unifi_list(
-                            self, await self.api_request_list("keyrings")
-                        ),
-                    )
+                    cast(list[Keyring], list_from_unifi_list(self, keyrings))
                 )
                 bootstrap.ulp_users = UlpUsers.from_list(
-                    cast(
-                        list[UlpUser],
-                        list_from_unifi_list(
-                            self, await self.api_request_list("ulp-users")
-                        ),
-                    )
+                    cast(list[UlpUser], list_from_unifi_list(self, ulp_users))
                 )
             self.__dict__.pop("bootstrap", None)
             self._bootstrap = bootstrap

uiprotect/data/base.py

@@ -137,10 +137,12 @@ class ProtectBaseObject(BaseModel):
             data.pop("api", None)
             return cls(api=api, **data)
 
-        return cls.construct(**data)
+        return cls.model_construct(**data)
 
     @classmethod
-    def construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self:
+    def model_construct(
+        cls, _fields_set: set[str] | None = None, **values: Any
+    ) -> Self:
         api: ProtectApiClient | None = values.pop("api", None)
         (
             unifi_objs,
@@ -152,19 +154,21 @@ class ProtectBaseObject(BaseModel):
         ) = cls._get_protect_model()
         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)
+                values[key] = unifi_objs[key].model_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
+                    unifi_lists[key].model_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
+                    k: unifi_dicts[key].model_construct(**v)
+                    if isinstance(v, dict)
+                    else v
                     for k, v in value.items()
                 }
 
-        obj = super().construct(_fields_set=_fields_set, **values)
+        obj = super().model_construct(_fields_set=_fields_set, **values)
         if api is not None:
             obj._api = api
 
@@ -369,7 +373,7 @@ class ProtectBaseObject(BaseModel):
         if isinstance(value, ProtectBaseObject):
             value = value.unifi_dict()
         elif isinstance(value, dict):
-            value = klass.construct({}).unifi_dict(data=value)  # type: ignore[arg-type]
+            value = klass.model_construct({}).unifi_dict(data=value)  # type: ignore[arg-type]
 
         return value
 
@@ -390,7 +394,7 @@ class ProtectBaseObject(BaseModel):
         return [
             item.unifi_dict()
             if isinstance(item, ProtectBaseObject)
-            else klass.construct({}).unifi_dict(data=item)  # type: ignore[arg-type]
+            else klass.model_construct({}).unifi_dict(data=item)  # type: ignore[arg-type]
             for item in value
         ]
 
@@ -587,9 +591,11 @@ class ProtectModelWithId(ProtectModel):
         self._update_sync = update_sync or UpdateSynchronization()
 
     @classmethod
-    def construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self:
+    def model_construct(
+        cls, _fields_set: set[str] | None = None, **values: Any
+    ) -> Self:
         update_sync = values.pop("update_sync", None)
-        obj = super().construct(_fields_set=_fields_set, **values)
+        obj = super().model_construct(_fields_set=_fields_set, **values)
         obj._update_sync = update_sync or UpdateSynchronization()
         return obj
 

uiprotect/data/bootstrap.py

@@ -426,7 +426,7 @@ class Bootstrap(ProtectBaseObject):
             if updated_obj is None:
                 return None
 
-            old_obj = updated_obj.copy()
+            old_obj = updated_obj.model_copy()
             updated_data = {to_snake_case(k): v for k, v in data.items()}
             updated_obj.update_from_dict(updated_data)
 
@@ -461,7 +461,7 @@ class Bootstrap(ProtectBaseObject):
         if not (data := self.nvr.unifi_dict_to_dict(data)):
             return None
 
-        old_nvr = self.nvr.copy()
+        old_nvr = self.nvr.model_copy()
         self.nvr = self.nvr.update_from_dict(data)
 
         return WSSubscriptionMessage(
@@ -517,7 +517,7 @@ class Bootstrap(ProtectBaseObject):
             # nothing left to process
             return None
 
-        old_obj = obj.copy()
+        old_obj = obj.model_copy()
         obj = obj.update_from_dict(data)
 
         if model_type is ModelType.EVENT:

uiprotect/data/user.py

@@ -252,6 +252,9 @@ class UlpUserKeyringBase(Generic[T]):
     def __init__(self) -> None:
         self._id_to_item: dict[str, T] = {}
 
+    def __len__(self) -> int:
+        return len(self._id_to_item)
+
     @classmethod
     def from_list(cls, items: list[T]) -> Self:
         instance = cls()

uiprotect/utils.py

@@ -572,7 +572,7 @@ def local_datetime(dt: datetime | None = None) -> datetime:
 def log_event(event: Event) -> None:
     from uiprotect.data import EventType
 
-    _LOGGER.debug("event WS msg: %s", event.dict())
+    _LOGGER.debug("event WS msg: %s", event.model_dump())
     if "smart" not in event.type.value:
         return
 

{uiprotect-7.0.0.dist-info → uiprotect-7.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 7.0.0
+Version: 7.0.2
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 Author: UI Protect Maintainers

{uiprotect-7.0.0.dist-info → uiprotect-7.0.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 uiprotect/__init__.py,sha256=Oz6i1tonIz4QWVnEPkbielJDJ3WQdwZVgYtjY4IwGAQ,636
 uiprotect/__main__.py,sha256=C_bHCOkv5qj6WMy-6ELoY3Y6HDhLxOa1a30CzmbZhsg,462
 uiprotect/_compat.py,sha256=HThmb1zQZCEssCxYYbQzFhJq8zYYlVaSnIEZabKc-6U,302
-uiprotect/api.py,sha256=pSQ_C2cjtttnFnrVzjmHlqS7zOfMH-bwk4NxbraUCKI,68850
+uiprotect/api.py,sha256=qj6qEKLY3j25kNTL7Jlo-wwreOdmFzcV_MZxkNo7Oeg,69038
 uiprotect/cli/__init__.py,sha256=1MO8rJmjjAsfVx2x01gn5DJo8B64xdPGo6gRVJbWd18,8868
 uiprotect/cli/backup.py,sha256=ZiS7RZnJGKI8TJKLW2cOUzkRM8nyTvE5Ov_jZZGtvSM,36708
 uiprotect/cli/base.py,sha256=GVHQMrI3thQ-4ixJlunTCfEMF90xCnt-bvRPMDupDss,7588
@@ -15,13 +15,13 @@ 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=ggW3Jdzld6Je0827RIqtFQDzVIFXCWxqTPvzSchCcA0,35353
-uiprotect/data/bootstrap.py,sha256=66D4ssZiXIehn3nDRqzDbMO1LE_eJwxy0Ch8ZuhBvio,23233
+uiprotect/data/base.py,sha256=LRqmK60PKeDFgP2k5qpVj93AxEvdfC6kLk0Cqvt1W5k,35481
+uiprotect/data/bootstrap.py,sha256=oWjjWsLg8f_OERG_9h__5exB3qCmwI6KX4khBGZEzoc,23251
 uiprotect/data/convert.py,sha256=CDPkSMxSEhvDigmzmLFKpjrz0oa5FOvOdkNIHZrOZ4Q,2586
 uiprotect/data/devices.py,sha256=Brj9bT9oJPb5jqAY5vc2JhFG6m7DJt8u58qVe-oTw6M,113803
 uiprotect/data/nvr.py,sha256=E18DgE0nXl9VZ_ULotTPcXSi3M1u3mWQsuZbY1gIajs,47490
 uiprotect/data/types.py,sha256=YCRqY5aMSFNX-X-3eqsHnUO5s1ZbPjKc5o2-eH12E34,19086
-uiprotect/data/user.py,sha256=wd0MZPrDftRm2ZuTZHZvSYTmPdzyGMPszwjkbVD2iOA,10458
+uiprotect/data/user.py,sha256=Del5LUmt5uCfAQMI9-kl_GaKm085oTLjxmcCrlEKXxc,10526
 uiprotect/data/websocket.py,sha256=m4EV1Qfh08eKOihy70ycViYgEQpeNSGZQJWdtGIYJDA,6791
 uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
 uiprotect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,10 +29,10 @@ uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,
 uiprotect/stream.py,sha256=MWiTRFIhUfFLPA_csSrKl5-SkUbPZ2VhDu0XW2oVr-U,4800
 uiprotect/test_util/__init__.py,sha256=Ky8mTL61nhp5II2mxTKBAsSGvNqK8U_CfKC5AGwToAI,18704
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
-uiprotect/utils.py,sha256=0q5Y0E_hxMjXqRjdo_TEheMhfLzH3_4okvHJfg6Tj-A,20475
+uiprotect/utils.py,sha256=q2YYQfxr0b3QEWMSP7SdpcJZbB4huEhpo8PbtnTbEFI,20481
 uiprotect/websocket.py,sha256=tEyenqblNXHcjWYuf4oRP1E7buNwx6zoECMwpBr-jig,8191
-uiprotect-7.0.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-7.0.0.dist-info/METADATA,sha256=qjmkFG7U_AqAvBZ-8uYAJfBAe4TPWk0eMpo-iyp2YEc,11142
-uiprotect-7.0.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uiprotect-7.0.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-7.0.0.dist-info/RECORD,,
+uiprotect-7.0.2.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-7.0.2.dist-info/METADATA,sha256=rtp7lvceFYj6ZjMcu6s0RtFwTCZQ4KJrRgbfRr9aUNE,11142
+uiprotect-7.0.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uiprotect-7.0.2.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-7.0.2.dist-info/RECORD,,