aioamazondevices 6.5.4__tar.gz → 8.0.0__tar.gz

{aioamazondevices-6.5.4 → aioamazondevices-8.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioamazondevices
-Version: 6.5.4
+Version: 8.0.0
 Summary: Python library to control Amazon devices
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -81,7 +81,6 @@ The script accept command line arguments or a library_test.json config file:
   "single_device_name": "Echo Dot Livingroom",
   "cluster_device_name": "Everywhere",
   "login_data_file": "out/login_data.json",
-  "save_raw_data": true,
   "test": true
 }
 ```
@@ -142,6 +141,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
                     <sub><b>Flo</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/francescolf">
+                    <img src="https://avatars.githubusercontent.com/u/14892143?v=4" width="100;" alt="francescolf"/>
+                    <br />
+                    <sub><b>Francesco Lo Faro</b></sub>
+                </a>
+            </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/lchavezcuu">
                     <img src="https://avatars.githubusercontent.com/u/22165856?v=4" width="100;" alt="lchavezcuu"/>
@@ -149,8 +157,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
                     <sub><b>Luis Chavez</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/maxmati">
                     <img src="https://avatars.githubusercontent.com/u/509560?v=4" width="100;" alt="maxmati"/>

{aioamazondevices-6.5.4 → aioamazondevices-8.0.0}/README.md

@@ -56,7 +56,6 @@ The script accept command line arguments or a library_test.json config file:
   "single_device_name": "Echo Dot Livingroom",
   "cluster_device_name": "Everywhere",
   "login_data_file": "out/login_data.json",
-  "save_raw_data": true,
   "test": true
 }
 ```
@@ -117,6 +116,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
                     <sub><b>Flo</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/francescolf">
+                    <img src="https://avatars.githubusercontent.com/u/14892143?v=4" width="100;" alt="francescolf"/>
+                    <br />
+                    <sub><b>Francesco Lo Faro</b></sub>
+                </a>
+            </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/lchavezcuu">
                     <img src="https://avatars.githubusercontent.com/u/22165856?v=4" width="100;" alt="lchavezcuu"/>
@@ -124,8 +132,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
                     <sub><b>Luis Chavez</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/maxmati">
                     <img src="https://avatars.githubusercontent.com/u/509560?v=4" width="100;" alt="maxmati"/>

