aioamazondevices 3.7.0__tar.gz → 4.0.0__tar.gz

{aioamazondevices-3.7.0 → aioamazondevices-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 3.7.0
+Version: 4.0.0
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli

{aioamazondevices-3.7.0 → aioamazondevices-4.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioamazondevices"
-version = "3.7.0"
+version = "4.0.0"
 requires-python = ">=3.12"
 description = "Python library to control Amazon devices"
 authors = [

{aioamazondevices-3.7.0 → aioamazondevices-4.0.0}/src/aioamazondevices/__init__.py

@@ -1,6 +1,6 @@
 """aioamazondevices library."""
 
-__version__ = "3.7.0"
+__version__ = "4.0.0"
 
 
 from .api import AmazonDevice, AmazonEchoApi

{aioamazondevices-3.7.0 → aioamazondevices-4.0.0}/src/aioamazondevices/api.py

@@ -16,7 +16,7 @@ from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
 
 import orjson
-from aiohttp import ClientConnectorError, ClientResponse, ClientSession, CookieJar
+from aiohttp import ClientConnectorError, ClientResponse, ClientSession
 from bs4 import BeautifulSoup, Tag
 from langcodes import Language
 from multidict import MultiDictProxy
@@ -121,11 +121,11 @@ class AmazonEchoApi:
 
     def __init__(
         self,
+        client_session: ClientSession,
         login_country_code: str,
         login_email: str,
         login_password: str,
         login_data: dict[str, Any] | None = None,
-        save_raw_data: bool = False,
     ) -> None:
         """Initialize the scanner."""
         # Force country digits as lower case
@@ -146,12 +146,12 @@ class AmazonEchoApi:
         self._market = market
         self._cookies = self._build_init_cookies()
         self._csrf_cookie: str | None = None
-        self._save_raw_data = save_raw_data
+        self._save_raw_data = False
         self._login_stored_data = login_data
         self._serial = self._serial_number()
         self._list_for_clusters: dict[str, str] = {}
 
-        self.session: ClientSession
+        self._session = client_session
         self._devices: dict[str, Any] = {}
         self._sensors_available: bool = True
 
@@ -167,6 +167,11 @@ class AmazonEchoApi:
             self._market,
         )
 
+    def save_raw_data(self) -> None:
+        """Save raw data to disk."""
+        self._save_raw_data = True
+        _LOGGER.debug("Saving raw data to disk")
+
     def _load_website_cookies(self) -> dict[str, str]:
         """Get website cookies, if avaliables."""
         if not self._login_stored_data:
@@ -301,14 +306,6 @@ class AmazonEchoApi:
             raise TypeError(f"Unable to extract authorization code from url: {url}")
         return parsed_url["openid.oa2.authorization_code"][0]
 
-    def _client_session(self) -> None:
-        """Create HTTP client session."""
-        if not hasattr(self, "session") or self.session.closed:
-            _LOGGER.debug("Creating HTTP session (aiohttp)")
-            cookie_jar = CookieJar()
-            cookie_jar.update_cookies(self._cookies)
-            self.session = ClientSession(cookie_jar=cookie_jar)
-
     async def _ignore_ap_signin_error(self, response: ClientResponse) -> bool:
         """Return true if error is due to signin endpoint."""
         # Endpoint URI_SIGNIN replies with error 404
@@ -373,7 +370,7 @@ class AmazonEchoApi:
         _cookies = (
             self._load_website_cookies() if self._login_stored_data else self._cookies
         )
-        self.session.cookie_jar.update_cookies(_cookies)
+        self._session.cookie_jar.update_cookies(_cookies)
 
         resp: ClientResponse | None = None
         for delay in [0, 1, 2, 5, 8, 12, 21]:
@@ -384,7 +381,7 @@ class AmazonEchoApi:
                 await asyncio.sleep(delay)
 
             try:
-                resp = await self.session.request(
+                resp = await self._session.request(
                     method,
                     URL(url, encoded=True),
                     data=input_data if not json_data else orjson.dumps(input_data),
@@ -730,7 +727,6 @@ class AmazonEchoApi:
             obfuscate_email(self._login_email),
             bool(otp_code),
         )
-        self._client_session()
 
         code_verifier = self._create_code_verifier()
         client_id = self._build_client_id()
@@ -805,18 +801,10 @@ class AmazonEchoApi:
             obfuscate_email(self._login_email),
         )
 
-        self._client_session()
-
         await self._check_country()
 
         return self._login_stored_data
 
-    async def close(self) -> None:
-        """Close http client session."""
-        if hasattr(self, "session"):
-            _LOGGER.debug("Closing HTTP session (aiohttp)")
-            await self.session.close()
-
     async def get_devices_data(
         self,
     ) -> dict[str, AmazonDevice]: