aioamazondevices 3.7.0__py3-none-any.whl → 4.0.1__py3-none-any.whl

aioamazondevices/__init__.py

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

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,20 +121,20 @@ 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
         country_code = login_country_code.lower()
 
-        locale = DOMAIN_BY_ISO3166_COUNTRY.get(country_code, {})
-        domain = locale.get("domain", country_code)
-        market = locale.get("market", f"https://www.amazon.{domain}")
-        assoc_handle = locale.get(
+        locale: dict = DOMAIN_BY_ISO3166_COUNTRY.get(country_code, {})
+        domain: str = locale.get("domain", country_code)
+        market: list[str] = locale.get("market", [f"https://www.amazon.{domain}"])
+        assoc_handle: str = locale.get(
             "openid.assoc_handle", f"{DEFAULT_ASSOC_HANDLE}_{country_code}"
         )
 
@@ -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),
@@ -590,9 +587,9 @@ class AmazonEchoApi:
         resp_me_json = await resp_me.json()
         amazon_market = resp_me_json["marketPlaceDomainName"]
 
-        if amazon_market != self._market:
+        if amazon_market not in self._market:
             _LOGGER.warning(
-                "Selected country <%s> doesn't matches Amazon API reply:\n%s\n vs \n%s",
+                "Selected country <%s> doesn't match Amazon API reply:\n%s\n vs \n%s",
                 self._login_country_code.upper(),
                 {"input ": self._market},
                 {"amazon": amazon_market},
@@ -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]:
@@ -945,7 +933,7 @@ class AmazonEchoApi:
     ) -> None:
         """Send message to specific device."""
         if not self._login_stored_data:
-            _LOGGER.warning("Trying to send message before login")
+            _LOGGER.warning("No login data available, cannot send message")
             return
 
         base_payload = {

aioamazondevices/const.py

@@ -1,6 +1,7 @@
 """Constants for Amazon devices."""
 
 import logging
+from typing import Any
 
 _LOGGER = logging.getLogger(__package__)
 
@@ -30,16 +31,16 @@ TO_REDACT = {
     "user_id",
 }
 
-AMAZON_DE_OVERRIDE = {
+AMAZON_DE_OVERRIDE: dict[str, str] = {
     "domain": "de",
     "openid.assoc_handle": f"{DEFAULT_ASSOC_HANDLE}_de",
 }
-AMAZON_US_OVERRIDE = {
+AMAZON_US_OVERRIDE: dict[str, str] = {
     "domain": "com",
     "openid.assoc_handle": DEFAULT_ASSOC_HANDLE,
 }
 
-DOMAIN_BY_ISO3166_COUNTRY = {
+DOMAIN_BY_ISO3166_COUNTRY: dict[str, dict[str, Any]] = {
     "ar": AMAZON_US_OVERRIDE,
     "at": AMAZON_DE_OVERRIDE,
     "au": {
@@ -70,6 +71,7 @@ DOMAIN_BY_ISO3166_COUNTRY = {
         "domain": "com.au",
         "openid.assoc_handle": f"{DEFAULT_ASSOC_HANDLE}_au",
     },
+    "pl": AMAZON_US_OVERRIDE,
     "tr": {
         "domain": "com.tr",
     },

{aioamazondevices-3.7.0.dist-info → aioamazondevices-4.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 3.7.0
+Version: 4.0.1
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli
@@ -114,17 +114,17 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/jeeftor">
-                    <img src="https://avatars.githubusercontent.com/u/6491743?v=4" width="100;" alt="jeeftor"/>
+                <a href="https://github.com/jamesonuk">
+                    <img src="https://avatars.githubusercontent.com/u/1040621?v=4" width="100;" alt="jamesonuk"/>
                     <br />
-                    <sub><b>Jeef</b></sub>
+                    <sub><b>jameson_uk</b></sub>
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/jamesonuk">
-                    <img src="https://avatars.githubusercontent.com/u/1040621?v=4" width="100;" alt="jamesonuk"/>
+                <a href="https://github.com/jeeftor">
+                    <img src="https://avatars.githubusercontent.com/u/6491743?v=4" width="100;" alt="jeeftor"/>
                     <br />
-                    <sub><b>jameson_uk</b></sub>
+                    <sub><b>Jeef</b></sub>
                 </a>
             </td>
             <td align="center">
@@ -150,6 +150,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
             </td>
 		</tr>
 		<tr>
+            <td align="center">
+                <a href="https://github.com/maxmati">
+                    <img src="https://avatars.githubusercontent.com/u/509560?v=4" width="100;" alt="maxmati"/>
+                    <br />
+                    <sub><b>Mateusz Nowotyński</b></sub>
+                </a>
+            </td>
             <td align="center">
                 <a href="https://github.com/tronikos">
                     <img src="https://avatars.githubusercontent.com/u/9987465?v=4" width="100;" alt="tronikos"/>

aioamazondevices-4.0.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+aioamazondevices/__init__.py,sha256=B40dT-9Wsok6OrOhyn7tENG8RwetooNRONmpiNZ_4U0,276
+aioamazondevices/api.py,sha256=HIgewk7CuYpNeflPjX0EarKMYmrMuOP0weKUJD1oY2Q,41075
+aioamazondevices/const.py,sha256=T4OSoLFhHA16n-5wKyzMAIYZUDmoowLSEjVLx8C3PE0,11498
+aioamazondevices/exceptions.py,sha256=CfOFKDvE_yl5BFoFcpTOuDfgRi_2oAtKk-nNJgfWBAs,726
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
+aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
+aioamazondevices-4.0.1.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-4.0.1.dist-info/METADATA,sha256=nmKoeiuQyst5FNR2Tu7Do9Wjr7vxc_waxf4z8BSudQI,7572
+aioamazondevices-4.0.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-4.0.1.dist-info/RECORD,,

aioamazondevices-3.7.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-aioamazondevices/__init__.py,sha256=znb9LZwJ1BoJyNPfIw2LN6xoILglQMI3yxmCWh_wOTk,276
-aioamazondevices/api.py,sha256=Z65R_DSUQnHci0_gs1PB4dwm2K_bqaaYBbPBc6GfLcU,41525
-aioamazondevices/const.py,sha256=1v0CFgGrf99tnfxKED7B-uvbT7rpiVJzFV6cjFmEoOM,11386
-aioamazondevices/exceptions.py,sha256=CfOFKDvE_yl5BFoFcpTOuDfgRi_2oAtKk-nNJgfWBAs,726
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
-aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
-aioamazondevices-3.7.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-3.7.0.dist-info/METADATA,sha256=vxgP2t5VhcXPzBbWnWbuR3s2S9LECICjzredGb7a9eI,7251
-aioamazondevices-3.7.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-3.7.0.dist-info/RECORD,,