{aioamazondevices-6.5.4 → aioamazondevices-8.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioamazondevices"
-version = "6.5.4"
+version = "8.0.0"
 requires-python = ">=3.12"
 description = "Python library to control Amazon devices"
 authors = [

{aioamazondevices-6.5.4 → aioamazondevices-8.0.0}/src/aioamazondevices/__init__.py

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

{aioamazondevices-6.5.4 → aioamazondevices-8.0.0}/src/aioamazondevices/api.py

@@ -3,15 +3,12 @@
 import asyncio
 import base64
 import hashlib
-import mimetypes
 import secrets
 import uuid
-from dataclasses import dataclass
+from collections.abc import Callable, Coroutine
 from datetime import UTC, datetime, timedelta
-from enum import StrEnum
 from http import HTTPMethod, HTTPStatus
 from http.cookies import Morsel
-from pathlib import Path
 from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
 
@@ -30,9 +27,13 @@ from multidict import MultiDictProxy
 from yarl import URL
 
 from . import __version__
-from .const import (
-    _LOGGER,
-    ALEXA_INFO_SKILLS,
+from .const.common import _LOGGER
+from .const.devices import (
+    DEVICE_TO_IGNORE,
+    DEVICE_TYPE_TO_MODEL,
+    SPEAKER_GROUP_FAMILY,
+)
+from .const.http import (
     AMAZON_APP_BUNDLE_ID,
     AMAZON_APP_ID,
     AMAZON_APP_NAME,
@@ -41,34 +42,30 @@ from .const import (
     AMAZON_DEVICE_SOFTWARE_VERSION,
     AMAZON_DEVICE_TYPE,
     ARRAY_WRAPPER,
-    BIN_EXTENSION,
-    COUNTRY_GROUPS,
     CSRF_COOKIE,
     DEFAULT_HEADERS,
     DEFAULT_SITE,
-    DEVICE_TO_IGNORE,
-    DEVICE_TYPE_TO_MODEL,
-    HTML_EXTENSION,
     HTTP_ERROR_199,
     HTTP_ERROR_299,
-    JSON_EXTENSION,
-    NOTIFICATION_ALARM,
-    NOTIFICATION_MUSIC_ALARM,
-    NOTIFICATION_REMINDER,
-    NOTIFICATION_TIMER,
-    NOTIFICATIONS_SUPPORTED,
-    RECURRING_PATTERNS,
     REFRESH_ACCESS_TOKEN,
     REFRESH_AUTH_COOKIES,
     REQUEST_AGENT,
-    SAVE_PATH,
-    SENSORS,
-    SPEAKER_GROUP_FAMILY,
     URI_DEVICES,
     URI_DND,
     URI_NEXUS_GRAPHQL,
     URI_NOTIFICATIONS,
     URI_SIGNIN,
+)
+from .const.metadata import ALEXA_INFO_SKILLS, SENSORS
+from .const.queries import QUERY_DEVICE_DATA, QUERY_SENSOR_STATE
+from .const.schedules import (
+    COUNTRY_GROUPS,
+    NOTIFICATION_ALARM,
+    NOTIFICATION_MUSIC_ALARM,
+    NOTIFICATION_REMINDER,
+    NOTIFICATION_TIMER,
+    NOTIFICATIONS_SUPPORTED,
+    RECURRING_PATTERNS,
     WEEKEND_EXCEPTIONS,
 )
 from .exceptions import (
@@ -78,70 +75,16 @@ from .exceptions import (
     CannotRetrieveData,
     WrongMethod,
 )
-from .query import QUERY_DEVICE_DATA, QUERY_SENSOR_STATE
+from .structures import (
+    AmazonDevice,
+    AmazonDeviceSensor,
+    AmazonMusicSource,
+    AmazonSchedule,
+    AmazonSequenceType,
+)
 from .utils import obfuscate_email, scrub_fields
 
 
-@dataclass
-class AmazonDeviceSensor:
-    """Amazon device sensor class."""
-
-    name: str
-    value: str | int | float
-    error: bool
-    error_type: str | None
-    error_msg: str | None
-    scale: str | None
-
-
-@dataclass
-class AmazonSchedule:
-    """Amazon schedule class."""
-
-    type: str  # alarm, reminder, timer
-    status: str
-    label: str
-    next_occurrence: datetime | None
-
-
-@dataclass
-class AmazonDevice:
-    """Amazon device class."""
-
-    account_name: str
-    capabilities: list[str]
-    device_family: str
-    device_type: str
-    device_owner_customer_id: str
-    household_device: bool
-    device_cluster_members: list[str]
-    online: bool
-    serial_number: str
-    software_version: str
-    entity_id: str | None
-    endpoint_id: str | None
-    sensors: dict[str, AmazonDeviceSensor]
-    notifications: dict[str, AmazonSchedule]
-
-
-class AmazonSequenceType(StrEnum):
-    """Amazon sequence types."""
-
-    Announcement = "AlexaAnnouncement"
-    Speak = "Alexa.Speak"
-    Sound = "Alexa.Sound"
-    Music = "Alexa.Music.PlaySearchPhrase"
-    TextCommand = "Alexa.TextCommand"
-    LaunchSkill = "Alexa.Operation.SkillConnections.Launch"
-
-
-class AmazonMusicSource(StrEnum):
-    """Amazon music sources."""
-
-    Radio = "TUNEIN"
-    AmazonMusic = "AMAZON_MUSIC"
-
-
 class AmazonEchoApi:
     """Queries Amazon for Echo devices."""
 
@@ -151,6 +94,8 @@ class AmazonEchoApi:
         login_email: str,
         login_password: str,
         login_data: dict[str, Any] | None = None,
+        save_to_file: Callable[[str | dict, str, str], Coroutine[Any, Any, None]]
+        | None = None,
     ) -> None:
         """Initialize the scanner."""
         # Check if there is a previous login, otherwise use default (US)
@@ -162,7 +107,7 @@ class AmazonEchoApi:
         self._login_password = login_password
 
         self._cookies = self._build_init_cookies()
-        self._save_raw_data = False
+        self._save_to_file = save_to_file
         self._login_stored_data = login_data or {}
         self._serial = self._serial_number()
         self._account_owner_customer_id: str | None = None
@@ -183,11 +128,6 @@ class AmazonEchoApi:
         """Return current Amazon domain."""
         return self._domain
 
-    def save_raw_data(self) -> None:
-        """Save raw data to disk."""
-        self._save_raw_data = True
-        _LOGGER.debug("Saving raw data to disk")
-
     def _country_specific_data(self, domain: str) -> None:
         """Set country specific data."""
         # Force lower case
@@ -387,6 +327,8 @@ class AmazonEchoApi:
         headers = DEFAULT_HEADERS.copy()
         headers.update({"User-Agent": REQUEST_AGENT[agent]})
         headers.update({"Accept-Language": self._language})
+        headers.update({"x-amzn-client": "aioamazondevices"})
+        headers.update({"x-amzn-build-version": __version__})
 
         if self._csrf_cookie:
             csrf = {CSRF_COOKIE: self._csrf_cookie}
@@ -463,57 +405,16 @@ class AmazonEchoApi:
                     f"Request failed: {await self._http_phrase_error(resp.status)}"
                 )
 
-        await self._save_to_file(
-            await resp.text(),
-            url,
-            mimetypes.guess_extension(content_type.split(";")[0]) or ".raw",
-        )
-
-        return BeautifulSoup(await resp.read() or "", "html.parser"), resp
+        raw_content = await resp.read()
 
-    async def _save_to_file(
-        self,
-        raw_data: str | dict,
-        url: str,
-        extension: str = HTML_EXTENSION,
-        output_path: str = SAVE_PATH,
-    ) -> None:
-        """Save response data to disk."""
-        if not self._save_raw_data or not raw_data:
-            return
-
-        output_dir = Path(output_path)
-        output_dir.mkdir(parents=True, exist_ok=True)
-
-        if url.startswith("http"):
-            url_split = url.split("/")
-            base_filename = f"{url_split[3]}-{url_split[4].split('?')[0]}"
-        else:
-            base_filename = url
-        fullpath = Path(output_dir, base_filename + extension)
-
-        data: str
-        if isinstance(raw_data, dict):
-            data = orjson.dumps(raw_data, option=orjson.OPT_INDENT_2).decode("utf-8")
-        elif extension in [HTML_EXTENSION, BIN_EXTENSION]:
-            data = raw_data
-        else:
-            data = orjson.dumps(
-                orjson.loads(raw_data),
-                option=orjson.OPT_INDENT_2,
-            ).decode("utf-8")
-
-        i = 2
-        while fullpath.exists():
-            filename = f"{base_filename}_{i!s}{extension}"
-            fullpath = Path(output_dir, filename)
-            i += 1
-
-        _LOGGER.warning("Saving data to %s", fullpath)
+        if self._save_to_file:
+            await self._save_to_file(
+                raw_content.decode("utf-8"),
+                url,
+                content_type,
+            )
 
-        with Path.open(fullpath, mode="w", encoding="utf-8") as file:
-            file.write(data)
-            file.write("\n")
+        return BeautifulSoup(raw_content or "", "html.parser"), resp
 
     async def _register_device(
         self,
@@ -613,6 +514,9 @@ class AmazonEchoApi:
         """Retrieve devices sensors states."""
         devices_sensors: dict[str, dict[str, AmazonDeviceSensor]] = {}
 
+        if not self._endpoints:
+            return {}
+
         endpoint_ids = list(self._endpoints.keys())
         payload = [
             {
@@ -972,7 +876,6 @@ class AmazonEchoApi:
         await self._domain_refresh_auth_cookies()
 
         self._login_stored_data.update({"site": f"https://www.amazon.{self._domain}"})
-        await self._save_to_file(self._login_stored_data, "login_data", JSON_EXTENSION)
 
         # Can take a little while to register device but we need it
         # to be able to pickout account customer ID

aioamazondevices-8.0.0/src/aioamazondevices/const/__init__.py

@@ -0,0 +1 @@
+"""aioamazondevices const package."""

aioamazondevices-8.0.0/src/aioamazondevices/const/common.py

@@ -0,0 +1,26 @@
+"""aioamazondevices Common const."""
+
+import logging
+
+_LOGGER = logging.getLogger(__package__)
+
+TO_REDACT = {
+    "address",
+    "address1",
+    "address2",
+    "address3",
+    "city",
+    "county",
+    "customerId",
+    "deviceAccountId",
+    "deviceAddress",
+    "deviceOwnerCustomerId",
+    "given_name",
+    "name",
+    "password",
+    "postalCode",
+    "searchCustomerId",
+    "state",
+    "street",
+    "user_id",
+}

aioamazondevices-6.5.4/src/aioamazondevices/const.py → aioamazondevices-8.0.0/src/aioamazondevices/const/devices.py

@@ -1,117 +1,10 @@
-"""Constants for Amazon devices."""
+"""aioamazondevices devices."""
 
-import logging
-
-_LOGGER = logging.getLogger(__package__)
-
-ARRAY_WRAPPER = "generatedArrayWrapper"
-
-HTTP_ERROR_199 = 199
-HTTP_ERROR_299 = 299
-
-TO_REDACT = {
-    "address",
-    "address1",
-    "address2",
-    "address3",
-    "city",
-    "county",
-    "customerId",
-    "deviceAccountId",
-    "deviceAddress",
-    "deviceOwnerCustomerId",
-    "given_name",
-    "name",
-    "password",
-    "postalCode",
-    "searchCustomerId",
-    "state",
-    "street",
-    "user_id",
-}
-
-# Amazon APP info
-AMAZON_APP_BUNDLE_ID = "com.amazon.echo"
-AMAZON_APP_ID = "MAPiOSLib/6.0/ToHideRetailLink"
-AMAZON_APP_NAME = "AioAmazonDevices"
-AMAZON_APP_VERSION = "2.2.663733.0"
-AMAZON_DEVICE_SOFTWARE_VERSION = "35602678"
-AMAZON_DEVICE_TYPE = "A2IVLV5VM2W81"
-AMAZON_CLIENT_OS = "18.5"
-
-DEFAULT_SITE = "https://www.amazon.com"
-DEFAULT_HEADERS = {
-    "Accept-Charset": "utf-8",
-    "Accept-Encoding": "gzip",
-    "Connection": "keep-alive",
-}
-CSRF_COOKIE = "csrf"
-REQUEST_AGENT = {
-    "Amazon": f"AmazonWebView/AmazonAlexa/{AMAZON_APP_VERSION}/iOS/{AMAZON_CLIENT_OS}/iPhone",  # noqa: E501
-    "Browser": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36 Edg/141.0.0.0",  # noqa: E501
-}
-
-REFRESH_ACCESS_TOKEN = "access_token"  # noqa: S105
-REFRESH_AUTH_COOKIES = "auth_cookies"
-
-URI_DEVICES = "/api/devices-v2/device"
-URI_DND = "/api/dnd/device-status-list"
-URI_NOTIFICATIONS = "/api/notifications"
-URI_SIGNIN = "/ap/signin"
-URI_NEXUS_GRAPHQL = "/nexus/v1/graphql"
-
-SENSOR_STATE_OFF = "NOT_DETECTED"
-
-# File extensions
-SAVE_PATH = "out"
-HTML_EXTENSION = ".html"
-JSON_EXTENSION = ".json"
-BIN_EXTENSION = ".bin"
+from .http import AMAZON_DEVICE_TYPE
 
 SPEAKER_GROUP_FAMILY = "WHA"
 SPEAKER_GROUP_MODEL = "Speaker Group"
 
-SENSORS: dict[str, dict[str, str | None]] = {
-    "temperatureSensor": {
-        "name": "temperature",
-        "key": "value",
-        "subkey": "value",
-        "scale": "scale",
-    },
-    "motionSensor": {
-        "name": "detectionState",
-        "key": "detectionStateValue",
-        "subkey": None,
-        "scale": None,
-    },
-    "lightSensor": {
-        "name": "illuminance",
-        "key": "illuminanceValue",
-        "subkey": "value",
-        "scale": None,
-    },
-}
-
-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",
-]
-
 DEVICE_TO_IGNORE: list[str] = [
     AMAZON_DEVICE_TYPE,  # Alexa App for iOS
     "A2TF17PFR55MTB",  # Alexa App for Android
@@ -480,63 +373,3 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "hw_version": "Gen2",
     },
 }
-
-RECURRING_PATTERNS: dict[str, str] = {
-    "XXXX-WD": "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR",
-    "XXXX-WE": "FREQ=WEEKLY;BYDAY=SA,SU",
-    "XXXX-WXX-1": "FREQ=WEEKLY;BYDAY=MO",
-    "XXXX-WXX-2": "FREQ=WEEKLY;BYDAY=TU",
-    "XXXX-WXX-3": "FREQ=WEEKLY;BYDAY=WE",
-    "XXXX-WXX-4": "FREQ=WEEKLY;BYDAY=TH",
-    "XXXX-WXX-5": "FREQ=WEEKLY;BYDAY=FR",
-    "XXXX-WXX-6": "FREQ=WEEKLY;BYDAY=SA",
-    "XXXX-WXX-7": "FREQ=WEEKLY;BYDAY=SU",
-}
-
-WEEKEND_EXCEPTIONS = {
-    "TH-FR": {
-        "XXXX-WD": "FREQ=WEEKLY;BYDAY=MO,TU,WE,SA,SU",
-        "XXXX-WE": "FREQ=WEEKLY;BYDAY=TH,FR",
-    },
-    "FR-SA": {
-        "XXXX-WD": "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,SU",
-        "XXXX-WE": "FREQ=WEEKLY;BYDAY=FR,SA",
-    },
-}
-
-# Countries grouped by their weekend type
-COUNTRY_GROUPS = {
-    "TH-FR": ["IR"],
-    "FR-SA": [
-        "AF",
-        "BD",
-        "BH",
-        "DZ",
-        "EG",
-        "IL",
-        "IQ",
-        "JO",
-        "KW",
-        "LY",
-        "MV",
-        "MY",
-        "OM",
-        "PS",
-        "QA",
-        "SA",
-        "SD",
-        "SY",
-        "YE",
-    ],
-}
-
-NOTIFICATION_ALARM = "Alarm"
-NOTIFICATION_MUSIC_ALARM = "MusicAlarm"
-NOTIFICATION_REMINDER = "Reminder"
-NOTIFICATION_TIMER = "Timer"
-NOTIFICATIONS_SUPPORTED = [
-    NOTIFICATION_ALARM,
-    NOTIFICATION_MUSIC_ALARM,
-    NOTIFICATION_REMINDER,
-    NOTIFICATION_TIMER,
-]

aioamazondevices-8.0.0/src/aioamazondevices/const/http.py

@@ -0,0 +1,36 @@
+"""aioamazondevices HTTP const."""
+
+HTTP_ERROR_199 = 199
+HTTP_ERROR_299 = 299
+
+ARRAY_WRAPPER = "generatedArrayWrapper"
+
+# Amazon APP info
+AMAZON_APP_BUNDLE_ID = "com.amazon.echo"
+AMAZON_APP_ID = "MAPiOSLib/6.0/ToHideRetailLink"
+AMAZON_APP_NAME = "AioAmazonDevices"
+AMAZON_APP_VERSION = "2.2.663733.0"
+AMAZON_DEVICE_SOFTWARE_VERSION = "35602678"
+AMAZON_DEVICE_TYPE = "A2IVLV5VM2W81"
+AMAZON_CLIENT_OS = "18.5"
+
+DEFAULT_SITE = "https://www.amazon.com"
+DEFAULT_HEADERS = {
+    "Accept-Charset": "utf-8",
+    "Accept-Encoding": "gzip",
+    "Connection": "keep-alive",
+}
+CSRF_COOKIE = "csrf"
+REQUEST_AGENT = {
+    "Amazon": f"AmazonWebView/AmazonAlexa/{AMAZON_APP_VERSION}/iOS/{AMAZON_CLIENT_OS}/iPhone",  # noqa: E501
+    "Browser": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36 Edg/141.0.0.0",  # noqa: E501
+}
+
+REFRESH_ACCESS_TOKEN = "access_token"  # noqa: S105
+REFRESH_AUTH_COOKIES = "auth_cookies"
+
+URI_DEVICES = "/api/devices-v2/device"
+URI_DND = "/api/dnd/device-status-list"
+URI_NOTIFICATIONS = "/api/notifications"
+URI_SIGNIN = "/ap/signin"
+URI_NEXUS_GRAPHQL = "/nexus/v1/graphql"

aioamazondevices-8.0.0/src/aioamazondevices/const/metadata.py

@@ -0,0 +1,44 @@
+"""aioamazondevices Additional entities const."""
+
+SENSOR_STATE_OFF = "NOT_DETECTED"
+
+SENSORS: dict[str, dict[str, str | None]] = {
+    "temperatureSensor": {
+        "name": "temperature",
+        "key": "value",
+        "subkey": "value",
+        "scale": "scale",
+    },
+    "motionSensor": {
+        "name": "detectionState",
+        "key": "detectionStateValue",
+        "subkey": None,
+        "scale": None,
+    },
+    "lightSensor": {
+        "name": "illuminance",
+        "key": "illuminanceValue",
+        "subkey": "value",
+        "scale": None,
+    },
+}
+
+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.5.4/src/aioamazondevices/query.py → aioamazondevices-8.0.0/src/aioamazondevices/const/queries.py

@@ -1,4 +1,4 @@
-"""GraphQL Queries."""
+"""aioamazondevices GraphQL queries."""
 
 QUERY_DEVICE_DATA = """
 query getDevicesBaseData {

aioamazondevices-8.0.0/src/aioamazondevices/const/schedules.py

@@ -0,0 +1,61 @@
+"""aioamazondevices: schedules."""
+
+NOTIFICATION_ALARM = "Alarm"
+NOTIFICATION_MUSIC_ALARM = "MusicAlarm"
+NOTIFICATION_REMINDER = "Reminder"
+NOTIFICATION_TIMER = "Timer"
+NOTIFICATIONS_SUPPORTED = [
+    NOTIFICATION_ALARM,
+    NOTIFICATION_MUSIC_ALARM,
+    NOTIFICATION_REMINDER,
+    NOTIFICATION_TIMER,
+]
+
+RECURRING_PATTERNS: dict[str, str] = {
+    "XXXX-WD": "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR",
+    "XXXX-WE": "FREQ=WEEKLY;BYDAY=SA,SU",
+    "XXXX-WXX-1": "FREQ=WEEKLY;BYDAY=MO",
+    "XXXX-WXX-2": "FREQ=WEEKLY;BYDAY=TU",
+    "XXXX-WXX-3": "FREQ=WEEKLY;BYDAY=WE",
+    "XXXX-WXX-4": "FREQ=WEEKLY;BYDAY=TH",
+    "XXXX-WXX-5": "FREQ=WEEKLY;BYDAY=FR",
+    "XXXX-WXX-6": "FREQ=WEEKLY;BYDAY=SA",
+    "XXXX-WXX-7": "FREQ=WEEKLY;BYDAY=SU",
+}
+
+WEEKEND_EXCEPTIONS = {
+    "TH-FR": {
+        "XXXX-WD": "FREQ=WEEKLY;BYDAY=MO,TU,WE,SA,SU",
+        "XXXX-WE": "FREQ=WEEKLY;BYDAY=TH,FR",
+    },
+    "FR-SA": {
+        "XXXX-WD": "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,SU",
+        "XXXX-WE": "FREQ=WEEKLY;BYDAY=FR,SA",
+    },
+}
+
+# Countries grouped by their weekend type
+COUNTRY_GROUPS = {
+    "TH-FR": ["IR"],
+    "FR-SA": [
+        "AF",
+        "BD",
+        "BH",
+        "DZ",
+        "EG",
+        "IL",
+        "IQ",
+        "JO",
+        "KW",
+        "LY",
+        "MV",
+        "MY",
+        "OM",
+        "PS",
+        "QA",
+        "SA",
+        "SD",
+        "SY",
+        "YE",
+    ],
+}

{aioamazondevices-6.5.4/src/aioamazondevices → aioamazondevices-8.0.0/src/aioamazondevices/const}/sounds.py

@@ -1,4 +1,5 @@
-"""Generated by update_sounds_list.py [2025-08-28 15:45]."""
+"""aioamazondevices sounds."""
+# Generated by update_sounds_list.py [2025-10-23 10:03].
 
 SOUNDS_LIST = {
     "air_horn_03": "Air horn",

aioamazondevices-8.0.0/src/aioamazondevices/structures.py

@@ -0,0 +1,65 @@
+"""aioamazondevices structures module."""
+
+from dataclasses import dataclass
+from datetime import datetime
+from enum import StrEnum
+
+
+@dataclass
+class AmazonDeviceSensor:
+    """Amazon device sensor class."""
+
+    name: str
+    value: str | int | float
+    error: bool
+    error_type: str | None
+    error_msg: str | None
+    scale: str | None
+
+
+@dataclass
+class AmazonSchedule:
+    """Amazon schedule class."""
+
+    type: str  # alarm, reminder, timer
+    status: str
+    label: str
+    next_occurrence: datetime | None
+
+
+@dataclass
+class AmazonDevice:
+    """Amazon device class."""
+
+    account_name: str
+    capabilities: list[str]
+    device_family: str
+    device_type: str
+    device_owner_customer_id: str
+    household_device: bool
+    device_cluster_members: list[str]
+    online: bool
+    serial_number: str
+    software_version: str
+    entity_id: str | None
+    endpoint_id: str | None
+    sensors: dict[str, AmazonDeviceSensor]
+    notifications: dict[str, AmazonSchedule]
+
+
+class AmazonSequenceType(StrEnum):
+    """Amazon sequence types."""
+
+    Announcement = "AlexaAnnouncement"
+    Speak = "Alexa.Speak"
+    Sound = "Alexa.Sound"
+    Music = "Alexa.Music.PlaySearchPhrase"
+    TextCommand = "Alexa.TextCommand"
+    LaunchSkill = "Alexa.Operation.SkillConnections.Launch"
+
+
+class AmazonMusicSource(StrEnum):
+    """Amazon music sources."""
+
+    Radio = "TUNEIN"
+    AmazonMusic = "AMAZON_MUSIC"

{aioamazondevices-6.5.4 → aioamazondevices-8.0.0}/src/aioamazondevices/utils.py

@@ -3,7 +3,7 @@
 from collections.abc import Collection
 from typing import Any
 
-from .const import TO_REDACT
+from .const.common import TO_REDACT
 
 
 def obfuscate_email(email: str) -> str: