uiprotect 5.3.0__py3-none-any.whl → 6.0.0__py3-none-any.whl

uiprotect/api.py

@@ -191,6 +191,7 @@ class BaseApiClient:
         cache_dir: Path | None = None,
         config_dir: Path | None = None,
         store_sessions: bool = True,
+        ws_receive_timeout: int | None = None,
     ) -> None:
         self._auth_lock = asyncio.Lock()
         self._host = host
@@ -200,6 +201,7 @@ class BaseApiClient:
         self._password = password
         self._verify_ssl = verify_ssl
         self._ws_timeout = ws_timeout
+        self._ws_receive_timeout = ws_receive_timeout
         self._loaded_session = False
         self._update_task: asyncio.Task[Bootstrap | None] | None = None
 
@@ -277,6 +279,7 @@ class BaseApiClient:
                 self._on_websocket_state_change,
                 verify=self._verify_ssl,
                 timeout=self._ws_timeout,
+                receive_timeout=self._ws_receive_timeout,
             )
         return self._websocket
 
@@ -752,6 +755,7 @@ class ProtectApiClient(BaseApiClient):
         ignore_stats: bool = False,
         ignore_unadopted: bool = True,
         debug: bool = False,
+        ws_receive_timeout: int | None = None,
     ) -> None:
         super().__init__(
             host=host,
@@ -761,6 +765,7 @@ class ProtectApiClient(BaseApiClient):
             verify_ssl=verify_ssl,
             session=session,
             ws_timeout=ws_timeout,
+            ws_receive_timeout=ws_receive_timeout,
             cache_dir=cache_dir,
             config_dir=config_dir,
             store_sessions=store_sessions,

uiprotect/data/types.py

@@ -49,6 +49,11 @@ class ValuesEnumMixin:
     _values: list[str] | None = None
     _values_normalized: dict[str, str] | None = None
 
+    @classmethod
+    @cache
+    def from_string(cls, value: str) -> Any:
+        return cls(value)  # type: ignore[call-arg]
+
     @classmethod
     @cache
     def values(cls) -> list[str]:

uiprotect/utils.py

@@ -202,6 +202,7 @@ def to_camel_case(name: str) -> str:
 
 
 _EMPTY_UUID = UUID("0" * 32)
+_SHAPE_TYPES = {SHAPE_DICT, SHAPE_LIST, SHAPE_SET}
 
 
 def convert_unifi_data(value: Any, field: ModelField) -> Any:
@@ -211,23 +212,20 @@ def convert_unifi_data(value: Any, field: ModelField) -> Any:
     if type_ is Any:
         return value
 
-    shape = field.shape
-    if shape == SHAPE_LIST and isinstance(value, list):
-        return [convert_unifi_data(v, field) for v in value]
-    if shape == SHAPE_SET and isinstance(value, list):
-        return {convert_unifi_data(v, field) for v in value}
-    if shape == SHAPE_DICT and isinstance(value, dict):
-        return {k: convert_unifi_data(v, field) for k, v in value.items()}
+    if (shape := field.shape) in _SHAPE_TYPES:
+        if shape == SHAPE_LIST and isinstance(value, list):
+            return [convert_unifi_data(v, field) for v in value]
+        if shape == SHAPE_SET and isinstance(value, list):
+            return {convert_unifi_data(v, field) for v in value}
+        if shape == SHAPE_DICT and isinstance(value, dict):
+            return {k: convert_unifi_data(v, field) for k, v in value.items()}
 
     if value is not None:
         if type_ in IP_TYPES:
-            try:
-                return ip_address(value)
-            except ValueError:
-                return value
+            return _cached_ip_address(value)
         if type_ is datetime:
             return from_js_time(value)
-        if type_ in _CREATE_TYPES or _is_enum_type(type_):
+        if type_ in _CREATE_TYPES:
             # cannot do this check too soon because some types cannot be used in isinstance
             if isinstance(value, type_):
                 return value
@@ -236,16 +234,34 @@ def convert_unifi_data(value: Any, field: ModelField) -> Any:
             if type_ is UUID and value == _BAD_UUID:
                 return _EMPTY_UUID
             return type_(value)
+        if _is_enum_type(type_):
+            if _is_from_string_enum(type_):
+                return type_.from_string(value)
+            return type_(value)
 
     return value
 
 
+@lru_cache
+def _cached_ip_address(value: str) -> IPv4Address | IPv6Address | str:
+    try:
+        return ip_address(value)
+    except ValueError:
+        return value
+
+
 @lru_cache
 def _is_enum_type(type_: Any) -> bool:
     """Checks if type is an Enum."""
     return isclass(type_) and issubclass(type_, Enum)
 
 
+@lru_cache
+def _is_from_string_enum(type_: Any) -> bool:
+    """Checks if Enum has from_string method."""
+    return hasattr(type_, "from_string")
+
+
 def serialize_unifi_obj(value: Any, levels: int = -1) -> Any:
     """Serializes UFP data"""
     if unifi_dict := getattr(value, "unifi_dict", None):

uiprotect/websocket.py

@@ -55,10 +55,12 @@ class Websocket:
         timeout: float = 30.0,
         backoff: int = 10,
         verify: bool = True,
+        receive_timeout: float | None = None,
     ) -> None:
         """Init Websocket."""
         self.get_url = get_url
         self.timeout = timeout
