uiprotect 7.14.2__py3-none-any.whl → 7.15.1__py3-none-any.whl

uiprotect/api.py

@@ -169,6 +169,7 @@ class BaseApiClient:
     _last_token_cookie: Morsel[str] | None = None
     _last_token_cookie_decode: dict[str, Any] | None = None
     _session: aiohttp.ClientSession | None = None
+    _public_api_session: aiohttp.ClientSession | None = None
     _loaded_session: bool = False
     _cookiename = "TOKEN"
 
@@ -192,6 +193,7 @@ class BaseApiClient:
         api_key: str | None = None,
         verify_ssl: bool = True,
         session: aiohttp.ClientSession | None = None,
+        public_api_session: aiohttp.ClientSession | None = None,
         ws_timeout: int = 30,
         cache_dir: Path | None = None,
         config_dir: Path | None = None,
@@ -218,6 +220,9 @@ class BaseApiClient:
         if session is not None:
             self._session = session
 
+        if public_api_session is not None:
+            self._public_api_session = public_api_session
+
         self._update_url()
 
     def _update_cookiename(self, cookie: SimpleCookie) -> None:
@@ -261,6 +266,15 @@ class BaseApiClient:
 
         return self._session
 
+    async def get_public_api_session(self) -> aiohttp.ClientSession:
+        """Gets or creates current public API client session"""
+        if self._public_api_session is None or self._public_api_session.closed:
+            if self._public_api_session is not None and self._public_api_session.closed:
+                _LOGGER.debug("Public API session was closed, creating a new one")
+            self._public_api_session = aiohttp.ClientSession()
+
+        return self._public_api_session
+
     async def _auth_websocket(self, force: bool) -> dict[str, str] | None:
         """Authenticate for Websocket."""
         if force:
@@ -306,6 +320,12 @@ class BaseApiClient:
             self._session = None
             self._loaded_session = False
 
+    async def close_public_api_session(self) -> None:
+        """Closing and deletes public API client session"""
+        if self._public_api_session is not None:
+            await self._public_api_session.close()
+            self._public_api_session = None
+
     async def _cancel_update_task(self) -> None:
         if self._update_task:
             self._update_task.cancel()
@@ -345,7 +365,11 @@ class BaseApiClient:
         _LOGGER.debug("Request url: %s", request_url)
         if not self._verify_ssl:
             kwargs["ssl"] = False
-        session = await self.get_session()
+
+        if public_api:
+            session = await self.get_public_api_session()
+        else:
+            session = await self.get_session()
 
         for attempt in range(2):
             try:
@@ -777,6 +801,7 @@ class ProtectApiClient(BaseApiClient):
         api_key: str | None = None,
         verify_ssl: bool = True,
         session: aiohttp.ClientSession | None = None,
+        public_api_session: aiohttp.ClientSession | None = None,
         ws_timeout: int = 30,
         cache_dir: Path | None = None,
         config_dir: Path | None = None,
@@ -797,6 +822,7 @@ class ProtectApiClient(BaseApiClient):
             api_key=api_key,
             verify_ssl=verify_ssl,
             session=session,
+            public_api_session=public_api_session,
             ws_timeout=ws_timeout,
             ws_receive_timeout=ws_receive_timeout,
             cache_dir=cache_dir,
@@ -2063,15 +2089,9 @@ class ProtectApiClient(BaseApiClient):
         if not name:
             raise BadRequest("API key name cannot be empty")
 
-        user_id = None
-        if self._last_token_cookie_decode is not None:
-            user_id = self._last_token_cookie_decode.get("userId")
-        if not user_id:
-            raise BadRequest("User ID not available for API key creation")
-
         response = await self.api_request(
             api_path="/proxy/users/api/v2",
-            url=f"/user/{user_id}/keys",
+            url="/user/self/keys",
             method="post",
             json={"name": name},
         )

uiprotect/cli/__init__.py

