aioamazondevices 10.0.0__tar.gz → 11.0.2__tar.gz

{aioamazondevices-10.0.0 → aioamazondevices-11.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioamazondevices
-Version: 10.0.0
+Version: 11.0.2
 Summary: Python library to control Amazon devices
 License-Expression: Apache-2.0
 License-File: LICENSE

{aioamazondevices-10.0.0 → aioamazondevices-11.0.2}/pyproject.toml

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

{aioamazondevices-10.0.0 → aioamazondevices-11.0.2}/src/aioamazondevices/__init__.py

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

{aioamazondevices-10.0.0 → aioamazondevices-11.0.2}/src/aioamazondevices/api.py

@@ -16,8 +16,8 @@ from .const.devices import (
 from .const.http import (
     ARRAY_WRAPPER,
     DEFAULT_SITE,
+    REQUEST_AGENT,
     URI_DEVICES,
-    URI_DND,
     URI_NEXUS_GRAPHQL,
 )
 from .const.metadata import SENSORS
@@ -31,6 +31,7 @@ from .exceptions import (
     CannotRetrieveData,
 )
 from .http_wrapper import AmazonHttpWrapper, AmazonSessionStateData
+from .implementation.dnd import AmazonDnDHandler
 from .implementation.notification import AmazonNotificationHandler
 from .implementation.sequence import AmazonSequenceHandler
 from .login import AmazonLogin
@@ -87,6 +88,10 @@ class AmazonEchoApi:
             session_state_data=self._session_state_data,
         )
 
+        self._dnd_handler = AmazonDnDHandler(
+            http_wrapper=self._http_wrapper, session_state_data=self._session_state_data
+        )
+
         self._final_devices: dict[str, AmazonDevice] = {}
         self._endpoints: dict[str, str] = {}  # endpoint ID to serial number map
 
@@ -127,6 +132,7 @@ class AmazonEchoApi:
             url=f"https://alexa.amazon.{self._session_state_data.domain}{URI_NEXUS_GRAPHQL}",
             input_data=payload,
             json_data=True,
+            extended_headers={"User-Agent": REQUEST_AGENT["Amazon"]},
         )
 
         sensors_state = await self._http_wrapper.response_to_json(raw_resp, "sensors")
@@ -236,6 +242,7 @@ class AmazonEchoApi:
             url=f"https://alexa.amazon.{self._session_state_data.domain}{URI_NEXUS_GRAPHQL}",
             input_data=payload,
             json_data=True,
+            extended_headers={"User-Agent": REQUEST_AGENT["Amazon"]},
         )
 
         endpoint_data = await self._http_wrapper.response_to_json(raw_resp, "endpoint")
@@ -293,7 +300,7 @@ class AmazonEchoApi:
 
     async def _get_sensor_data(self) -> None:
         devices_sensors = await self._get_sensors_states()
-        dnd_sensors = await self._get_dnd_status()
+        dnd_sensors = await self._dnd_handler.get_do_not_disturb_status()
         notifications = await self._notification_handler.get_notifications()
         for device in self._final_devices.values():
             # Update sensors
@@ -489,41 +496,6 @@ class AmazonEchoApi:
         """Call Info skill.  See ALEXA_INFO_SKILLS . const."""
         await self._sequence_handler.send_message(device, info_skill_name, "")
 
-    async def set_do_not_disturb(self, device: AmazonDevice, state: bool) -> None:
-        """Set do_not_disturb flag."""
-        payload = {
-            "deviceSerialNumber": device.serial_number,
-            "deviceType": device.device_type,
-            "enabled": state,
-        }
-        url = f"https://alexa.amazon.{self._session_state_data.domain}/api/dnd/status"
-        await self._http_wrapper.session_request(
-            method="PUT",
-            url=url,
-            input_data=payload,
-            json_data=True,
-        )
-
-    async def _get_dnd_status(self) -> dict[str, AmazonDeviceSensor]:
-        dnd_status: dict[str, AmazonDeviceSensor] = {}
-        _, raw_resp = await self._http_wrapper.session_request(
-            method=HTTPMethod.GET,
-            url=f"https://alexa.amazon.{self._session_state_data.domain}{URI_DND}",
-        )
-
-        dnd_data = await self._http_wrapper.response_to_json(raw_resp, "dnd")
-
-        for dnd in dnd_data.get("doNotDisturbDeviceStatusList", {}):
-            dnd_status[dnd.get("deviceSerialNumber")] = AmazonDeviceSensor(
-                name="dnd",
-                value=dnd.get("enabled"),
-                error=False,
-                error_type=None,
-                error_msg=None,
-                scale=None,
-            )
-        return dnd_status
-
     async def _format_human_error(self, sensors_state: dict) -> bool:
         """Format human readable error from malformed data."""
         if sensors_state.get(ARRAY_WRAPPER):
@@ -538,3 +510,7 @@ class AmazonEchoApi:
         path = error[0].get("path", "Unknown path")
         _LOGGER.error("Error retrieving devices state: %s for path %s", msg, path)
         return True
+
+    async def set_do_not_disturb(self, device: AmazonDevice, enable: bool) -> None:
+        """Set Do Not Disturb status for a device."""
+        await self._dnd_handler.set_do_not_disturb(device, enable)

{aioamazondevices-10.0.0 → aioamazondevices-11.0.2}/src/aioamazondevices/const/devices.py

@@ -417,4 +417,13 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Ford SYNC 4",
         "hw_version": None,
     },
+    "A1J16TEDOYCZTN": {
+        "model": "Fire Tablet 7",
+        "hw_version": "Gen7",
+    },
+    "A18TCD9FP10WJ9": {
+        "manufacturer": "Netgear",
+        "model": "Orbi Voice (RBS40V)",
+        "hw_version": None,
+    },
 }

{aioamazondevices-10.0.0 → aioamazondevices-11.0.2}/src/aioamazondevices/const/http.py

@@ -30,7 +30,8 @@ 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_DND_STATUS_ALL = "/api/dnd/device-status-list"
+URI_DND_STATUS_DEVICE = "/api/dnd/status"
+URI_NEXUS_GRAPHQL = "/nexus/v1/graphql"
 URI_NOTIFICATIONS = "/api/notifications"
 URI_SIGNIN = "/ap/signin"
-URI_NEXUS_GRAPHQL = "/nexus/v1/graphql"

{aioamazondevices-10.0.0 → aioamazondevices-11.0.2}/src/aioamazondevices/http_wrapper.py

@@ -4,7 +4,7 @@ import asyncio
 import base64
 import secrets
 from collections.abc import Callable, Coroutine
-from http import HTTPStatus
+from http import HTTPMethod, HTTPStatus
 from http.cookies import Morsel
 from typing import Any, cast
 
@@ -23,13 +23,17 @@ from . import __version__
 from .const.http import (
     AMAZON_APP_BUNDLE_ID,
     AMAZON_APP_ID,
+    AMAZON_APP_NAME,
     AMAZON_APP_VERSION,
+    AMAZON_CLIENT_OS,
     AMAZON_DEVICE_SOFTWARE_VERSION,
     ARRAY_WRAPPER,
     CSRF_COOKIE,
     DEFAULT_HEADERS,
     HTTP_ERROR_199,
     HTTP_ERROR_299,
+    REFRESH_ACCESS_TOKEN,
+    REFRESH_AUTH_COOKIES,
     REQUEST_AGENT,
     URI_SIGNIN,
 )
@@ -214,13 +218,66 @@ class AmazonHttpWrapper:
 
         return HTTPStatus(error).phrase
 
+    async def refresh_data(self, data_type: str) -> tuple[bool, dict]:
+        """Refresh data."""
+        if not self._session_state_data.login_stored_data:
+            _LOGGER.debug("No login data available, cannot refresh")
+            return False, {}
+
+        data = {
+            "app_name": AMAZON_APP_NAME,
+            "app_version": AMAZON_APP_VERSION,
+            "di.sdk.version": "6.12.4",
+            "source_token": self._session_state_data.login_stored_data["refresh_token"],
+            "package_name": AMAZON_APP_BUNDLE_ID,
+            "di.hw.version": "iPhone",
+            "platform": "iOS",
+            "requested_token_type": data_type,
+            "source_token_type": "refresh_token",
+            "di.os.name": "iOS",
+            "di.os.version": AMAZON_CLIENT_OS,
+            "current_version": "6.12.4",
+            "previous_version": "6.12.4",
+            "domain": f"www.amazon.{self._session_state_data.domain}",
+        }
+
+        _, raw_resp = await self.session_request(
+            method=HTTPMethod.POST,
+            url="https://api.amazon.com/auth/token",
+            input_data=data,
+            json_data=False,
+        )
+        _LOGGER.debug(
+            "Refresh data response %s with payload %s",
+            raw_resp.status,
+            orjson.dumps(data),
+        )
+
+        if raw_resp.status != HTTPStatus.OK:
+            _LOGGER.debug("Failed to refresh data")
+            return False, {}
+
+        json_response = await self.response_to_json(raw_resp, data_type)
+
+        if data_type == REFRESH_ACCESS_TOKEN and (
+            new_token := json_response.get(REFRESH_ACCESS_TOKEN)
+        ):
+            self._session_state_data.login_stored_data[REFRESH_ACCESS_TOKEN] = new_token
+            return True, json_response
+
+        if data_type == REFRESH_AUTH_COOKIES:
+            return True, json_response
+
+        _LOGGER.debug("Unexpected refresh data response")
+        return False, {}
+
     async def session_request(
         self,
         method: str,
         url: str,
         input_data: dict[str, Any] | list[dict[str, Any]] | None = None,
         json_data: bool = False,
-        agent: str = "Amazon",
+        extended_headers: dict[str, str] | None = None,
     ) -> tuple[BeautifulSoup, ClientResponse]:
         """Return request response context data."""
         _LOGGER.debug(
@@ -232,11 +289,15 @@ class AmazonHttpWrapper:
         )
 
         headers = DEFAULT_HEADERS.copy()
