aioamazondevices 3.2.6__py3-none-any.whl → 3.2.8__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -84,6 +84,7 @@ class AmazonDevice:
     device_type: str
     device_owner_customer_id: str
     device_cluster_members: list[str]
+    device_locale: str
     online: bool
     serial_number: str
     software_version: str
@@ -338,6 +339,14 @@ class AmazonEchoApi:
             )
         return False
 
+    async def _ignore_phoenix_error(self, response: ClientResponse) -> bool:
+        """Return true if error is due to phoenix endpoint."""
+        # Endpoint URI_IDS replies with error 199 or 299
+        # during maintenance
+        return response.status in [HTTP_ERROR_199, HTTP_ERROR_299] and (
+            URI_IDS in response.url.path
+        )
+
     async def _http_phrase_error(self, error: int) -> str:
         """Convert numeric error in human phrase."""
         if error == HTTP_ERROR_199:
@@ -413,10 +422,12 @@ class AmazonEchoApi:
                 HTTPStatus.PROXY_AUTHENTICATION_REQUIRED,
                 HTTPStatus.UNAUTHORIZED,
             ]:
-                raise CannotAuthenticate(self._http_phrase_error(resp.status))
-            if not await self._ignore_ap_signin_error(resp):
+                raise CannotAuthenticate(await self._http_phrase_error(resp.status))
+            if not await self._ignore_ap_signin_error(
+                resp
+            ) and not await self._ignore_phoenix_error(resp):
                 raise CannotRetrieveData(
-                    f"Request failed: {self._http_phrase_error(resp.status)}"
+                    f"Request failed: {await self._http_phrase_error(resp.status)}"
                 )
 
         await self._save_to_file(
@@ -527,7 +538,9 @@ class AmazonEchoApi:
                 obfuscate_email(self._login_email),
                 msg,
             )
-            raise CannotRegisterDevice(f"{self._http_phrase_error(resp.status)}: {msg}")
+            raise CannotRegisterDevice(
+                f"{await self._http_phrase_error(resp.status)}: {msg}"
+            )
 
         success_response = resp_json["response"]["success"]
 
@@ -572,20 +585,19 @@ class AmazonEchoApi:
 
         resp_me_json = await resp_me.json()
         market = resp_me_json["marketPlaceDomainName"]
-        language = resp_me_json["marketPlaceLocale"]
 
         _domain = f"https://www.amazon.{self._domain}"
 
-        if market != _domain or language != self._language:
-            _LOGGER.debug(
-                "Selected country <%s> doesn't matches Amazon account:\n%s\n vs \n%s",
+        if market != _domain:
+            _LOGGER.warning(
+                "Selected country <%s> doesn't matches Amazon API reply:\n%s\n vs \n%s",
                 self._login_country_code.upper(),
-                {"site  ": _domain, "locale": self._language},
-                {"market": market, "locale": language},
+                {"site  ": _domain},
+                {"market": market},
             )
             raise WrongCountry
 
-        _LOGGER.debug("User selected country matches Amazon account one")
+        _LOGGER.debug("User selected country matches Amazon API one")
 
     async def _get_devices_ids(self) -> list[dict[str, str]]:
         """Retrieve devices entityId and applianceId."""
@@ -594,6 +606,16 @@ class AmazonEchoApi:
             url=f"https://alexa.amazon.{self._domain}{URI_IDS}",
             amazon_user_agent=False,
         )
+
+        # Sensors data not available
+        if raw_resp.status != HTTPStatus.OK:
+            _LOGGER.warning(
+                "Sensors data not available [%s error '%s'], skipping",
+                URI_IDS,
+                await self._http_phrase_error(raw_resp.status),
+            )
+            return []
+
         json_data = await raw_resp.json()
 
         network_detail = orjson.loads(json_data["networkDetail"])
@@ -830,7 +852,7 @@ class AmazonEchoApi:
             if not devices_node or (devices_node.get("deviceType") in DEVICE_TO_IGNORE):
                 continue
 
-            preferences_node = device.get(NODE_PREFERENCES)
+            preferences_node = device.get(NODE_PREFERENCES, {})
             do_not_disturb_node = device[NODE_DO_NOT_DISTURB]
             bluetooth_node = device[NODE_BLUETOOTH]
             identifier_node = device.get(NODE_IDENTIFIER, {})
@@ -852,13 +874,12 @@ class AmazonEchoApi:
                 device_cluster_members=(
                     devices_node["clusterMembers"] or [serial_number]
                 ),
+                device_locale=preferences_node.get("locale", self._language),
                 online=devices_node["online"],
                 serial_number=serial_number,
                 software_version=devices_node["softwareVersion"],
                 do_not_disturb=do_not_disturb_node["enabled"],
-                response_style=(
-                    preferences_node["responseStyle"] if preferences_node else None
-                ),
+                response_style=preferences_node.get("responseStyle"),
                 bluetooth_state=bluetooth_node["online"],
                 entity_id=identifier_node.get("entityId"),
                 appliance_id=identifier_node.get("applianceId"),
@@ -925,7 +946,7 @@ class AmazonEchoApi:
         base_payload = {
             "deviceType": device.device_type,
             "deviceSerialNumber": device.serial_number,
-            "locale": self._language,
+            "locale": device.device_locale,
             "customerId": device.device_owner_customer_id,
         }
 
@@ -960,7 +981,7 @@ class AmazonEchoApi:
                 "expireAfter": "PT5S",
                 "content": [
                     {
-                        "locale": self._language,
+                        "locale": device.device_locale,
                         "display": {
                             "title": "Home Assistant",
                             "body": message_body,

{aioamazondevices-3.2.6.dist-info → aioamazondevices-3.2.8.dist-info}/METADATA

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

{aioamazondevices-3.2.6.dist-info → aioamazondevices-3.2.8.dist-info}/RECORD

@@ -1,11 +1,11 @@
-aioamazondevices/__init__.py,sha256=Y9scCZ8cAVyumMgEa-g2asKv_sIUXqwypsGuX1T_zx8,276
-aioamazondevices/api.py,sha256=VCOcIufsCHYKRBAC-q5Yfwj5Cek8Wt-ZT7o2Lg0kzyU,39691
+aioamazondevices/__init__.py,sha256=W7DER8aV-e-yKCMzNIRzrK4atTh5CSbPVGmumiVNPlc,276
+aioamazondevices/api.py,sha256=jDXVTwR4yA-yPskCqpmeT9CCN-EGuHQqQmjVwcU9L1o,40399
 aioamazondevices/const.py,sha256=mgPTTRLLets0vU8MTvVA3pGWGHCgVLMBRZWsIVtCG8s,9043
 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.2.6.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-3.2.6.dist-info/METADATA,sha256=tfCCE99xigQguDFEzyECNfng7eQqA0e_CmNkSJ9_5i8,5234
-aioamazondevices-3.2.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-3.2.6.dist-info/RECORD,,
+aioamazondevices-3.2.8.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-3.2.8.dist-info/METADATA,sha256=nsCTEGVeOr37isIHVQgDCUrV72xuUMn7wtFLwc3WhlY,5234
+aioamazondevices-3.2.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-3.2.8.dist-info/RECORD,,