aioamazondevices 1.3.0__tar.gz → 1.4.1__tar.gz

{aioamazondevices-1.3.0 → aioamazondevices-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 1.3.0
+Version: 1.4.1
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli
@@ -15,13 +15,12 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
+Requires-Dist: aiohttp
 Requires-Dist: babel
 Requires-Dist: beautifulsoup4
 Requires-Dist: colorlog
-Requires-Dist: httpx
 Requires-Dist: orjson
-Requires-Dist: pyasn1
-Requires-Dist: rsa
+Requires-Dist: yarl
 Project-URL: Bug Tracker, https://github.com/chemelli74/aioamazondevices/issues
 Project-URL: Changelog, https://github.com/chemelli74/aioamazondevices/blob/main/CHANGELOG.md
 Project-URL: Repository, https://github.com/chemelli74/aioamazondevices

{aioamazondevices-1.3.0 → aioamazondevices-1.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioamazondevices"
-version = "1.3.0"
+version = "1.4.1"
 description = "Python library to control Amazon devices"
 authors = ["Simone Chemelli <simone.chemelli@gmail.com>"]
 license = "Apache-2.0"
@@ -22,14 +22,13 @@ packages = [
 "Changelog" = "https://github.com/chemelli74/aioamazondevices/blob/main/CHANGELOG.md"
 
 [tool.poetry.dependencies]
+aiohttp = "*"
 python = "^3.12"
 babel = "*"
 beautifulsoup4 = "*"
 colorlog = "*"
-httpx = "*"
 orjson = "*"
-pyasn1 = "*"
-rsa = "*"
+yarl = "*"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.1"

{aioamazondevices-1.3.0 → aioamazondevices-1.4.1}/src/aioamazondevices/__init__.py

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

{aioamazondevices-1.3.0 → aioamazondevices-1.4.1}/src/aioamazondevices/api.py

@@ -8,14 +8,16 @@ import uuid
 from dataclasses import dataclass
 from datetime import UTC, datetime, timedelta
 from http import HTTPStatus
+from http.cookies import SimpleCookie
 from pathlib import Path
 from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
 
 import orjson
+from aiohttp import ClientResponse, ClientSession
 from babel import Locale
 from bs4 import BeautifulSoup, Tag
-from httpx import URL, AsyncClient, Response
+from yarl import URL
 
 from .const import (
     _LOGGER,
@@ -95,14 +97,14 @@ class AmazonEchoApi:
         self._login_stored_data = login_data
         self._serial = self._serial_number()
 
-        self.session: AsyncClient
+        self.session: ClientSession
 
-    def _load_website_cookies(self) -> dict[str, Any]:
+    def _load_website_cookies(self) -> list[SimpleCookie]:
         """Get website cookies, if avaliables."""
         if not self._login_stored_data:
-            return {}
+            return []
 
-        return cast("dict", self._login_stored_data["website_cookies"])
+        return cast("list", self._login_stored_data["website_cookies"])
 
     def _serial_number(self) -> str:
         """Get or calculate device serial number."""
@@ -213,13 +215,11 @@ class AmazonEchoApi:
 
     def _client_session(self) -> None:
         """Create HTTP client session."""
-        if not hasattr(self, "session") or self.session.is_closed:
-            _LOGGER.debug("Creating HTTP session (httpx)")
-            self.session = AsyncClient(
-                base_url=f"https://www.amazon.{self._domain}",
+        if not hasattr(self, "session") or self.session.closed:
+            _LOGGER.debug("Creating HTTP session (aiohttp)")
+            self.session = ClientSession(
                 headers=DEFAULT_HEADERS,
                 cookies=self._cookies,
-                follow_redirects=True,
             )
 
     async def _session_request(
@@ -228,7 +228,7 @@ class AmazonEchoApi:
         url: str,
         input_data: dict[str, Any] | None = None,
         json_data: bool = False,
-    ) -> tuple[BeautifulSoup, Response]:
+    ) -> tuple[BeautifulSoup, ClientResponse]:
         """Return request response context data."""
         _LOGGER.debug(
             "%s request: %s with payload %s [json=%s]",
@@ -255,22 +255,23 @@ 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(
             "Response %s for url %s with content type: %s",
-            resp.status_code,
+            resp.status,
             url,
             content_type,
         )
 
         await self._save_to_file(
-            resp.text,
+            await resp.text(),
             url,
             mimetypes.guess_extension(content_type.split(";")[0]) or ".raw",
         )
 
-        return BeautifulSoup(resp.content, "html.parser"), resp
+        return BeautifulSoup(await resp.read(), "html.parser"), resp
 
     async def _save_to_file(
         self,
@@ -311,7 +312,7 @@ class AmazonEchoApi:
 
         _LOGGER.warning("Saving data to %s", fullpath)
 
-        with Path.open(fullpath, "w+") as file:
+        with Path.open(fullpath, mode="w", encoding="utf-8") as file:
             file.write(data)
             file.write("\n")
 
@@ -364,7 +365,7 @@ class AmazonEchoApi:
         )
         resp_json = resp.json()
 
-        if resp.status_code != HTTPStatus.OK:
+        if resp.status != HTTPStatus.OK:
             _LOGGER.error(
                 "Cannot register device for %s: %s",
                 self._login_email,
@@ -499,8 +500,8 @@ class AmazonEchoApi:
     async def close(self) -> None:
         """Close http client session."""
         if hasattr(self, "session"):
-            _LOGGER.debug("Closing HTTP session (httpx)")
-            await self.session.aclose()
+            _LOGGER.debug("Closing HTTP session (aiohttp)")
+            await self.session.close()
 
     async def get_devices_data(
         self,
@@ -513,16 +514,16 @@ class AmazonEchoApi:
                 url=f"https://alexa.amazon.{self._domain}{URI_QUERIES[key]}",
             )
             _LOGGER.debug("Response URL: %s", raw_resp.url)
-            response_code = raw_resp.status_code
+            response_code = raw_resp.status
             _LOGGER.debug("Response code: |%s|", response_code)
 
-            response_data = raw_resp.text
+            response_data = await raw_resp.text()
             _LOGGER.debug("Response data: |%s|", response_data)
 
             if not self._csrf_cookie:
-                self._csrf_cookie = raw_resp.cookies.get(CSRF_COOKIE)
+                self._csrf_cookie = raw_resp.cookies.get(CSRF_COOKIE).value
 
-            json_data = {} if len(response_data) == 0 else raw_resp.json()
+            json_data = {} if len(response_data) == 0 else await raw_resp.json()
 
             _LOGGER.debug("JSON data: |%s|", json_data)
 
@@ -566,14 +567,14 @@ class AmazonEchoApi:
             method="GET",
             url=f"https://alexa.amazon.{self._domain}/api/bootstrap?version=0",
         )
-        if raw_resp.status_code != HTTPStatus.OK:
+        if raw_resp.status != HTTPStatus.OK:
             _LOGGER.debug(
                 "Session not authenticated: reply error %s",
-                raw_resp.status_code,
+                raw_resp.status,
             )
             return False
 
-        resp_json = raw_resp.json()
+        resp_json = await raw_resp.json()
         if not (authentication := resp_json.get("authentication")):
             _LOGGER.debug('Session not authenticated: reply missing "authentication"')
             return False

{aioamazondevices-1.3.0 → aioamazondevices-1.4.1}/src/aioamazondevices/const.py

@@ -74,4 +74,6 @@ DEVICE_TYPE_TO_MODEL = {
     "A3S5BH2HU6VAYF": "Echo Dot (Gen2)",
     "A4ZXE0RM7LQ7A": "Echo Dot (Gen5)",
     "AKNO1N0KSFN8L": "Echo Dot (Gen1)",
+    "A3C9PE6TNYLTCH": "Speaker Group",
+    "A1Q6UGEXJZWJQ0": "Fire TV Stick 4K",
 }