aioamazondevices 3.5.0__tar.gz → 3.5.2__tar.gz

{aioamazondevices-3.5.0 → aioamazondevices-3.5.2}/PKG-INFO

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

{aioamazondevices-3.5.0 → aioamazondevices-3.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioamazondevices"
-version = "3.5.0"
+version = "3.5.2"
 requires-python = ">=3.12"
 description = "Python library to control Amazon devices"
 authors = [
@@ -98,5 +98,5 @@ module = "tests.*"
 allow_untyped_defs = true
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
+requires = ["poetry-core>=2.0"]
 build-backend = "poetry.core.masonry.api"

{aioamazondevices-3.5.0 → aioamazondevices-3.5.2}/src/aioamazondevices/__init__.py

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

{aioamazondevices-3.5.0 → aioamazondevices-3.5.2}/src/aioamazondevices/api.py

@@ -129,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
@@ -158,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]:
@@ -584,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-3.5.0 → aioamazondevices-3.5.2}/src/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",
@@ -147,6 +149,7 @@ DEVICE_TO_IGNORE: list[str] = [
     AMAZON_DEVICE_TYPE,  # Alexa App for iOS
     "A2TF17PFR55MTB",  # Alexa App for Android
     "A1RTAM01W29CUP",  # Alexa App for PC
+    "A18BI6KPKDOEI4",  # ecobee4 Smart Thermostat with Built-in Alexa - issue #199
 ]
 
 DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
@@ -170,6 +173,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Plus",
         "hw_version": "Gen2",
     },
+    "A1C66CX2XD756O": {
+        "model": "Fire Tablet HD 8",
+        "hw_version": "Gen8",
+    },
     "A1EIANJ7PNB0Q7": {
         "model": "Echo Show 15",
         "hw_version": "Gen1",
@@ -182,12 +189,16 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Fire TV Stick 4K",
         "hw_version": "Gen2",
     },
+    "A1Q7QCGNMXAKYW": {
+        "model": "Fire Tablet 7",
+        "hw_version": "Gen9",
+    },
     "A1RABVCI4QCIKC": {
         "model": "Echo Dot",
         "hw_version": "Gen3",
     },
     "A1TD5Z1R8IWBHA ": {
-        "model": "Fire HD 8",
+        "model": "Fire Tablet HD 8",
         "hw_version": "Gen12",
     },
     "A1VGB7MHSIEYFK": {
@@ -248,9 +259,13 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "hw_version": "Gen5",
     },
     "A2N49KXGVA18AR": {
-        "model": "Fire HD 10 Plus",
+        "model": "Fire Tablet HD 10 Plus",
         "hw_version": "Gen11",
     },
+    "A2RU4B77X9R9NZ": {
+        "model": "Echo Link Amp",
+        "hw_version": None,
+    },
     "A2U21SRK4QGSE1": {
         "model": "Echo Dot",
         "hw_version": "Gen4",
@@ -267,6 +282,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Dot",
         "hw_version": "Gen3",
     },
+    "A31DTMEEVDDOIV": {
+        "model": "Fire TV Stick Lite",
+        "hw_version": "Gen1",
+    },
     "A32DDESGESSHZA": {
         "model": "Echo Dot",
         "hw_version": "Gen3",
@@ -279,6 +298,15 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Smart TV 4K",
         "hw_version": "4 Series",
     },
+    "A38949IHXHRQ5P": {
+        "model": "Echo Tap",
+        "hw_version": "Gen1",
+    },
+    "A39OV95SPFQ9YG": {
+        "manufacturer": "Sonos Inc.",
+        "model": "Sonos Era 100",
+        "hw_version": None,
+    },
     "A3C9PE6TNYLTCH": {
         "model": "Speaker Group",
         "hw_version": None,
@@ -291,10 +319,18 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "FireTV 4k MAX",
         "hw_version": "Gen1",
     },
+    "A3FX4UWTP28V1P": {
+        "model": "Echo",
+        "hw_version": "Gen3",
+    },
     "A3HF4YRA2L7XGC": {
         "model": "Fire TV Cube",
         "hw_version": "Gen1",
     },
+    "A3HND3J60V1OXX": {
+        "model": "Echo Loop",
+        "hw_version": None,
+    },
     "A3NPD82ABCPIDP": {
         "manufacturer": "Sonos Inc.",
         "model": "Sonos Beam",