aioamazondevices 3.1.3__tar.gz → 3.1.5__tar.gz

{aioamazondevices-3.1.3 → aioamazondevices-3.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 3.1.3
+Version: 3.1.5
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli
@@ -19,7 +19,6 @@ Requires-Dist: aiohttp
 Requires-Dist: babel
 Requires-Dist: beautifulsoup4
 Requires-Dist: colorlog
-Requires-Dist: httpx
 Requires-Dist: orjson
 Requires-Dist: yarl
 Project-URL: Bug Tracker, https://github.com/chemelli74/aioamazondevices/issues

{aioamazondevices-3.1.3 → aioamazondevices-3.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioamazondevices"
-version = "3.1.3"
+version = "3.1.5"
 description = "Python library to control Amazon devices"
 authors = ["Simone Chemelli <simone.chemelli@gmail.com>"]
 license = "Apache-2.0"
@@ -23,7 +23,6 @@ packages = [
 
 [tool.poetry.dependencies]
 aiohttp = "*"
-httpx = "*"
 python = "^3.12"
 babel = "*"
 beautifulsoup4 = "*"

{aioamazondevices-3.1.3 → aioamazondevices-3.1.5}/src/aioamazondevices/__init__.py

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

{aioamazondevices-3.1.3 → aioamazondevices-3.1.5}/src/aioamazondevices/api.py

@@ -15,7 +15,7 @@ from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
 
 import orjson
-from aiohttp import ClientResponse, ClientSession
+from aiohttp import ClientConnectorError, ClientResponse, ClientSession
 from babel import Locale
 from bs4 import BeautifulSoup, Tag
 from multidict import CIMultiDictProxy, MultiDictProxy
@@ -52,8 +52,9 @@ from .const import (
 )
 from .exceptions import (
     CannotAuthenticate,
+    CannotConnect,
     CannotRegisterDevice,
-    RequestFailed,
+    CannotRetrieveData,
     WrongMethod,
 )
 
@@ -328,13 +329,17 @@ class AmazonEchoApi:
         _cookies = (
             self._load_website_cookies() if self._login_stored_data else self._cookies
         )
-        resp = await self.session.request(
-            method,
-            URL(url, encoded=True),
-            data=input_data if not json_data else orjson.dumps(input_data),
-            cookies=_cookies,
-            headers=headers,
-        )
+        try:
+            resp = await self.session.request(
+                method,
+                URL(url, encoded=True),
+                data=input_data if not json_data else orjson.dumps(input_data),
+                cookies=_cookies,
+                headers=headers,
+            )
+        except (TimeoutError, ClientConnectorError) as exc:
+            raise CannotConnect(f"Connection error during {method}") from exc
+
         self._cookies.update(**await self._parse_cookies_from_headers(resp.headers))
 
         content_type: str = resp.headers.get("Content-Type", "")
@@ -351,9 +356,11 @@ class AmazonEchoApi:
                 HTTPStatus.PROXY_AUTHENTICATION_REQUIRED,
                 HTTPStatus.UNAUTHORIZED,
             ]:
-                raise CannotAuthenticate
-            if not self._ignore_ap_sigin_error(resp):
-                raise RequestFailed
+                raise CannotAuthenticate(HTTPStatus(resp.status).phrase)
+            if not await self._ignore_ap_sigin_error(resp):
+                raise CannotRetrieveData(
+                    f"Request failed: {HTTPStatus(resp.status).phrase}"
+                )
 
         await self._save_to_file(
             await resp.text(),
@@ -457,12 +464,13 @@ class AmazonEchoApi:
         resp_json = await resp.json()
 
         if resp.status != HTTPStatus.OK:
+            msg = resp_json["response"]["error"]["message"]
             _LOGGER.error(
                 "Cannot register device for %s: %s",
                 self._login_email,
-                resp_json["response"]["error"]["message"],
+                msg,
             )
-            raise CannotRegisterDevice(resp_json)
+            raise CannotRegisterDevice(f"{HTTPStatus(resp.status).phrase}: {msg}")
 
         await self._save_to_file(
             await resp.text(),

aioamazondevices-3.1.5/src/aioamazondevices/exceptions.py

@@ -0,0 +1,27 @@
+"""Comelit SimpleHome library exceptions."""
+
+from __future__ import annotations
+
+
+class AmazonError(Exception):
+    """Base class for aioamazondevices errors."""
+
+
+class CannotConnect(AmazonError):
+    """Exception raised when connection fails."""
+
+
+class CannotAuthenticate(AmazonError):
+    """Exception raised when credentials are incorrect."""
+
+
+class CannotRetrieveData(AmazonError):
+    """Exception raised when data retrieval fails."""
+
+
+class CannotRegisterDevice(AmazonError):
+    """Exception raised when device registration fails."""
+
+
+class WrongMethod(AmazonError):
+    """Exception raised when the wrong login metho is used."""

aioamazondevices-3.1.3/src/aioamazondevices/exceptions.py

@@ -1,55 +0,0 @@
-"""Comelit SimpleHome library exceptions."""
-
-from __future__ import annotations
-
-
-class AmazonError(Exception):
-    """Base class for aioamazondevices errors."""
-
-
-class CannotConnect(AmazonError):
-    """Exception raised when connection fails."""
-
-
-class CannotAuthenticate(AmazonError):
-    """Exception raised when credentials are incorrect."""
-
-
-class CannotRetrieveData(AmazonError):
-    """Exception raised when data retrieval fails."""
-
-
-class CannotRegisterDevice(AmazonError):
-    """Exception raised when device registration fails."""
-
-
-class RequestFailed(AmazonError):
-    """Exception raised when a request fails."""
-
-
-class WrongMethod(AmazonError):
-    """Exception raised when the wrong login metho is used."""
-
-
-class AuthFlowError(AmazonError):
-    """Exception raised when auth flow fails."""
-
-
-class AuthMissingTimestamp(AmazonError):
-    """Exception raised when expires timestamp is missing."""
-
-
-class AuthMissingAccessToken(AmazonError):
-    """Exception raised when access token is missing."""
-
-
-class AuthMissingRefreshToken(AmazonError):
-    """Exception raised when refresh token is missing."""
-
-
-class AuthMissingSigningData(AmazonError):
-    """Exception raised when some data for signing are missing."""
-
-
-class AuthMissingWebsiteCookies(AmazonError):
-    """Exception raised when website cookies are missing."""