aioamazondevices 1.4.1__py3-none-any.whl → 1.5.0__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -8,7 +8,7 @@ import uuid
 from dataclasses import dataclass
 from datetime import UTC, datetime, timedelta
 from http import HTTPStatus
-from http.cookies import SimpleCookie
+from http.cookies import Morsel
 from pathlib import Path
 from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
@@ -54,6 +54,7 @@ class AmazonDevice:
     device_family: str
     device_type: str
     device_owner_customer_id: str
+    device_cluster_members: list[str]
     online: bool
     serial_number: str
     software_version: str
@@ -96,15 +97,16 @@ class AmazonEchoApi:
         self._save_raw_data = save_raw_data
         self._login_stored_data = login_data
         self._serial = self._serial_number()
+        self._list_for_clusters: dict[str, str] = {}
 
         self.session: ClientSession
 
-    def _load_website_cookies(self) -> list[SimpleCookie]:
+    def _load_website_cookies(self) -> dict[str, str]:
         """Get website cookies, if avaliables."""
         if not self._login_stored_data:
-            return []
+            return {}
 
-        return cast("list", self._login_stored_data["website_cookies"])
+        return cast("dict", self._login_stored_data["website_cookies"])
 
     def _serial_number(self) -> str:
         """Get or calculate device serial number."""
@@ -255,7 +257,6 @@ class AmazonEchoApi:
             data=input_data if not json_data else orjson.dumps(input_data),
             cookies=self._load_website_cookies(),
             headers=headers,
-            allow_redirects=True,
         )
         content_type: str = resp.headers.get("Content-Type", "")
         _LOGGER.debug(
@@ -363,7 +364,7 @@ class AmazonEchoApi:
             input_data=body,
             json_data=True,
         )
