aioamazondevices 6.1.2__py3-none-any.whl → 6.2.0__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -20,6 +20,7 @@ from aiohttp import (
     ClientConnectorError,
     ClientResponse,
     ClientSession,
+    ContentTypeError,
 )
 from bs4 import BeautifulSoup, Tag
 from langcodes import Language, standardize_tag
@@ -29,6 +30,7 @@ from yarl import URL
 from . import __version__
 from .const import (
     _LOGGER,
+    ALEXA_INFO_SKILLS,
     AMAZON_APP_BUNDLE_ID,
     AMAZON_APP_ID,
     AMAZON_APP_NAME,
@@ -534,7 +536,7 @@ class AmazonEchoApi:
             input_data=body,
             json_data=True,
         )
-        resp_json = await raw_resp.json()
+        resp_json = await self._response_to_json(raw_resp)
 
         if raw_resp.status != HTTPStatus.OK:
             msg = resp_json["response"]["error"]["message"]
@@ -599,7 +601,7 @@ class AmazonEchoApi:
             json_data=True,
         )
 
-        return cast("dict", await raw_resp.json())
+        return await self._response_to_json(raw_resp)
 
     async def _get_sensors_states(
         self,
@@ -655,6 +657,19 @@ class AmazonEchoApi:
 
         return device_sensors
 
+    async def _response_to_json(self, raw_resp: ClientResponse) -> dict[str, Any]:
+        """Convert response to JSON, if possible."""
+        try:
+            data = await raw_resp.json(loads=orjson.loads)
+            if not data:
+                _LOGGER.warning("Empty JSON data received")
+                data = {}
+            return cast("dict[str, Any]", data)
+        except ContentTypeError as exc:
+            raise ValueError("Response not in JSON format") from exc
+        except orjson.JSONDecodeError as exc:
+            raise ValueError("Response with corrupted JSON format") from exc
+
     async def login_mode_interactive(self, otp_code: str) -> dict[str, Any]:
         """Login to Amazon interactively via OTP."""
         _LOGGER.debug(
@@ -756,7 +771,7 @@ class AmazonEchoApi:
             method=HTTPMethod.GET,
             url=f"https://alexa.amazon.{self._domain}/api/welcome",
         )
-        json_data = await raw_resp.json()
+        json_data = await self._response_to_json(raw_resp)
         return cast(
             "str", json_data.get("alexaHostName", f"alexa.amazon.{self._domain}")
         )
@@ -802,8 +817,7 @@ class AmazonEchoApi:
             url=f"https://alexa.amazon.{self._domain}{URI_DEVICES}",
         )
 
-        response_data = await raw_resp.text()
-        json_data = {} if len(response_data) == 0 else await raw_resp.json()
+        json_data = await self._response_to_json(raw_resp)
 
         _LOGGER.debug("JSON devices data: %s", scrub_fields(json_data))
 
@@ -865,7 +879,7 @@ class AmazonEchoApi:
             )
             return False
 
-        resp_json = await raw_resp.json()
+        resp_json = await self._response_to_json(raw_resp)
         if not (authentication := resp_json.get("authentication")):
             _LOGGER.debug('Session not authenticated: reply missing "authentication"')
             return False
@@ -985,6 +999,10 @@ class AmazonEchoApi:
                     "uri": "connection://AMAZON.Launch/" + message_body,
                 },
             }
+        elif message_type in ALEXA_INFO_SKILLS:
+            payload = {
+                **base_payload,
+            }
         else:
             raise ValueError(f"Message type <{message_type}> is not recognised")
 
@@ -1075,6 +1093,14 @@ class AmazonEchoApi:
             device, AmazonSequenceType.LaunchSkill, message_body
         )
 
