aioamazondevices 3.4.0__py3-none-any.whl → 3.5.1__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -1,5 +1,6 @@
 """Support for Amazon devices."""
 
+import asyncio
 import base64
 import hashlib
 import mimetypes
@@ -128,19 +129,19 @@ class AmazonEchoApi:
         # Force country digits as lower case
         country_code = login_country_code.lower()
 
-        locale = DOMAIN_BY_ISO3166_COUNTRY.get(country_code)
-        domain = locale["domain"] if locale else country_code
+        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(
+            "openid.assoc_handle", f"{DEFAULT_ASSOC_HANDLE}_{country_code}"
+        )
 
-        if locale and (assoc := locale.get("openid.assoc_handle")):
-            assoc_handle = assoc
-        else:
-            assoc_handle = f"{DEFAULT_ASSOC_HANDLE}_{country_code}"
         self._assoc_handle = assoc_handle
-
         self._login_email = login_email
         self._login_password = login_password
         self._login_country_code = country_code
         self._domain = domain
+        self._market = market
         self._cookies = self._build_init_cookies()
         self._csrf_cookie: str | None = None
         self._save_raw_data = save_raw_data
@@ -157,9 +158,10 @@ class AmazonEchoApi:
         self._language = f"{lang_maximized.language}-{lang_maximized.region}"
 
         _LOGGER.debug(
-            "Initialize library with domain <%s> and language <%s>",
+            "Initialize library: domain <amazon.%s>, language <%s>, market: <%s>",
             self._domain,
             self._language,
+            self._market,
         )
 
     def _load_website_cookies(self) -> dict[str, str]:
@@ -369,15 +371,39 @@ class AmazonEchoApi:
             self._load_website_cookies() if self._login_stored_data else self._cookies
         )
         self.session.cookie_jar.update_cookies(_cookies)
-        try:
-            resp = await self.session.request(
-                method,
-                URL(url, encoded=True),
-                data=input_data if not json_data else orjson.dumps(input_data),
-                headers=headers,
-            )
-        except (TimeoutError, ClientConnectorError) as exc:
-            raise CannotConnect(f"Connection error during {method}") from exc
+
+        resp: ClientResponse | None = None
+        for delay in [0, 1, 2, 5, 8, 12, 21]:
+            if delay:
+                _LOGGER.info(
+                    "Sleeping for %s seconds before retrying API call to %s", delay, url
+                )
+                await asyncio.sleep(delay)
+
+            try:
+                resp = await self.session.request(
+                    method,
+                    URL(url, encoded=True),
+                    data=input_data if not json_data else orjson.dumps(input_data),
+                    headers=headers,
+                )
+
+            except (TimeoutError, ClientConnectorError) as exc:
+                _LOGGER.warning("Connection error to %s: %s", url, repr(exc))
+                raise CannotConnect(f"Connection error during {method}") from exc
+
+            # Retry with a delay only for specific HTTP status
+            # that can benefits of a back-off
+            if resp.status not in [
+                HTTPStatus.INTERNAL_SERVER_ERROR,
+                HTTPStatus.SERVICE_UNAVAILABLE,
+                HTTPStatus.TOO_MANY_REQUESTS,
+            ]:
+                break
+
+        if resp is None:
+            _LOGGER.error("No response received from %s", url)
+            raise CannotConnect(f"No response received from {url}")
 
         if not self._csrf_cookie:
             self._csrf_cookie = resp.cookies.get(CSRF_COOKIE, Morsel()).value
@@ -559,16 +585,14 @@ class AmazonEchoApi:
             raise CannotAuthenticate
 
         resp_me_json = await resp_me.json()
-        market = resp_me_json["marketPlaceDomainName"]
-
-        _domain = f"https://www.amazon.{self._domain}"
+        amazon_market = resp_me_json["marketPlaceDomainName"]
 
-        if market != _domain:
+        if amazon_market != self._market:
             _LOGGER.warning(
                 "Selected country <%s> doesn't matches Amazon API reply:\n%s\n vs \n%s",
                 self._login_country_code.upper(),
-                {"site  ": _domain},
-                {"market": market},
+                {"input ": self._market},
+                {"amazon": amazon_market},
             )
             raise WrongCountry
 

aioamazondevices/const.py

@@ -49,9 +49,7 @@ DOMAIN_BY_ISO3166_COUNTRY = {
     "be": {
         "domain": "com.be",
     },
-    "br": {
-        "domain": "com.br",
-    },
+    "br": AMAZON_US_OVERRIDE | {"market": "https://www.amazon.com.br"},
     "gb": {
         "domain": "co.uk",
         "openid.assoc_handle": f"{DEFAULT_ASSOC_HANDLE}_uk",
@@ -63,6 +61,10 @@ DOMAIN_BY_ISO3166_COUNTRY = {
     "mx": {
         "domain": "com.mx",
     },
+    "nl": {
+        "domain": "nl",
+        "market": "https://www.amazon.co.uk",
+    },
     "no": AMAZON_DE_OVERRIDE,
     "nz": {
         "domain": "com.au",

{aioamazondevices-3.4.0.dist-info → aioamazondevices-3.5.1.dist-info}/METADATA

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

aioamazondevices-3.5.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+aioamazondevices/__init__.py,sha256=T7EODwcUnfDoPVfBfmfht_5uiC_fNyf1qm4chgXqIY4,276
+aioamazondevices/api.py,sha256=kFdkvBHlGI1OITnRt1j8eASdVOzPLuftSF4U5jb6j28,40686
+aioamazondevices/const.py,sha256=mQT0FAGqVtWsN6W93EzzwjqrMf7x8OT02TXdUCpKFus,9143
+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.5.1.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-3.5.1.dist-info/METADATA,sha256=IsrgAsKKym47Tmp7AkEipP5DCBEI_3pahiESCPe0HRw,6929
+aioamazondevices-3.5.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-3.5.1.dist-info/RECORD,,

aioamazondevices-3.4.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-aioamazondevices/__init__.py,sha256=fd2mZWF9xVsM18tJqrX5LEGz06hXrnlPjWauYq6xMwA,276
-aioamazondevices/api.py,sha256=SBucwyavOv8aiXyw3iorZUA0qgA2cavCIzfdRanrbSQ,39733
-aioamazondevices/const.py,sha256=qeaGMLGKH4r-84EjBvMzj1BcwgRRcDD551TUsUu4AiI,9029
-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.4.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-3.4.0.dist-info/METADATA,sha256=c61BBAOhX4xnSIsl2kMwqIQFbqo6abWYePtU0kCeZ1c,6929
-aioamazondevices-3.4.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-3.4.0.dist-info/RECORD,,