-        resp_json = resp.json()
+        resp_json = await resp.json()
 
         if resp.status != HTTPStatus.OK:
             _LOGGER.error(
@@ -374,7 +375,7 @@ class AmazonEchoApi:
             raise CannotRegisterDevice(resp_json)
 
         await self._save_to_file(
-            resp.text,
+            await resp.text(),
             url=register_url,
             extension=JSON_EXTENSION,
         )
@@ -521,7 +522,8 @@ class AmazonEchoApi:
             _LOGGER.debug("Response data: |%s|", response_data)
 
             if not self._csrf_cookie:
-                self._csrf_cookie = raw_resp.cookies.get(CSRF_COOKIE).value
+                self._csrf_cookie = raw_resp.cookies.get(CSRF_COOKIE, Morsel()).value
+                _LOGGER.error("CSRF cookie value: <%s>", self._csrf_cookie)
 
             json_data = {} if len(response_data) == 0 else await raw_resp.json()
 
@@ -536,29 +538,44 @@ class AmazonEchoApi:
 
         final_devices_list: dict[str, AmazonDevice] = {}
         for device in devices.values():
+            devices_node = device[NODE_DEVICES]
+            preferences_node = device.get(NODE_PREFERENCES)
+            do_not_disturb_node = device[NODE_DO_NOT_DISTURB]
+            bluetooth_node = device[NODE_BLUETOOTH]
             # Remove stale, orphaned and virtual devices
             if (
                 NODE_DEVICES not in device
-                or device[NODE_DEVICES].get("deviceType") == AMAZON_DEVICE_TYPE
+                or devices_node.get("deviceType") == AMAZON_DEVICE_TYPE
             ):
                 continue
 
-            serial_number: str = device[NODE_DEVICES]["serialNumber"]
-            preferences = device.get(NODE_PREFERENCES)
+            serial_number: str = devices_node["serialNumber"]
             final_devices_list[serial_number] = AmazonDevice(
-                account_name=device[NODE_DEVICES]["accountName"],
-                capabilities=device[NODE_DEVICES]["capabilities"],
-                device_family=device[NODE_DEVICES]["deviceFamily"],
-                device_type=device[NODE_DEVICES]["deviceType"],
-                device_owner_customer_id=device[NODE_DEVICES]["deviceOwnerCustomerId"],
-                online=device[NODE_DEVICES]["online"],
+                account_name=devices_node["accountName"],
+                capabilities=devices_node["capabilities"],
+                device_family=devices_node["deviceFamily"],
+                device_type=devices_node["deviceType"],
+                device_owner_customer_id=devices_node["deviceOwnerCustomerId"],
+                device_cluster_members=(
+                    devices_node["clusterMembers"] or [serial_number]
+                ),
+                online=devices_node["online"],
                 serial_number=serial_number,
-                software_version=device[NODE_DEVICES]["softwareVersion"],
-                do_not_disturb=device[NODE_DO_NOT_DISTURB]["enabled"],
-                response_style=preferences["responseStyle"] if preferences else None,
-                bluetooth_state=device[NODE_BLUETOOTH]["online"],
+                software_version=devices_node["softwareVersion"],
+                do_not_disturb=do_not_disturb_node["enabled"],
+                response_style=(
+                    preferences_node["responseStyle"] if preferences_node else None
+                ),
+                bluetooth_state=bluetooth_node["online"],
             )
 
+        self._list_for_clusters.update(
+            {
+                device.serial_number: device.device_type
+                for device in final_devices_list.values()
+            }
+        )
+
         return final_devices_list
 
     async def auth_check_status(self) -> bool:
@@ -583,18 +600,71 @@ class AmazonEchoApi:
         _LOGGER.debug("Session authenticated: %s", authenticated)
         return bool(authenticated)
 
-    async def call_alexa_speak(
-        self,
-        device: AmazonDevice,
-        message_body: str,
-    ) -> dict[str, Any]:
-        """Call Alexa.Speak to send a message."""
+    async def _send_message(
+        self, device: AmazonDevice, message_type: str, message_body: str
+    ) -> None:
+        """Send message to specific device."""
         locale_data = Locale.parse(f"und_{self._login_country_code}")
         locale = f"{locale_data.language}-{locale_data.language}"
 
         if not self._login_stored_data:
             _LOGGER.warning("Trying to send message before login")
-            return {}
+            return
+
+        payload: dict[str, Any]
+        if message_type == "Alexa.Speak":
+            payload = {
+                "deviceType": device.device_type,
+                "deviceSerialNumber": device.serial_number,
+                "locale": locale,
+                "customerId": device.device_owner_customer_id,
+                "textToSpeak": message_body,
+                "target": {
+                    "customerId": device.device_owner_customer_id,
+                    "devices": [
+                        {
+                            "deviceSerialNumber": device.serial_number,
+                            "deviceTypeId": device.device_type,
+                        },
+                    ],
+                },
+                "skillId": "amzn1.ask.1p.saysomething",
+            }
+        else:
+            playback_devices: list[dict[str, str]] = [
+                {
+                    "deviceSerialNumber": serial,
+                    "deviceTypeId": self._list_for_clusters[serial],
+                }
+                for serial in device.device_cluster_members
+                if serial in self._list_for_clusters
+            ]
+
+            payload = {
+                "deviceType": device.device_type,
+                "deviceSerialNumber": device.serial_number,
+                "locale": locale,
+                "customerId": device.device_owner_customer_id,
+                "expireAfter": "PT5S",
+                "content": [
+                    {
+                        "locale": locale,
+                        "display": {
+                            "title": "Home Assistant",
+                            "body": message_body,
+                        },
+                        "speak": {
+                            "type": "text",
+                            "value": message_body,
+                        },
+                    }
+                ],
+                "target": {
+                    "customerId": device.device_owner_customer_id,
+                    "devices": playback_devices,
+                },
+                "skillId": "amzn1.ask.1p.routines.messaging",
+            }
 
         sequence = {
             "@type": "com.amazon.alexa.behaviors.model.Sequence",
@@ -603,28 +673,13 @@ class AmazonEchoApi:
                 "nodesToExecute": [
                     {
                         "@type": "com.amazon.alexa.behaviors.model.OpaquePayloadOperationNode",  # noqa: E501
-                        "type": "Alexa.Speak",
-                        "operationPayload": {
-                            "deviceType": device.device_type,
-                            "deviceSerialNumber": device.serial_number,
-                            "locale": locale,
-                            "customerId": device.device_owner_customer_id,
-                            "textToSpeak": message_body,
-                            "target": {
-                                "customerId": device.device_owner_customer_id,
-                                "devices": [
-                                    {
-                                        "deviceSerialNumber": device.serial_number,
-                                        "deviceTypeId": device.device_type,
-                                    },
-                                ],
-                            },
-                            "skillId": "amzn1.ask.1p.saysomething",
-                        },
+                        "type": message_type,
+                        "operationPayload": payload,
                     },
                 ],
             },
         }