+    async def call_alexa_info_skill(
+        self,
+        device: AmazonDevice,
+        message_type: str,
+    ) -> None:
+        """Call Info skill.  See ALEXA_INFO_SKILLS . const."""
+        return await self._send_message(device, message_type, "")
+
     async def set_do_not_disturb(self, device: AmazonDevice, state: bool) -> None:
         """Set do_not_disturb flag."""
         payload = {
@@ -1124,7 +1150,7 @@ class AmazonEchoApi:
             _LOGGER.debug("Failed to refresh data")
             return False, {}
 
-        json_response = await raw_resp.json()
+        json_response = await self._response_to_json(raw_resp)
         _LOGGER.debug("Refresh data json:\n%s ", json_response)
 
         if data_type == REFRESH_ACCESS_TOKEN and (
@@ -1132,7 +1158,7 @@ class AmazonEchoApi:
         ):
             self._login_stored_data[REFRESH_ACCESS_TOKEN] = new_token
             self.expires_in = datetime.now(tz=UTC).timestamp() + int(
-                json_response.get("expires_in")
+                json_response.get("expires_in", 0)
             )
             return True, json_response
 

aioamazondevices/const.py

@@ -432,3 +432,23 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "hw_version": "Gen2",
     },
 }
+
+ALEXA_INFO_SKILLS = [
+    "Alexa.Calendar.PlayToday",
+    "Alexa.Calendar.PlayTomorrow",
+    "Alexa.Calendar.PlayNext",
+    "Alexa.Date.Play",
+    "Alexa.Time.Play",
+    "Alexa.News.NationalNews",
+    "Alexa.FlashBriefing.Play",
+    "Alexa.Traffic.Play",
+    "Alexa.Weather.Play",
+    "Alexa.CleanUp.Play",
+    "Alexa.GoodMorning.Play",
+    "Alexa.SingASong.Play",
+    "Alexa.FunFact.Play",
+    "Alexa.Joke.Play",
+    "Alexa.TellStory.Play",
+    "Alexa.ImHome.Play",
+    "Alexa.GoodNight.Play",
+]

{aioamazondevices-6.1.2.dist-info → aioamazondevices-6.2.0.dist-info}/METADATA

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

aioamazondevices-6.2.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+aioamazondevices/__init__.py,sha256=oT6YOexUE4rV5rAbI-rUuZ6XGk2jXwetnm_lzg-wTSU,276
+aioamazondevices/api.py,sha256=spUjgxRW9qPKVzV9RwIX4QzkxrqwCrvM-MbdSxAE6u4,41973
+aioamazondevices/const.py,sha256=38dhNRpwEJf0FgFQGjt3ONhLdQxjiNrnlcrmQ1AY8oU,11306
+aioamazondevices/exceptions.py,sha256=JDnSFi_7oEhqK31sHXf0S_cyMoMjiRJuLp4ow7mYgLY,643
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices/query.py,sha256=AGHHzefzfYzB7RLWPtlFxYc_rpUZdoeApsU2jYz3urQ,2053
+aioamazondevices/sounds.py,sha256=CXMDk-KoKVFxBdVAw3MeOClqgpzcVDxvQhFOJp7qX-Y,1896
+aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
+aioamazondevices-6.2.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-6.2.0.dist-info/METADATA,sha256=HLWbqGs_h6-Jb-Ck5ojVO3S87c_KLT8MiuIbxAsOiU8,7623
+aioamazondevices-6.2.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-6.2.0.dist-info/RECORD,,

aioamazondevices-6.1.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-aioamazondevices/__init__.py,sha256=E44EI2JWNaxJUHaUZZIdgRkO7_5H3ArkUwG6zQ4vuss,276
-aioamazondevices/api.py,sha256=43jaKpbMXNMsyR4iIvIW0FESlj7OhJMhaxcbLVFvvu0,40947
-aioamazondevices/const.py,sha256=bqJmaStichdm0zB1RQYXa4OPz2gU2JnmUFQHeItlnZE,10808
-aioamazondevices/exceptions.py,sha256=JDnSFi_7oEhqK31sHXf0S_cyMoMjiRJuLp4ow7mYgLY,643
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices/query.py,sha256=AGHHzefzfYzB7RLWPtlFxYc_rpUZdoeApsU2jYz3urQ,2053
-aioamazondevices/sounds.py,sha256=CXMDk-KoKVFxBdVAw3MeOClqgpzcVDxvQhFOJp7qX-Y,1896
-aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
-aioamazondevices-6.1.2.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-6.1.2.dist-info/METADATA,sha256=CbbSegxCc24kR6kxciv61wBy4-ihMj5Rdbw0T6c-va0,7623
-aioamazondevices-6.1.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-6.1.2.dist-info/RECORD,,