[errors] minor fixes to errors handling

Author: capcom6

android_sms_gateway/ahttp.py

@@ -77,6 +77,9 @@ async def __aexit__(self, exc_type, exc_val, exc_tb):
         async def _process_response(self, response: aiohttp.ClientResponse) -> dict:
             try:
                 response.raise_for_status()
+                if response.status == 204:
+                    return {}
+
                 return await response.json()
             except aiohttp.ClientResponseError as e:
                 # Extract error message from response if available
@@ -89,7 +92,9 @@ async def _process_response(self, response: aiohttp.ClientResponse) -> dict:
 
                 # Use the error mapping to create appropriate exception
                 error_message = str(e) or "HTTP request failed"
-                raise error_from_status(error_message, response.status, error_data)
+                raise error_from_status(
+                    error_message, response.status, error_data
+                ) from e
 
         async def get(
             self, url: str, *, headers: t.Optional[t.Dict[str, str]] = None
@@ -183,6 +188,9 @@ async def __aexit__(self, exc_type, exc_val, exc_tb):
         async def _process_response(self, response: httpx.Response) -> dict:
             try:
                 response.raise_for_status()
+                if response.status_code == 204:
+                    return {}
+
                 return response.json()
             except httpx.HTTPStatusError as e:
                 # Extract error message from response if available
@@ -195,7 +203,9 @@ async def _process_response(self, response: httpx.Response) -> dict:
 
                 # Use the error mapping to create appropriate exception
                 error_message = str(e) or "HTTP request failed"
-                raise error_from_status(error_message, response.status_code, error_data)
+                raise error_from_status(
+                    error_message, response.status_code, error_data
+                ) from e
 
         async def get(
             self, url: str, *, headers: t.Optional[t.Dict[str, str]] = None

android_sms_gateway/domain.py

@@ -1,6 +1,7 @@
 import base64
 import dataclasses
 import datetime
+import enum
 import typing as t
 
 from .enums import ProcessState, WebhookEvent, MessagePriority
@@ -18,7 +19,7 @@ class Message:
 
     Attributes:
         phone_numbers (List[str]): Recipients (phone numbers).
-        tex_message (Optional[TextMessage]): Text message.
+        text_message (Optional[TextMessage]): Text message.
         data_message (Optional[DataMessage]): Data message.
         priority (Optional[MessagePriority]): Priority.
         sim_number (Optional[int]): SIM card number (1-3), if not set - default SIM will be used.
@@ -60,14 +61,20 @@ def asdict(self) -> t.Dict[str, t.Any]:
         Returns:
             Dict[str, Any]: A dictionary representation of the message.
         """
+
+        def _serialize(value: t.Any) -> t.Any:
+            if hasattr(value, "asdict"):
+                return value.asdict()
+            if isinstance(value, datetime.datetime):
+                return value.isoformat()
+            if isinstance(value, enum.Enum):
+                return value.value
+            return value
+
         return {
-            snake_to_camel(field.name): (
-                getattr(self, field.name).asdict()
-                if hasattr(getattr(self, field.name), "asdict")
-                else getattr(self, field.name)
-            )
-            for field in dataclasses.fields(self)
-            if getattr(self, field.name) is not None
+            snake_to_camel(f.name): _serialize(getattr(self, f.name))
+            for f in dataclasses.fields(self)
+            if getattr(self, f.name) is not None
         }
 
 

android_sms_gateway/http.py

@@ -133,6 +133,9 @@ def patch(
         def _process_response(self, response: requests.Response) -> dict:
             try:
                 response.raise_for_status()
+                if response.status_code == 204:
+                    return {}
+
                 return response.json()
             except requests.exceptions.HTTPError as e:
                 # Extract error message from response if available
@@ -145,7 +148,9 @@ def _process_response(self, response: requests.Response) -> dict:
 
                 # Use the error mapping to create appropriate exception
                 error_message = str(e) or "HTTP request failed"
-                raise error_from_status(error_message, response.status_code, error_data)
+                raise error_from_status(
+                    error_message, response.status_code, error_data
+                ) from e
 
     DEFAULT_CLIENT = RequestsHttpClient
 except ImportError:
@@ -176,6 +181,9 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         def _process_response(self, response: httpx.Response) -> dict:
             try:
                 response.raise_for_status()
+                if response.status_code == 204:
+                    return {}
+
                 return response.json()
             except httpx.HTTPStatusError as e:
                 # Extract error message from response if available
@@ -188,7 +196,9 @@ def _process_response(self, response: httpx.Response) -> dict:
 
                 # Use the error mapping to create appropriate exception
                 error_message = str(e) or "HTTP request failed"
-                raise error_from_status(error_message, response.status_code, error_data)
+                raise error_from_status(
+                    error_message, response.status_code, error_data
+                ) from e
 
         def get(
             self, url: str, *, headers: t.Optional[t.Dict[str, str]] = None

tests/test_client.py

@@ -71,10 +71,10 @@ def test_webhook_create(self, client: APIClient):
     def test_webhook_create_invalid_url(self, client: APIClient):
         """
         Tests that attempting to create a webhook with an invalid URL raises an
-        `HTTPError`.
+        `errors.APIError`.
 
         The test creates a webhook with an invalid URL, and then asserts that an
-        `HTTPError` is raised.
+        `errors.APIError` is raised.
 
         :param client: An instance of `APIClient`.
         """

tests/test_error_handling.py

@@ -1,22 +1,23 @@
-import pytest
 from unittest.mock import Mock
-import requests
-import httpx
+
 import aiohttp
+import httpx
+import pytest
+import requests
 
+from android_sms_gateway.ahttp import AiohttpAsyncHttpClient, HttpxAsyncHttpClient
 from android_sms_gateway.errors import (
     APIError,
     BadRequestError,
-    UnauthorizedError,
     ForbiddenError,
-    NotFoundError,
+    GatewayTimeoutError,
     InternalServerError,
+    NotFoundError,
     ServiceUnavailableError,
-    GatewayTimeoutError,
+    UnauthorizedError,
     error_from_status,
 )
-from android_sms_gateway.http import RequestsHttpClient, HttpxHttpClient
-from android_sms_gateway.ahttp import AiohttpAsyncHttpClient, HttpxAsyncHttpClient
+from android_sms_gateway.http import HttpxHttpClient, RequestsHttpClient
 
 
 class TestErrorFromStatus: