aioamazondevices 3.0.4__py3-none-any.whl → 3.0.6__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -8,8 +8,8 @@ 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 http import HTTPMethod, HTTPStatus
+from http.cookies import Morsel, SimpleCookie
 from pathlib import Path
 from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
@@ -18,9 +18,8 @@ import orjson
 from aiohttp import ClientResponse, ClientSession
 from babel import Locale
 from bs4 import BeautifulSoup, Tag
-from httpx import URL as HTTPX_URL
-from multidict import MultiDictProxy
-from yarl import URL as YARL_URL
+from multidict import CIMultiDictProxy, MultiDictProxy
+from yarl import URL
 
 from .const import (
     _LOGGER,
@@ -47,10 +46,6 @@ from .const import (
     URI_QUERIES,
 )
 from .exceptions import CannotAuthenticate, CannotRegisterDevice, WrongMethod
-from .httpx import HttpxClientResponseWrapper, HttpxClientSession
-
-# Values: "aiohttp", or "httpx"
-LIBRARY = "httpx"
 
 
 @dataclass
@@ -123,7 +118,7 @@ class AmazonEchoApi:
         self._serial = self._serial_number()
         self._list_for_clusters: dict[str, str] = {}
 
-        self.session: ClientSession | HttpxClientSession
+        self.session: ClientSession
 
     def _load_website_cookies(self) -> dict[str, str]:
         """Get website cookies, if avaliables."""
@@ -234,7 +229,7 @@ class AmazonEchoApi:
                 return method, url
         raise TypeError("Unable to extract form data from response")
 
-    def _extract_code_from_url(self, url: YARL_URL | HTTPX_URL) -> str:
+    def _extract_code_from_url(self, url: URL) -> str:
         """Extract the access token from url query after login."""
         parsed_url: dict[str, list[str]] = {}
         if isinstance(url.query, bytes):
@@ -249,18 +244,28 @@ class AmazonEchoApi:
     def _client_session(self) -> None:
         """Create HTTP client session."""
         if not hasattr(self, "session") or self.session.closed:
-            _LOGGER.debug("Creating HTTP session (%s)", LIBRARY)
-            if LIBRARY == "httpx":
-                self.session = HttpxClientSession(
-                    headers=DEFAULT_HEADERS,
-                    cookies=self._cookies,
-                    follow_redirects=True,
-                )
-            else:
-                self.session = ClientSession(
-                    headers=DEFAULT_HEADERS,
-                    cookies=self._cookies,
-                )
+            _LOGGER.debug("Creating HTTP session (aiohttp)")
+            self.session = ClientSession(
+                headers=DEFAULT_HEADERS,
+                cookies=self._cookies,
+            )
+
+    async def _parse_cookies_from_headers(
+        self, headers: CIMultiDictProxy[str]
+    ) -> dict[str, str]:
+        """Parse cookies with a value from headers."""
+        cookies_with_value: dict[str, str] = {}
+
+        for value in headers.getall("Set-Cookie", ()):
+            cookie = SimpleCookie()
+            cookie.load(value)
+
+            for name, morsel in cookie.items():
+                if morsel.value and morsel.value not in ("-", ""):
+                    cookies_with_value[name] = morsel.value
+
+        _LOGGER.debug("Cookies from headers: %s", cookies_with_value)
+        return cookies_with_value
 
     async def _session_request(
         self,
@@ -268,7 +273,7 @@ class AmazonEchoApi:
         url: str,
         input_data: dict[str, Any] | None = None,
         json_data: bool = False,
-    ) -> tuple[BeautifulSoup, ClientResponse | HttpxClientResponseWrapper]:
+    ) -> tuple[BeautifulSoup, ClientResponse]:
         """Return request response context data."""
         _LOGGER.debug(
             "%s request: %s with payload %s [json=%s]",
@@ -289,17 +294,18 @@ class AmazonEchoApi:
             _LOGGER.debug("Adding %s to headers", json_header)
             headers.update(json_header)
 
-        _url: YARL_URL | str = url
-        if LIBRARY == "aiohttp":
-            _url = YARL_URL(url, encoded=True)
-
+        _cookies = (
+            self._load_website_cookies() if self._login_stored_data else self._cookies
+        )
         resp = await self.session.request(
             method,
-            _url,
+            URL(url, encoded=True),
             data=input_data if not json_data else orjson.dumps(input_data),
-            cookies=self._load_website_cookies(),
+            cookies=_cookies,
             headers=headers,
         )
+        self._cookies.update(**await self._parse_cookies_from_headers(resp.headers))
+
         content_type: str = resp.headers.get("Content-Type", "")
         _LOGGER.debug(
             "Response %s for url %s with content type: %s",
@@ -402,7 +408,7 @@ class AmazonEchoApi:
 
         register_url = f"https://api.amazon.{self._domain}/auth/register"
         _, resp = await self._session_request(
-            method="POST",
+            method=HTTPMethod.POST,
             url=register_url,
             input_data=body,
             json_data=True,
@@ -466,7 +472,9 @@ class AmazonEchoApi:
         _LOGGER.debug("Build oauth URL")
         login_url = self._build_oauth_url(code_verifier, client_id)
 
-        login_soup, _ = await self._session_request(method="GET", url=login_url)
+        login_soup, _ = await self._session_request(
+            method=HTTPMethod.GET, url=login_url
+        )
         login_method, login_url = self._get_request_from_soup(login_soup)
         login_inputs = self._get_inputs_from_soup(login_soup)
         login_inputs["email"] = self._login_email
@@ -535,7 +543,7 @@ class AmazonEchoApi:
     async def close(self) -> None:
         """Close http client session."""
         if hasattr(self, "session"):
-            _LOGGER.debug("Closing HTTP session (%s)", LIBRARY)
+            _LOGGER.debug("Closing HTTP session (aiohttp)")
             await self.session.close()
 
     async def get_devices_data(
@@ -545,7 +553,7 @@ class AmazonEchoApi:
         devices: dict[str, Any] = {}
         for key in URI_QUERIES:
             _, raw_resp = await self._session_request(
-                method="GET",
+                method=HTTPMethod.GET,
                 url=f"https://alexa.amazon.{self._domain}{URI_QUERIES[key]}",
             )
             _LOGGER.debug("Response URL: %s", raw_resp.url)
@@ -615,7 +623,7 @@ class AmazonEchoApi:
     async def auth_check_status(self) -> bool:
         """Check AUTH status."""
         _, raw_resp = await self._session_request(
-            method="GET",
+            method=HTTPMethod.GET,
             url=f"https://alexa.amazon.{self._domain}/api/bootstrap?version=0",
         )
         if raw_resp.status != HTTPStatus.OK:
@@ -760,7 +768,7 @@ class AmazonEchoApi:
 
         _LOGGER.debug("Preview data payload: %s", node_data)
         await self._session_request(
-            method="POST",
+            method=HTTPMethod.POST,
             url=f"https://alexa.amazon.{self._domain}/api/behaviors/preview",
             input_data=node_data,
             json_data=True,

aioamazondevices/const.py

@@ -84,6 +84,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Dot",
         "hw_version": "Gen3",
     },
+    "A1Z88NGR2BK6A2": {
+        "model": "Echo Show 8",
+        "hw_version": "Gen1",
+    },
     "A271DR1789MXDS": {
         "model": "Fire Tablet 7",
         "hw_version": "Gen12",
@@ -96,6 +100,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Dot Clock",
         "hw_version": "Gen4",
     },
+    "A2JKHJ0PX4J3L3": {
+        "model": "Fire TV Cube",
+        "hw_version": "Gen2",
+    },
     "A2LWARUGJLBYEW": {
         "model": "Fire TV Stick",
         "hw_version": "Gen2",
@@ -108,6 +116,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Dot Clock",
         "hw_version": "Gen4",
     },
+    "A2UONLFQW0PADH": {
+        "model": "Echo Show 8",
+        "hw_version": "Gen3",
+    },
     "A303PJF6ISQ7IC": {
         "model": "Echo Auto",
         "hw_version": "Gen1",
@@ -149,13 +161,17 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "hw_version": "Gen5",
     },
     "A7WXQPH584YP": {
-        "model": "Echo Dot",
+        "model": "Echo",
         "hw_version": "Gen2",
     },
     "AB72C64C86AW2": {
         "model": "Echo Dot",
         "hw_version": "Gen2",
     },
+    "AIPK7MM90V7TB": {
+        "model": "Echo Show 10",
+        "hw_version": "Gen3",
+    },
     "AKNO1N0KSFN8L": {
         "model": "Echo Dot",
         "hw_version": "Gen1",

{aioamazondevices-3.0.4.dist-info → aioamazondevices-3.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 3.0.4
+Version: 3.0.6
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli
@@ -86,7 +86,8 @@ 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"
+  "save_raw_data": true,
+  "test": true
 }
 ```
 
@@ -97,8 +98,11 @@ Library logs a warning if an unknown device type is linked to your Amazon accoun
 Please open an issue [here](https://github.com/chemelli74/aioamazondevices/issues) and provide the following information:
 
 - device type
+- brand
 - model
 - generation
+- entities are available in Home Assistant
+- entities work in Home Assistant
 
 Current device list: `DEVICE_TYPE_TO_MODEL` from [const.py](https://github.com/chemelli74/aioamazondevices/blob/main/src/aioamazondevices/const.py)
 

aioamazondevices-3.0.6.dist-info/RECORD

@@ -0,0 +1,10 @@
+aioamazondevices/__init__.py,sha256=XSc83vzKGe3HPjCJbw9K72d_eyR0i-ofMB47-uUKoUA,276
+aioamazondevices/api.py,sha256=pMpW51Wu4G56uVhT29O7C-hoHgHYiNbP-7Lz9UCXz0E,29943
+aioamazondevices/const.py,sha256=gGj6Fakolq9gmr10IqG09ocgIW5LdKwAPaKHHuT6o28,4647
+aioamazondevices/exceptions.py,sha256=qK_Hak9pc-lC2FPW-0i4rYIwNpEOHMmA9Rii8F2lkQo,1260
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
+aioamazondevices-3.0.6.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-3.0.6.dist-info/METADATA,sha256=aRbpJqVf5xRNNE73-k0WDWzRMluyhKz_48sGol6ieJ0,5546
+aioamazondevices-3.0.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-3.0.6.dist-info/RECORD,,

aioamazondevices/httpx.py

@@ -1,159 +0,0 @@
-"""Wrapper around httpx.Response to mimic aiohttp.ClientResponse."""
-
-import types
-from http.cookies import SimpleCookie
-from typing import Any, Self, cast
-
-from httpx import AsyncClient, Cookies, Response
-from httpx._types import RequestData
-
-
-def convert_httpx_cookies_to_simplecookie(httpx_cookies: Cookies) -> SimpleCookie:
-    """Convert an httpx.Cookies object to a single SimpleCookie."""
-    simple_cookie = SimpleCookie()
-
-    for name, value in httpx_cookies.items():
-        simple_cookie[name] = value
-
-    return simple_cookie
-
-
-class HttpxClientResponseWrapper:
-    """aiohttp-like Wrapper for httpx.Response."""
-
-    def __init__(self, response: Response) -> None:
-        """Init wrapper."""
-        self._response = response
-
-        # Basic aiohttp-like attributes
-        self.status = response.status_code
-        self.headers = response.headers
-        self.url = response.url
-        self.reason = response.reason_phrase
-        self.cookies = convert_httpx_cookies_to_simplecookie(response.cookies)
-        self.ok = response.is_success
-
-        # Aiohttp compatibility
-        self.content_type = response.headers.get("Content-Type", "")
-        self.real_url = str(response.url)
-        self.request_info = types.SimpleNamespace(
-            real_url=self.url,
-            method=response.request.method,
-            headers=response.request.headers,
-        )
-
-        # History (aiohttp returns redirects as history)
-        self.history = (
-            [HttpxClientResponseWrapper(r) for r in response.history]
-            if response.history
-            else []
-        )
-
-    async def text(self, encoding: str | None = None) -> str:
-        """Text."""
-        # httpx auto-decodes
-        if encoding:
-            return cast("str", self._response.content.decode(encoding))
-        return cast("str", self._response.text)
-
-    async def json(self) -> Any:  # noqa: ANN401
-        """Json."""
-        return self._response.json()
-
-    async def read(self) -> bytes:
-        """Read."""
-        return cast("bytes", self._response.content)
-
-    async def release(self) -> None:
-        """Release."""
-        # No-op: aiohttp requires this, httpx does not
-
-    def raise_for_status(self) -> Response:
-        """Raise for status."""
-        return self._response.raise_for_status()
-
-    def __repr__(self) -> str:
-        """Repr."""
-        return f"<HttpxClientResponseWrapper [{self.status} {self.reason}]>"
-
-    async def __aenter__(self) -> Self:
-        """Aenter."""
-        return self
-
-    async def __aexit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_val: BaseException | None,
-        exc_tb: types.TracebackType | None,
-    ) -> None:
-        """Aexit."""
-        await self.release()
-
-
-class HttpxClientSession:
-    """aiohttp-like Wrapper for httpx.AsyncClient."""
-
-    def __init__(self, **kwargs: Any) -> None:  # noqa: ANN401
-        """Init session."""
-        # Allow passing any httpx.AsyncClient init kwargs (e.g., headers, cookies)
-        self._client = AsyncClient(**kwargs)
-
-    @property
-    def closed(self) -> bool:
-        """Indicates whether the underlying client session is closed."""
-        return cast("bool", self._client.is_closed)
-
-    async def request(
-        self,
-        method: str,
-        url: str,
-        *,
-        params: dict[str, str | int | float] | None = None,
-        data: Any = None,  # noqa: ANN401
-        json: Any = None,  # noqa: ANN401
-        **kwargs: Any,  # noqa: ANN401
-    ) -> HttpxClientResponseWrapper:
-        """Make a generic request method for any HTTP verb."""
-        response = await self._client.request(
-            method=method.upper(),
-            url=url,
-            params=params,
-            data=data,
-            json=json,
-            **kwargs,
-        )
-        return HttpxClientResponseWrapper(response)
-
-    async def get(self, url: str, **kwargs: Any) -> HttpxClientResponseWrapper:  # noqa: ANN401
-        """Get."""
-        response = await self._client.get(url, **kwargs)
-        return HttpxClientResponseWrapper(response)
-
-    async def post(
-        self,
-        url: str,
-        data: RequestData | None = None,
-        json: Any = None,  # noqa: ANN401
-        **kwargs: Any,  # noqa: ANN401
-    ) -> HttpxClientResponseWrapper:
-        """Post."""
-        response = await self._client.post(url, data=data, json=json, **kwargs)
-        return HttpxClientResponseWrapper(response)
-
-    async def close(self) -> None:
-        """Close."""
-        await self._client.aclose()
-
-    async def __aenter__(self) -> Self:
-        """AEnter."""
-        await self._client.__aenter__()
-        return self
-
-    async def __aexit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_val: BaseException | None,
-        exc_tb: types.TracebackType | None,
-    ) -> None:
-        """AExit."""
-        await self._client.__aexit__(exc_type, exc_val, exc_tb)

aioamazondevices-3.0.4.dist-info/RECORD

@@ -1,11 +0,0 @@
-aioamazondevices/__init__.py,sha256=isQEyhdDy8nskzwkJ4S_C-xh93Hz_ijfqGQmHmb8Bfg,276
-aioamazondevices/api.py,sha256=ukafvMs2E5O43IRbukqL_uUzryFsy-PsWMqn9Yyw_Ho,29633
-aioamazondevices/const.py,sha256=hLQancDbkMKvjRkoLgU5g6Xk-uhqa_uhC11cJoTloFA,4278
-aioamazondevices/exceptions.py,sha256=qK_Hak9pc-lC2FPW-0i4rYIwNpEOHMmA9Rii8F2lkQo,1260
-aioamazondevices/httpx.py,sha256=DyuD2HD3GGGbBq65qcjPCCxeuSkALKzDAdrUSeZcRMM,4935
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
-aioamazondevices-3.0.4.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-3.0.4.dist-info/METADATA,sha256=nZHfKVVea2LQLf0nBhYAz56gWkknw8X1FhVUyr1fb_c,5447
-aioamazondevices-3.0.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-3.0.4.dist-info/RECORD,,