+        self.receive_timeout = receive_timeout
         self.backoff = backoff
         self.verify = verify
         self._get_session = get_session
@@ -117,7 +119,7 @@ class Websocket:
     async def _websocket_inner_loop(self, url: URL) -> None:
         _LOGGER.debug("Connecting WS to %s", url)
         await self._attempt_auth(False)
-        ssl = None if self.verify else False
+        ssl = True if self.verify else False
         msg: WSMessage | None = None
         self._seen_non_close_message = False
         session = await self._get_session()
@@ -127,7 +129,7 @@ class Websocket:
                 url, ssl=ssl, headers=self._headers, timeout=self.timeout
             )
             while True:
-                msg = await self._ws_connection.receive(self.timeout)
+                msg = await self._ws_connection.receive(self.receive_timeout)
                 msg_type = msg.type
                 if msg_type is WSMsgType.ERROR:
                     _LOGGER.exception("Error from Websocket: %s", msg.data)

{uiprotect-5.3.0.dist-info → uiprotect-6.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 5.3.0
+Version: 6.0.0
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 Author: UI Protect Maintainers
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: aiofiles (>=23)
-Requires-Dist: aiohttp (>=3.9.0)
+Requires-Dist: aiohttp (>=3.10.0)
 Requires-Dist: aioshutil (>=1.3)
 Requires-Dist: async-timeout (>=3.0.1)
 Requires-Dist: convertertools (>=0.5.0)

{uiprotect-5.3.0.dist-info → uiprotect-6.0.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 uiprotect/__init__.py,sha256=GDRM9WvWUBbOyBVgltq6Qv8i7LVdWEbG8q5EzYvOFbE,636
 uiprotect/__main__.py,sha256=C_bHCOkv5qj6WMy-6ELoY3Y6HDhLxOa1a30CzmbZhsg,462
-uiprotect/api.py,sha256=1gtyhk-MRFy6_wGR32Y520XJ2Ucxr1nevuBosod0r7w,67637
+uiprotect/api.py,sha256=8kC9v6EM67kfdtPDIW8dlqjZl_s5Lffj4o-Z_dOMmdQ,67894
 uiprotect/cli/__init__.py,sha256=1MO8rJmjjAsfVx2x01gn5DJo8B64xdPGo6gRVJbWd18,8868
 uiprotect/cli/backup.py,sha256=ZiS7RZnJGKI8TJKLW2cOUzkRM8nyTvE5Ov_jZZGtvSM,36708
 uiprotect/cli/base.py,sha256=k-_qGuNT7br0iV0KE5F4wYXF75iyLLjBEckTqxC71xM,7591
@@ -19,7 +19,7 @@ uiprotect/data/bootstrap.py,sha256=OSPHu08p7Ys9KqEb8sq_LFufuECtF4lY7OnAYK27ngo,2
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
 uiprotect/data/devices.py,sha256=0l8eiTCwacdHCmOc7qNzeUMpHLxvd6FeB7DOqZKycdA,110880
 uiprotect/data/nvr.py,sha256=8M-62AG4q1k71eX-DaFcdO52QWG4zO9X5Voj0Tj9D5A,46598
-uiprotect/data/types.py,sha256=nrTvvpI3Ja5IV-ixmOpsYwTXrggRK_vQth9InQn-FkI,18088
+uiprotect/data/types.py,sha256=zYQjmFDqxjVzaan-vihOzHaBirWsW_C0Q3Pd9xTH33I,18214
 uiprotect/data/user.py,sha256=1o5gyPHafn4lHARpoSMD_NWbo5IbzGPfiSASwqqDvWs,7002
 uiprotect/data/websocket.py,sha256=5-yM6yr8NrxKJjBPQlGVXXQUTcksF-UavligKYjJQ3k,6770
 uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
@@ -28,10 +28,10 @@ uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,
 uiprotect/stream.py,sha256=McV3XymKyjn-1uV5jdQHcpaDjqLS4zWyMASQ8ubcyb4,4924
 uiprotect/test_util/__init__.py,sha256=Ky8mTL61nhp5II2mxTKBAsSGvNqK8U_CfKC5AGwToAI,18704
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
-uiprotect/utils.py,sha256=O2RIiUZX4kBHq5v3L598uYe7rbhOcKTeqyYQi6rITnQ,19865
-uiprotect/websocket.py,sha256=D5DZrMzo434ecp8toNxOB5HM193kVwYw42yEcg99yMw,8029
-uiprotect-5.3.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-5.3.0.dist-info/METADATA,sha256=t-z36ZssCujkhRP7d_YGpeqiEufq2tIBEii5ThRopZ8,11009
-uiprotect-5.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-5.3.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-5.3.0.dist-info/RECORD,,
+uiprotect/utils.py,sha256=jIWT7n_reL90oY91svBfQ4naRxo28qHzP5jNOL12mQE,20342
+uiprotect/websocket.py,sha256=f3YdRg4iKkvyQLz9H9rQ3RdhiEudNwWO4ONaXF6OJ4Y,8130
+uiprotect-6.0.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-6.0.0.dist-info/METADATA,sha256=6sFvO3w3TeFmN-tU8nvrw8lvdg_soSuCgtcDPFje2_E,11010
+uiprotect-6.0.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-6.0.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-6.0.0.dist-info/RECORD,,