aioamazondevices 1.5.0__tar.gz → 1.7.0__tar.gz

{aioamazondevices-1.5.0 → aioamazondevices-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 1.5.0
+Version: 1.7.0
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli
@@ -82,8 +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_speak": "Echo Dot Livingroom",
-  "device_name_announcement": "Everywhere",
+  "single_device_name": "Echo Dot Livingroom",
+  "cluster_device_name": "Everywhere",
   "login_data_file": "out/login_data.json",
   "save_raw_data": "True"
 }

{aioamazondevices-1.5.0 → aioamazondevices-1.7.0}/README.md

@@ -54,8 +54,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_speak": "Echo Dot Livingroom",
-  "device_name_announcement": "Everywhere",
+  "single_device_name": "Echo Dot Livingroom",
+  "cluster_device_name": "Everywhere",
   "login_data_file": "out/login_data.json",
   "save_raw_data": "True"
 }

{aioamazondevices-1.5.0 → aioamazondevices-1.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioamazondevices"
-version = "1.5.0"
+version = "1.7.0"
 description = "Python library to control Amazon devices"
 authors = ["Simone Chemelli <simone.chemelli@gmail.com>"]
 license = "Apache-2.0"

{aioamazondevices-1.5.0 → aioamazondevices-1.7.0}/src/aioamazondevices/__init__.py

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

{aioamazondevices-1.5.0 → aioamazondevices-1.7.0}/src/aioamazondevices/api.py

@@ -7,6 +7,7 @@ import secrets
 import uuid
 from dataclasses import dataclass
 from datetime import UTC, datetime, timedelta
+from enum import StrEnum
 from http import HTTPStatus
 from http.cookies import Morsel
 from pathlib import Path
@@ -63,6 +64,22 @@ class AmazonDevice:
     bluetooth_state: bool
 
 
+class AmazonSequenceType(StrEnum):
+    """Amazon sequence types."""
+
+    Announcement = "AlexaAnnouncement"
+    Speak = "Alexa.Speak"
+    Sound = "Alexa.Sound"
+    Music = "Alexa.Music.PlaySearchPhrase"
+
+
+class AmazonMusicSource(StrEnum):
+    """Amazon music sources."""
+
+    Radio = "TUNEIN"
+    AmazonMusic = "AMAZON_MUSIC"
+
+
 class AmazonEchoApi:
     """Queries Amazon for Echo devices."""
 
@@ -601,7 +618,11 @@ class AmazonEchoApi:
         return bool(authenticated)
 
     async def _send_message(
-        self, device: AmazonDevice, message_type: str, message_body: str
+        self,
+        device: AmazonDevice,
+        message_type: str,
+        message_body: str,
+        message_source: AmazonMusicSource | None = None,
     ) -> None:
         """Send message to specific device."""
         locale_data = Locale.parse(f"und_{self._login_country_code}")
@@ -611,13 +632,17 @@ class AmazonEchoApi:
             _LOGGER.warning("Trying to send message before login")
             return
 
+        base_payload = {
+            "deviceType": device.device_type,
+            "deviceSerialNumber": device.serial_number,
+            "locale": locale,
+            "customerId": device.device_owner_customer_id,
+        }
+
         payload: dict[str, Any]
-        if message_type == "Alexa.Speak":
+        if message_type == AmazonSequenceType.Speak:
             payload = {
-                "deviceType": device.device_type,
-                "deviceSerialNumber": device.serial_number,
-                "locale": locale,
-                "customerId": device.device_owner_customer_id,
+                **base_payload,
                 "textToSpeak": message_body,
                 "target": {
                     "customerId": device.device_owner_customer_id,
@@ -630,7 +655,7 @@ class AmazonEchoApi:
                 },
                 "skillId": "amzn1.ask.1p.saysomething",
             }
-        else:
+        elif message_type == AmazonSequenceType.Announcement:
             playback_devices: list[dict[str, str]] = [
                 {
                     "deviceSerialNumber": serial,
@@ -641,10 +666,7 @@ class AmazonEchoApi:
             ]
 
             payload = {
-                "deviceType": device.device_type,
-                "deviceSerialNumber": device.serial_number,
-                "locale": locale,
-                "customerId": device.device_owner_customer_id,
+                **base_payload,
                 "expireAfter": "PT5S",
                 "content": [
                     {
@@ -665,6 +687,19 @@ class AmazonEchoApi:
                 },
                 "skillId": "amzn1.ask.1p.routines.messaging",
             }
+        elif message_type == AmazonSequenceType.Sound:
+            payload = {
+                **base_payload,
+                "soundStringId": message_body,
+                "skillId": "amzn1.ask.1p.sound",
+            }
+        elif message_type == AmazonSequenceType.Music:
+            payload = {
+                **base_payload,
+                "searchPhrase": message_body,
+                "sanitizedSearchPhrase": message_body,
+                "musicProviderId": message_source,
+            }
 
         sequence = {
             "@type": "com.amazon.alexa.behaviors.model.Sequence",
@@ -702,7 +737,7 @@ class AmazonEchoApi:
         message_body: str,
     ) -> None:
         """Call Alexa.Speak to send a message."""
-        return await self._send_message(device, "Alexa.Speak", message_body)
+        return await self._send_message(device, AmazonSequenceType.Speak, message_body)
 
     async def call_alexa_announcement(
         self,
@@ -710,4 +745,25 @@ class AmazonEchoApi:
         message_body: str,
     ) -> None:
         """Call AlexaAnnouncement to send a message."""
-        return await self._send_message(device, "AlexaAnnouncement", message_body)
+        return await self._send_message(
+            device, AmazonSequenceType.Announcement, message_body
+        )
+
+    async def call_alexa_sound(
+        self,
+        device: AmazonDevice,
+        message_body: str,
+    ) -> None:
+        """Call Alexa.Sound to play sound."""
+        return await self._send_message(device, AmazonSequenceType.Sound, message_body)
+
+    async def call_alexa_music(
+        self,
+        device: AmazonDevice,
+        message_body: str,
+        message_source: AmazonMusicSource,
+    ) -> None:
+        """Call Alexa.Music.PlaySearchPhrase to play music."""
+        return await self._send_message(
+            device, AmazonSequenceType.Music, message_body, message_source
+        )