@@ -173,6 +173,7 @@ def main(
     async def update() -> None:
         protect._bootstrap = await protect.get_bootstrap()
         await protect.close_session()
+        await protect.close_public_api_session()
 
     run_async(update())
     ctx.obj = CliContext(protect=protect, output_format=output_format)
@@ -286,6 +287,7 @@ def profile_ws(
         unsub()
         await protect.async_disconnect_ws()
         await protect.close_session()
+        await protect.close_public_api_session()
 
     _setup_logger()
 
@@ -325,6 +327,7 @@ def create_api_key(
     async def callback() -> str:
         api_key = await protect.create_api_key(name)
         await protect.close_session()
+        await protect.close_public_api_session()
         return api_key
 
     _setup_logger()
@@ -340,6 +343,7 @@ def get_meta_info(ctx: typer.Context) -> None:
     async def callback() -> MetaInfo:
         meta = await protect.get_meta_info()
         await protect.close_session()
+        await protect.close_public_api_session()
         return meta
 
     _setup_logger()

uiprotect/cli/backup.py

@@ -1064,6 +1064,7 @@ async def _events(
     finally:
         _LOGGER.debug("Cleaning up Protect connection/database...")
         await ctx.protect.close_session()
+        await ctx.protect.close_public_api_session()
         await ctx.db_engine.dispose()
 
 

uiprotect/cli/base.py

@@ -36,6 +36,7 @@ def run(ctx: typer.Context, func: Coroutine[Any, Any, T]) -> T:
     async def callback() -> T:
         return_value = await func
         await ctx.obj.protect.close_session()
+        await ctx.obj.protect.close_public_api_session()
         return return_value
 
     try:

uiprotect/test_util/__init__.py

@@ -142,6 +142,7 @@ class SampleDataGenerator:
 
         if close_session:
             await self.client.close_session()
+            await self.client.close_public_api_session()
 
         await self.write_json_file("sample_constants", self.constants, anonymize=False)
 

{uiprotect-7.14.2.dist-info → uiprotect-7.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uiprotect
-Version: 7.14.2
+Version: 7.15.1
 Summary: Python API for Unifi Protect (Unofficial)
 License: MIT
 Author: UI Protect Maintainers

{uiprotect-7.14.2.dist-info → uiprotect-7.15.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 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=YcmXBQy4ktZs61U3f7RqwM7hOZ7QS99U9nlGeTYf8Z4,72447
-uiprotect/cli/__init__.py,sha256=ANasP55kd1QJ8H0YpHV7lxlMQTiqa2iDLpR5-JmyZjk,9511
+uiprotect/api.py,sha256=MYAkpQTHgoWrVDlNu_szS7FapjJbOhMfFGoHV6DRHYs,73389
+uiprotect/cli/__init__.py,sha256=rVfmLd4Al4-FQZxq7QrYlfr46fBGZv6Aw5huFtmCn58,9707
 uiprotect/cli/aiports.py,sha256=wpEr2w_hY18CGpFiQM2Yc0FiVwG_1l2CzZhZLGNigvI,1576
-uiprotect/cli/backup.py,sha256=ZiS7RZnJGKI8TJKLW2cOUzkRM8nyTvE5Ov_jZZGtvSM,36708
-uiprotect/cli/base.py,sha256=5-z-IS8g9iQqhR_YbjxaJAFiMMAY_7cCtNAtvLdRCoM,7524
+uiprotect/cli/backup.py,sha256=9Coo5K4YTvQIrvGVZ-NYUajGnoMIyPhK_juxQxNkdO0,36761
+uiprotect/cli/base.py,sha256=SFwgIeliu1_l07IGMerSNPPKvV2g3-Amoc9YiCGmaVA,7581
 uiprotect/cli/cameras.py,sha256=YvvMccQEYG3Wih0Ix8tan1R1vfaJ6cogg6YKWLzMUV8,16973
 uiprotect/cli/chimes.py,sha256=XANn21bQVkestkKOm9HjxSM8ZGrRrqvUXLouaQ3LTqs,5326
 uiprotect/cli/doorlocks.py,sha256=Go_Tn68bAcmrRAnUIi4kBiR7ciKQsu_R150ubPTjUAs,3523
@@ -28,12 +28,12 @@ uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
 uiprotect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,386
 uiprotect/stream.py,sha256=ls65vMOXF4IlJ5axewFITfhcaTh_ihaFeCkCTfhy0Nk,5168
-uiprotect/test_util/__init__.py,sha256=HlQBgIgdtrvT-gQ5OWP92LbgVr_YzsD5NFImLRonUZk,19320
+uiprotect/test_util/__init__.py,sha256=TLTQrqyuLcIxp7bZTk3nIZ0U9znoMTLu7QyxrJKaLo0,19377
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
 uiprotect/utils.py,sha256=2fLwXN0oz9dcVTFexzLp8jj97lcYrxLZkeEUGf5ehtU,20587
 uiprotect/websocket.py,sha256=tEyenqblNXHcjWYuf4oRP1E7buNwx6zoECMwpBr-jig,8191
-uiprotect-7.14.2.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-7.14.2.dist-info/METADATA,sha256=5SQTlpnGjKliDHK5OjxSuo5iQEbPyzgSzUV-4jM0NU8,11167
-uiprotect-7.14.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-uiprotect-7.14.2.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-7.14.2.dist-info/RECORD,,
+uiprotect-7.15.1.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-7.15.1.dist-info/METADATA,sha256=RI5yrUfDhDn5ZCRbytbZ3VOaMcEAIuK7z2lTirOrrb8,11167
+uiprotect-7.15.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+uiprotect-7.15.1.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-7.15.1.dist-info/RECORD,,