-        headers.update({"User-Agent": REQUEST_AGENT[agent]})
+        headers.update({"User-Agent": REQUEST_AGENT["Browser"]})
         headers.update({"Accept-Language": self._session_state_data.language})
         headers.update({"x-amzn-client": "github.com/chemelli74/aioamazondevices"})
         headers.update({"x-amzn-build-version": __version__})
 
+        if extended_headers:
+            _LOGGER.debug("Adding to headers: %s", extended_headers)
+            headers.update(extended_headers)
+
         if self._csrf_cookie:
             csrf = {CSRF_COOKIE: self._csrf_cookie}
             _LOGGER.debug("Adding to headers: %s", csrf)
@@ -310,6 +371,7 @@ class AmazonHttpWrapper:
             ]:
                 raise CannotAuthenticate(await self.http_phrase_error(resp.status))
             if not await self._ignore_ap_signin_error(resp):
+                _LOGGER.debug("Error response content: %s", await resp.text())
                 raise CannotRetrieveData(
                     f"Request failed: {await self.http_phrase_error(resp.status)}"
                 )

aioamazondevices-11.0.2/src/aioamazondevices/implementation/dnd.py

@@ -0,0 +1,56 @@
+"""Module to handle Alexa do not disturb setting."""
+
+from http import HTTPMethod
+
+from aioamazondevices.const.http import URI_DND_STATUS_ALL, URI_DND_STATUS_DEVICE
+from aioamazondevices.http_wrapper import AmazonHttpWrapper, AmazonSessionStateData
+from aioamazondevices.structures import AmazonDevice, AmazonDeviceSensor
+
+
+class AmazonDnDHandler:
+    """Class to handle Alexa Do Not Disturb functionality."""
+
+    def __init__(
+        self,
+        http_wrapper: AmazonHttpWrapper,
+        session_state_data: AmazonSessionStateData,
+    ) -> None:
+        """Initialize AmazonDnDHandler class."""
+        self._domain = session_state_data.domain
+        self._http_wrapper = http_wrapper
+
+    async def get_do_not_disturb_status(self) -> dict[str, AmazonDeviceSensor]:
+        """Get do_not_disturb status for all devices."""
+        dnd_status: dict[str, AmazonDeviceSensor] = {}
+        _, raw_resp = await self._http_wrapper.session_request(
+            method=HTTPMethod.GET,
+            url=f"https://alexa.amazon.{self._domain}{URI_DND_STATUS_ALL}",
+        )
+
+        dnd_data = await self._http_wrapper.response_to_json(raw_resp, "dnd")
+
+        for dnd in dnd_data.get("doNotDisturbDeviceStatusList", {}):
+            dnd_status[dnd.get("deviceSerialNumber")] = AmazonDeviceSensor(
+                name="dnd",
+                value=dnd.get("enabled"),
+                error=False,
+                error_type=None,
+                error_msg=None,
+                scale=None,
+            )
+        return dnd_status
+
+    async def set_do_not_disturb(self, device: AmazonDevice, enable: bool) -> None:
+        """Set do_not_disturb flag."""
+        payload = {
+            "deviceSerialNumber": device.serial_number,
+            "deviceType": device.device_type,
+            "enabled": enable,
+        }
+        url = f"https://alexa.amazon.{self._domain}{URI_DND_STATUS_DEVICE}"
+        await self._http_wrapper.session_request(
+            method=HTTPMethod.PUT,
+            url=url,
+            input_data=payload,
+            json_data=True,
+        )

{aioamazondevices-10.0.0 → aioamazondevices-11.0.2}/src/aioamazondevices/implementation/notification.py