+
         node_data = {
             "behaviorId": "PREVIEW",
             "sequenceJson": orjson.dumps(sequence).decode("utf-8"),
@@ -639,4 +694,20 @@ class AmazonEchoApi:
             json_data=True,
         )
 
-        return node_data
+        return
+
+    async def call_alexa_speak(
+        self,
+        device: AmazonDevice,
+        message_body: str,
+    ) -> None:
+        """Call Alexa.Speak to send a message."""
+        return await self._send_message(device, "Alexa.Speak", message_body)
+
+    async def call_alexa_announcement(
+        self,
+        device: AmazonDevice,
+        message_body: str,
+    ) -> None:
+        """Call AlexaAnnouncement to send a message."""
+        return await self._send_message(device, "AlexaAnnouncement", message_body)

{aioamazondevices-1.4.1.dist-info → aioamazondevices-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 1.4.1
+Version: 1.5.0
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli
@@ -82,7 +82,8 @@ The script accept command line arguments or a library_test.json config file:
   "country": "IT",
   "email": "<my_address@gmail.com>",
   "password": "<my_password>",
-  "device_name": "Echo Dot Livingroom",
+  "device_name_speak": "Echo Dot Livingroom",
+  "device_name_announcement": "Everywhere",
   "login_data_file": "out/login_data.json",
   "save_raw_data": "True"
 }

aioamazondevices-1.5.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+aioamazondevices/__init__.py,sha256=c7Bi99W-tVQoCNwjK33ROJQCAZG1GcwSjaCvz9kMOwM,276
+aioamazondevices/api.py,sha256=_4kojHD_86milDMLrbVscHgNg9nerq8mE6k7xOXOAeE,25874
+aioamazondevices/const.py,sha256=6BBEg_q2BkYVYJcz3hMrLNyEwOJBWziPSStMzftWQLg,2106
+aioamazondevices/exceptions.py,sha256=qK_Hak9pc-lC2FPW-0i4rYIwNpEOHMmA9Rii8F2lkQo,1260
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices-1.5.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-1.5.0.dist-info/METADATA,sha256=m03j63zvtCHK_AWQbVBSaUsB5yRhlZTSWVPtZ389xdo,5014
+aioamazondevices-1.5.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-1.5.0.dist-info/RECORD,,

{aioamazondevices-1.4.1.dist-info → aioamazondevices-1.5.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any

aioamazondevices-1.4.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-aioamazondevices/__init__.py,sha256=ilLSTYfBxHU79HSyEtxbxYfY0tiPoQvOGm2HAx1zVm8,276
-aioamazondevices/api.py,sha256=FLugYMynG9po9W-pwSM0ppNM-TCM2Dz3u4Ygo9fXFgI,23556
-aioamazondevices/const.py,sha256=6BBEg_q2BkYVYJcz3hMrLNyEwOJBWziPSStMzftWQLg,2106
-aioamazondevices/exceptions.py,sha256=qK_Hak9pc-lC2FPW-0i4rYIwNpEOHMmA9Rii8F2lkQo,1260
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices-1.4.1.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-1.4.1.dist-info/METADATA,sha256=d1dxm4-5H-J3mvA7i0diHn0gyKQF4QwqkxPjCPApJ9A,4964
-aioamazondevices-1.4.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-aioamazondevices-1.4.1.dist-info/RECORD,,