finalsa-common-http-client 0.0.3__py3-none-any.whl → 0.0.5__py3-none-any.whl

finalsa/http/_shared.py

@@ -2,8 +2,10 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 from importlib import metadata
+from typing import Any, Dict
 from urllib.parse import urljoin
 
+from finalsa.common.models import BaseDomainException
 from finalsa.traceability import get_w3c_traceparent, get_w3c_tracestate
 from finalsa.traceability.functions import (
     HTTP_HEADER_TRACEPARENT,
@@ -13,6 +15,18 @@ from finalsa.traceability.functions import (
 Headers = Mapping[str, str]
 
 
+class InternalHttpError(BaseDomainException):
+    """Exception raised when a service is unavailable."""
+    response_code = 500
+
+    def __init__(self, response_code: int | None = None):
+        super().__init__(
+            message="Internal HTTP error",
+            response_code=response_code or self.response_code,
+            name="InternalHttpError"
+        )
+
+
 def normalize_base_url(
     base_url: str | None,
     default_scheme: str,
@@ -92,3 +106,11 @@ def get_package_version(package_name: str = "finalsa-http-client") -> str:
     except metadata.PackageNotFoundError:
         return "0.0.0"
 
+
+def raise_for_response(response: Dict[str, Any], status: int) -> None:
+    if response.get("message") and response.get("name"):
+        raise BaseDomainException(
+            message=response.get("message"),
+            response_code=status,
+            name=response.get("name")
+        )

finalsa/http/async_client/base.py

@@ -4,8 +4,7 @@ from collections.abc import Mapping
 from typing import Any
 
 import aiohttp
-from aiohttp import ClientResponseError, ClientSession, ClientTimeout
-from finalsa.common.models import BaseDomainException
+from aiohttp import ClientSession, ClientTimeout
 
 from finalsa.http import _shared as shared
 
@@ -27,14 +26,12 @@ class BaseAsyncHttpClient:
         default_scheme: str = "http",
         service_name: str = "finalsa-http-client",
         trust_env: bool = False,
-        raise_for_status: bool = True,
         session: ClientSession | None = None,
     ) -> None:
         self._default_scheme = default_scheme
         self.base_url = shared.normalize_base_url(base_url, default_scheme)
         self._timeout = self._normalize_timeout(timeout)
         self._trust_env = trust_env
-        self._raise_for_status = raise_for_status
         self._session = session
         self._owns_session = session is None
         self._default_headers = shared.build_default_headers(
@@ -76,6 +73,17 @@ class BaseAsyncHttpClient:
             default_scheme=self._default_scheme,
         )
 
+    async def raise_for_status(self, response: aiohttp.ClientResponse) -> None:
+        headers = response.headers if isinstance(
+            response.headers, Mapping) else response['headers']
+        if response.status < 400:
+            return
+        if "Content-Type" in headers and headers["Content-Type"] == "application/json":
+            data = await response.json()
+            shared.raise_for_response(data, response.status)
+        else:
+            raise shared.InternalHttpError(response.status)
+
     async def request(
         self,
         method: str,
@@ -102,31 +110,17 @@ class BaseAsyncHttpClient:
         )
         merged_headers = shared.merge_headers(self._default_headers, headers)
         request_timeout = self._normalize_timeout(timeout) or self._timeout
-        response = None
-        try:
-
-            response = await session.request(
-                method.upper(),
-                resolved_url,
-                headers=merged_headers,
-                params=params,
-                json=json,
-                data=data,
-                timeout=request_timeout,
-                **kwargs,
-            )
-            response.raise_for_status()
-            return response
-        except ClientResponseError as e:
-            if "Content-Type" in e.headers and e.headers["Content-Type"] == "application/json" and response is not None:
-                data = await response.json()
-                if data.get("message") and data.get("name"):
-                    raise BaseDomainException(
-                        message=data.get("message"),
-                        response_code=response.status_code,
-                        name=data.get("name")
-                    ) from e
-            raise e
+        response = await session.request(
+            method.upper(),
+            resolved_url,
+            headers=merged_headers,
+            params=params,
+            json=json,
+            data=data,
+            timeout=request_timeout,
+            **kwargs,
+        )
+        return response
 
     async def get(self, path: str, **kwargs: Any) -> aiohttp.ClientResponse:
         return await self.request("GET", path, **kwargs)
@@ -155,6 +149,7 @@ class BaseAsyncHttpClient:
             self._session = aiohttp.ClientSession(
                 timeout=self._timeout,
                 trust_env=self._trust_env,
+                raise_for_status=self.raise_for_status,
             )
         return self._session
 

{finalsa_common_http_client-0.0.3.dist-info → finalsa_common_http_client-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: finalsa-common-http-client
-Version: 0.0.3
+Version: 0.0.5
 Summary: HTTP client library for common data types used in business applications
 Project-URL: Homepage, https://github.com/finalsa/finalsa-http-client
 Project-URL: Documentation, https://github.com/finalsa/finalsa-http-client#readme

finalsa_common_http_client-0.0.5.dist-info/RECORD

@@ -0,0 +1,10 @@
+finalsa/http/__init__.py,sha256=tTeA_AP5gfFiXF783AxX5ZtSiQXxR1jkQ196J9YxXNk,419
+finalsa/http/_shared.py,sha256=qrgleO4fbDZC3J1UNfdzMsl43yRItjAZa1I3XcRXT38,3471
+finalsa/http/async_client/__init__.py,sha256=L25WfVpUpPZlMv6-cgeWlNvmK5UJOhLZ1NOndcIsA9w,73
+finalsa/http/async_client/base.py,sha256=z3S1tDyx8iNhipuwoOreiD0nrPcvBeHbjcT_SnPzzng,5753
+finalsa/http/sync_client/__init__.py,sha256=ocLE6dofwYCD9_rJpIP1KhlIujRFcaJfhoaeXVrSCVE,59
+finalsa/http/sync_client/base.py,sha256=9hGvci9USjmp9gG_uKAdcj-hsF79NJ3pvmNVlA5K6u8,5406
+finalsa_common_http_client-0.0.5.dist-info/METADATA,sha256=4elkFxtT6Z4z92u1GNjtGpaAi6WDhANLi0sMMWqBCbA,9102
+finalsa_common_http_client-0.0.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+finalsa_common_http_client-0.0.5.dist-info/licenses/LICENSE.md,sha256=_lu-V-f2tGID1BS2V_W6D2XWppBsylFF1J2KEpfIXN0,1084
+finalsa_common_http_client-0.0.5.dist-info/RECORD,,

finalsa_common_http_client-0.0.3.dist-info/RECORD

@@ -1,10 +0,0 @@
-finalsa/http/__init__.py,sha256=tTeA_AP5gfFiXF783AxX5ZtSiQXxR1jkQ196J9YxXNk,419
-finalsa/http/_shared.py,sha256=cYrac3Tjai7fv8KiyKi7Y5M5u88Q-lcTFS3XsEgy-IQ,2729
-finalsa/http/async_client/__init__.py,sha256=L25WfVpUpPZlMv6-cgeWlNvmK5UJOhLZ1NOndcIsA9w,73
-finalsa/http/async_client/base.py,sha256=OKaxKU1WDxpGi3bzBZxcjnIo7XcadKiPQ7fb93DBsvg,5994
-finalsa/http/sync_client/__init__.py,sha256=ocLE6dofwYCD9_rJpIP1KhlIujRFcaJfhoaeXVrSCVE,59
-finalsa/http/sync_client/base.py,sha256=9hGvci9USjmp9gG_uKAdcj-hsF79NJ3pvmNVlA5K6u8,5406
-finalsa_common_http_client-0.0.3.dist-info/METADATA,sha256=atIi-1FGxjq-DaI4ih6MwDaRUzoKOE29IBuEo6i_EFo,9102
-finalsa_common_http_client-0.0.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-finalsa_common_http_client-0.0.3.dist-info/licenses/LICENSE.md,sha256=_lu-V-f2tGID1BS2V_W6D2XWppBsylFF1J2KEpfIXN0,1084
-finalsa_common_http_client-0.0.3.dist-info/RECORD,,