@@ -8,7 +8,7 @@ from dateutil.parser import parse
 from dateutil.rrule import rrulestr
 
 from aioamazondevices.const.devices import DEVICE_TO_IGNORE
-from aioamazondevices.const.http import URI_NOTIFICATIONS
+from aioamazondevices.const.http import REQUEST_AGENT, URI_NOTIFICATIONS
 from aioamazondevices.const.schedules import (
     COUNTRY_GROUPS,
     NOTIFICATION_ALARM,
@@ -45,6 +45,7 @@ class AmazonNotificationHandler:
             _, raw_resp = await self._http_wrapper.session_request(
                 HTTPMethod.GET,
                 url=f"https://alexa.amazon.{self._session_state_data.domain}{URI_NOTIFICATIONS}",
+                extended_headers={"User-Agent": REQUEST_AGENT["Browser"]},
             )
         except CannotRetrieveData:
             _LOGGER.warning(

{aioamazondevices-10.0.0 → aioamazondevices-11.0.2}/src/aioamazondevices/login.py

@@ -10,20 +10,17 @@ from http import HTTPMethod, HTTPStatus
 from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
 
-import orjson
 from bs4 import BeautifulSoup, Tag
 from multidict import MultiDictProxy
 from yarl import URL
 
 from .const.http import (
-    AMAZON_APP_BUNDLE_ID,
     AMAZON_APP_NAME,
     AMAZON_APP_VERSION,
     AMAZON_CLIENT_OS,
     AMAZON_DEVICE_SOFTWARE_VERSION,
     AMAZON_DEVICE_TYPE,
     DEFAULT_SITE,
-    REFRESH_ACCESS_TOKEN,
     REFRESH_AUTH_COOKIES,
     URI_DEVICES,
     URI_SIGNIN,
@@ -362,7 +359,7 @@ class AmazonLogin:
 
     async def _refresh_auth_cookies(self) -> None:
         """Refresh cookies after domain swap."""
-        _, json_token_resp = await self._refresh_data(REFRESH_AUTH_COOKIES)
+        _, json_token_resp = await self._http_wrapper.refresh_data(REFRESH_AUTH_COOKIES)
 
         # Need to take cookies from response and create them as cookies
         website_cookies = self._session_state_data.login_stored_data[
@@ -394,59 +391,6 @@ class AmazonLogin:
             await self._http_wrapper.clear_csrf_cookie()
             await self._refresh_auth_cookies()
 
-    async def _refresh_data(self, data_type: str) -> tuple[bool, dict]:
-        """Refresh data."""
-        if not self._session_state_data.login_stored_data:
-            _LOGGER.debug("No login data available, cannot refresh")
-            return False, {}
-
-        data = {
-            "app_name": AMAZON_APP_NAME,
-            "app_version": AMAZON_APP_VERSION,
-            "di.sdk.version": "6.12.4",
-            "source_token": self._session_state_data.login_stored_data["refresh_token"],
-            "package_name": AMAZON_APP_BUNDLE_ID,
-            "di.hw.version": "iPhone",
-            "platform": "iOS",
-            "requested_token_type": data_type,
-            "source_token_type": "refresh_token",
-            "di.os.name": "iOS",
-            "di.os.version": AMAZON_CLIENT_OS,
-            "current_version": "6.12.4",
-            "previous_version": "6.12.4",
-            "domain": f"www.amazon.{self._session_state_data.domain}",
-        }
-
-        _, raw_resp = await self._http_wrapper.session_request(
-            method=HTTPMethod.POST,
-            url="https://api.amazon.com/auth/token",
-            input_data=data,
-            json_data=False,
-        )
-        _LOGGER.debug(
-            "Refresh data response %s with payload %s",
-            raw_resp.status,
-            orjson.dumps(data),
-        )
-
-        if raw_resp.status != HTTPStatus.OK:
-            _LOGGER.debug("Failed to refresh data")
-            return False, {}
-
-        json_response = await self._http_wrapper.response_to_json(raw_resp, data_type)
-
-        if data_type == REFRESH_ACCESS_TOKEN and (
-            new_token := json_response.get(REFRESH_ACCESS_TOKEN)
-        ):
-            self._session_state_data.login_stored_data[REFRESH_ACCESS_TOKEN] = new_token
-            return True, json_response
-
-        if data_type == REFRESH_AUTH_COOKIES:
-            return True, json_response
-
-        _LOGGER.debug("Unexpected refresh data response")
-        return False, {}
-
     async def obtain_account_customer_id(self) -> None:
         """Find account customer id."""
         for retry_count in range(MAX_CUSTOMER_ACCOUNT_RETRIES):