uiprotect 1.12.1__py3-none-any.whl → 1.14.0__py3-none-any.whl

uiprotect/api.py

@@ -228,6 +228,7 @@ class BaseApiClient:
 
     @property
     def ws_url(self) -> str:
+        """Get Websocket URL."""
         url = f"wss://{self._host}"
         if self._port != 443:
             url += f":{self._port}"
@@ -267,7 +268,7 @@ class BaseApiClient:
 
         if self._websocket is None:
             self._websocket = Websocket(
-                self.ws_url,
+                self.get_websocket_url,
                 _auth,
                 verify=self._verify_ssl,
                 timeout=self._ws_timeout,
@@ -626,9 +627,6 @@ class BaseApiClient:
             self._websocket = None
 
         websocket = await self.get_websocket()
-        # important to make sure WS URL is always current
-        websocket.url = self.ws_url
-
         if not websocket.is_connected:
             self._last_ws_status = False
             with contextlib.suppress(
@@ -638,6 +636,10 @@ class BaseApiClient:
             ):
                 await websocket.connect()
 
+    def get_websocket_url(self) -> str:
+        """Get Websocket URL."""
+        return self.ws_url
+
     async def async_disconnect_ws(self) -> None:
         """Disconnect from Websocket."""
         if self._websocket is None:
@@ -861,10 +863,6 @@ class ProtectApiClient(BaseApiClient):
             models=self._subscribed_models,
             ignore_stats=self._ignore_stats,
         )
-        # update websocket URL after every message to ensure the latest last_update_id
-        if self._websocket is not None:
-            self._websocket.url = self.ws_url
-
         if processed_message is None:
             return
 

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/websocket.py

@@ -45,7 +45,7 @@ class Websocket:
 
     def __init__(
         self,
-        url: str,
+        get_url: Callable[[], str],
         auth_callback: CALLBACK_TYPE,
         *,
         timeout: int = 30,
@@ -53,7 +53,7 @@ class Websocket:
         verify: bool = True,
     ) -> None:
         """Init Websocket."""
-        self.url = url
+        self.get_url = get_url
         self.timeout_interval = timeout
         self.backoff = backoff
         self.verify = verify
@@ -85,14 +85,15 @@ class Websocket:
         return True
 
     async def _websocket_loop(self, start_event: asyncio.Event) -> None:
-        _LOGGER.debug("Connecting WS to %s", self.url)
+        url = self.get_url()
+        _LOGGER.debug("Connecting WS to %s", url)
         self._headers = await self._auth(self._should_reset_auth)
 
         session = self._get_session()
         # catch any and all errors for Websocket so we can clean up correctly
         try:
             self._ws_connection = await session.ws_connect(
-                self.url,
+                url,
                 ssl=None if self.verify else False,
                 headers=self._headers,
             )
@@ -104,7 +105,7 @@ class Websocket:
                     break
                 self._reset_timeout()
         except ClientError:
-            _LOGGER.exception("Websocket disconnect error: %s", self.url)
+            _LOGGER.exception("Websocket disconnect error: %s", url)
         finally:
             _LOGGER.debug("Websocket disconnected")
             self._increase_failure()

{uiprotect-1.12.1.dist-info → uiprotect-1.14.0.dist-info}/METADATA

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

{uiprotect-1.12.1.dist-info → uiprotect-1.14.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 uiprotect/__init__.py,sha256=llnQNtiBfwQG8IkQXovvFz4LZeFjrJx7XdmmUhu3a9E,289
 uiprotect/__main__.py,sha256=C_bHCOkv5qj6WMy-6ELoY3Y6HDhLxOa1a30CzmbZhsg,462
-uiprotect/api.py,sha256=t3E1wMja0av6ENtvXJHGv70WC6NCCWbF_wFIJxOLS0I,66463
+uiprotect/api.py,sha256=zVKTMieBqx3EM1sex5zzAj2J2k4pUlQQ_xF8nE6AS5s,66339
 uiprotect/cli/__init__.py,sha256=sSLW9keVQOkgFcMW18HTDjRrt9sJ0KWjn9DJDA6f9Pc,8658
 uiprotect/cli/backup.py,sha256=ZiS7RZnJGKI8TJKLW2cOUzkRM8nyTvE5Ov_jZZGtvSM,36708
 uiprotect/cli/base.py,sha256=zpTm2kyJe_GLixnv3Uadke__iRLh64AEwQzp-2hqS7g,7730
@@ -14,7 +14,7 @@ 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=yzGm5RCeo9AqmgArWC8O7LhBp_Qxz1XSel3xRyhNAbM,37718
+uiprotect/data/base.py,sha256=OWKeMWk7n5VaHF_meTt2Ykw7H9zx6U47u-P2vLNDWzE,36627
 uiprotect/data/bootstrap.py,sha256=wjRFVrv1rOFVDcij6ZYm7dzMe0iz6AqYciQozC-J2TI,21893
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
 uiprotect/data/devices.py,sha256=Nq3bOko5PFf5LvEBoD4JV8kmbq50laRdh3VHMWX7t-0,111809
@@ -29,9 +29,9 @@ uiprotect/stream.py,sha256=McV3XymKyjn-1uV5jdQHcpaDjqLS4zWyMASQ8ubcyb4,4924
 uiprotect/test_util/__init__.py,sha256=d2g7afa0LSdixQ0kjEDYwafDFME_UlW2LzxpamZ2BC0,18556
 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.12.1.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-1.12.1.dist-info/METADATA,sha256=tQiyGoMyj_g6AQLes0kHr4TWIXfENceZ_ksLycnREqI,10985
-uiprotect-1.12.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-1.12.1.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-1.12.1.dist-info/RECORD,,
+uiprotect/websocket.py,sha256=JHI_2EZeRPqPyQopsBZS0dr3tu0HaTiqeLazfBXhW_8,7339
+uiprotect-1.14.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-1.14.0.dist-info/METADATA,sha256=3CmROnNdNIJkOFAIRb0Ha13iqu67iKaJY0jKIcJdbcQ,10985
+uiprotect-1.14.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-1.14.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-1.14.0.dist-info/RECORD,,