finalsa-common-http-client 0.0.7__py3-none-any.whl → 0.1.0__py3-none-any.whl

finalsa/http/__init__.py

@@ -1,4 +1,5 @@
 from ._shared import (
+    ValidationError,
     build_default_headers,
     build_url,
     ensure_scheme,
@@ -9,5 +10,15 @@ from ._shared import (
 from .async_client import BaseAsyncHttpClient
 from .sync_client import BaseSyncHttpClient
 
-__all__ = ["BaseSyncHttpClient", "BaseAsyncHttpClient", "normalize_base_url", "ensure_scheme", "build_url", "merge_headers", "build_default_headers", "get_package_version"]
+__all__ = [
+    "BaseAsyncHttpClient",
+    "BaseSyncHttpClient",
+    "ValidationError",
+    "build_default_headers",
+    "build_url",
+    "ensure_scheme",
+    "get_package_version",
+    "merge_headers",
+    "normalize_base_url",
+]
 

finalsa/http/_shared.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 from importlib import metadata
-from typing import Any, Dict
+from typing import Any, Dict, List
 from urllib.parse import urljoin
 
 from finalsa.common.models import BaseDomainException
@@ -11,6 +11,7 @@ from finalsa.traceability.functions import (
     HTTP_HEADER_TRACEPARENT,
     HTTP_HEADER_TRACESTATE,
 )
+from orjson import dumps
 
 Headers = Mapping[str, str]
 
@@ -27,6 +28,32 @@ class InternalHttpError(BaseDomainException):
         )
 
 
+class ValidationError(BaseDomainException):
+    """Exception raised when FastAPI/Pydantic returns validation errors (422)."""
+
+    response_code = 422
+
+    def __init__(
+        self,
+        fields: List[Dict[str, Any]],
+        error: List[Dict[str, Any]],
+        response_code: int | None = None,
+    ) -> None:
+        message = "Validation error"
+        if fields:
+            msg_parts = [
+                f"{'/'.join(str(loc) for loc in f.get('loc', []))}: {f.get('msg', '')}" for f in fields]
+            if msg_parts:
+                message = "; ".join(msg_parts)
+        super().__init__(
+            message=message,
+            response_code=response_code or self.response_code,
+            name="ValidationError",
+        )
+        self.fields = fields
+        self.error = error
+
+
 def normalize_base_url(
     base_url: str | None,
     default_scheme: str,
@@ -42,6 +69,20 @@ def normalize_base_url(
     return value.rstrip("/")
 
 
+def parse_params(params: Mapping[str, Any] | None ) -> dict[str, str | int | float | bytes] | None:
+    if params is None:
+        return None
+    result = {}
+    for key, value in params.items():
+        if value is not None:
+            result[key] = value
+        if isinstance(value, dict):
+            result[key] = dumps(value)
+        if isinstance(value, list):
+            result[key] = dumps(value)
+    return result
+
+
 def ensure_scheme(candidate: str, default_scheme: str) -> str:
     """Ensure that the provided candidate has an explicit scheme."""
     trimmed = candidate.strip()
@@ -107,7 +148,20 @@ def get_package_version(package_name: str = "finalsa-http-client") -> str:
         return "0.0.0"
 
 
+def _is_pydantic_validation_error(response: Dict[str, Any], status: int) -> bool:
+    return status == 422 and "detail" in response and isinstance(response["detail"], list)
+
+
 def raise_for_response(response: Dict[str, Any], status: int) -> None:
+    if _is_pydantic_validation_error(response, status):
+        detail = response["detail"]
+        fields = [d for d in detail if isinstance(
+            d, dict) and ("loc" in d or "msg" in d)]
+        raise ValidationError(
+            fields=fields,
+            error=detail,
+            response_code=status,
+        )
     if response.get("message") and response.get("name"):
         raise BaseDomainException(
             message=response.get("message"),

finalsa/http/async_client/base.py

@@ -1,13 +1,21 @@
 from __future__ import annotations
 
+import logging
+import ssl
+import time
 from collections.abc import Mapping
-from typing import Any
+from typing import Any, Type
 
 import aiohttp
+import certifi
 from aiohttp import ClientSession, ClientTimeout
+from finalsa.common.models import PaginationRequest, PaginationResponse
+from pydantic import BaseModel
 
 from finalsa.http import _shared as shared
 
+ssl_ctx = ssl.create_default_context(cafile=certifi.where())
+
 
 class BaseAsyncHttpClient:
     """Reusable aiohttp-based HTTP client with sane defaults."""
@@ -27,6 +35,7 @@ class BaseAsyncHttpClient:
         service_name: str = "finalsa-http-client",
         trust_env: bool = False,
         session: ClientSession | None = None,
+        raise_for_status: bool = True,
     ) -> None:
         self._default_scheme = default_scheme
         self.base_url = shared.normalize_base_url(base_url, default_scheme)
@@ -39,6 +48,8 @@ class BaseAsyncHttpClient:
             default_headers,
             service_name,
         )
+        self._raise_for_status = raise_for_status
+        self._logger = logging.getLogger("http")
 
     async def __aenter__(self) -> BaseAsyncHttpClient:
         await self._ensure_session()
@@ -73,14 +84,18 @@ class BaseAsyncHttpClient:
             default_scheme=self._default_scheme,
         )
 
-    async def raise_for_status(self, response: aiohttp.ClientResponse) -> None:
+    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()
+            self._logger.error(f"Received response with status {response.status}", extra={
+                               "status": response.status, "headers": headers, "data": data})
             shared.raise_for_response(data, response.status)
+        self._logger.error(f"Received response with status {response.status}", extra={
+                           "status": response.status, "headers": headers})
         raise shared.InternalHttpError(response.status)
 
     async def request(
@@ -109,16 +124,25 @@ class BaseAsyncHttpClient:
         )
         merged_headers = shared.merge_headers(self._default_headers, headers)
         request_timeout = self._normalize_timeout(timeout) or self._timeout
+        self._logger.info(f"{method.upper()} request to {resolved_url} with headers {merged_headers} and timeout {request_timeout}", extra={
+                          "headers": merged_headers, "timeout": request_timeout, "params": params})
+        start_time = time.time()
         response = await session.request(
             method.upper(),
             resolved_url,
             headers=merged_headers,
-            params=params,
+            params=shared.parse_params(params),
             json=json,
             data=data,
             timeout=request_timeout,
+            ssl=ssl_ctx,
             **kwargs,
         )
+        end_time = time.time()
+        duration = end_time - start_time
+        self._logger.info(
+            f"Received response from {resolved_url} with status {response.status}",
+            extra={"status": response.status, "duration": duration})
         return response
 
     async def get(self, path: str, **kwargs: Any) -> aiohttp.ClientResponse:
@@ -145,13 +169,25 @@ class BaseAsyncHttpClient:
 
     async def _ensure_session(self) -> ClientSession:
         if self._session is None or self._session.closed:
+            if self._raise_for_status:
+                raise_for_status = self.__raise_for_status__
+            else:
+                raise_for_status = None
             self._session = aiohttp.ClientSession(
                 timeout=self._timeout,
                 trust_env=self._trust_env,
-                raise_for_status=self.raise_for_status,
+                raise_for_status=raise_for_status,
             )
         return self._session
 
+    async def get_paginated(self, path: str, pagination_request: PaginationRequest, response_model: Type[BaseModel], **kwargs: Any) -> PaginationResponse[Type[BaseModel]]:
+        response = await self.get(path, params=pagination_request.model_dump(), **kwargs)
+        data = await response.json()
+        items = [response_model.model_validate_json(
+            item) for item in data["items"]]
+        data["items"] = items
+        return PaginationResponse[response_model](**data)
+
     def _normalize_timeout(
         self,
         timeout: float | ClientTimeout | None,

finalsa/http/sync_client/base.py

@@ -1,9 +1,13 @@
 from __future__ import annotations
 
+import logging
+import time
 from collections.abc import Mapping
-from typing import Any
+from typing import Any, Type
 
 import requests
+from finalsa.common.models import PaginationRequest, PaginationResponse
+from pydantic import BaseModel
 
 from finalsa.http import _shared as shared
 
@@ -40,6 +44,7 @@ class BaseSyncHttpClient:
             default_headers,
             service_name,
         )
+        self._logger = logging.getLogger("http")
 
     def __enter__(self) -> BaseSyncHttpClient:
         self._ensure_session()
@@ -100,23 +105,35 @@ class BaseSyncHttpClient:
         merged_headers = shared.merge_headers(self._default_headers, headers)
         request_timeout = timeout if timeout is not None else self._timeout
         try:
+            self._logger.info(f"{method.upper()} request to {resolved_url} with headers {merged_headers} and timeout {request_timeout}", extra={
+                              "headers": merged_headers, "timeout": request_timeout, "params": params})
+            start_time = time.time()
             response = session.request(
                 method.upper(),
                 resolved_url,
                 headers=merged_headers,
-                params=params,
+                params=shared.parse_params(params),
                 json=json,
                 data=data,
                 timeout=request_timeout,
                 **kwargs,
             )
+            end_time = time.time()
+            duration = end_time - start_time
+            self._logger.info(f"Received response from {resolved_url} with status {response.status}", extra={
+                              "status": response.status, "duration": duration})
             if self._raise_for_status:
                 response.raise_for_status()
             return response
         except requests.RequestException as e:
             if e.response is not None and "Content-Type" in e.response.headers and e.response.headers["Content-Type"] == "application/json":
                 data = e.response.json()
+                self._logger.error(f"Received response with status {e.response.status_code}", extra={
+                                   "status": e.response.status_code, "headers": e.response.headers, "data": data})
                 shared.raise_for_response(data, e.response.status_code)
+
+            self._logger.error(f"Received response with status {e.response.status_code}", extra={
+                               "status": e.response.status_code, "headers": e.response.headers})
             raise e
 
     def get(self, path: str, **kwargs: Any) -> requests.Response:
@@ -140,6 +157,14 @@ class BaseSyncHttpClient:
             self._session.close()
             self._session = None
 
+    def get_paginated(self, path: str, pagination_request: PaginationRequest, response_model: Type[BaseModel], **kwargs: Any) -> PaginationResponse[Type[BaseModel]]:
+        response = self.get(path, params=pagination_request.model_dump(), **kwargs)
+        data = response.json()
+        items = [response_model.model_validate_json(
+            item) for item in data["items"]]
+        data["items"] = items
+        return PaginationResponse[response_model](**data)
+
     def _ensure_session(self) -> requests.Session:
         if self._session is None:
             session = requests.Session()

{finalsa_common_http_client-0.0.7.dist-info → finalsa_common_http_client-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: finalsa-common-http-client
-Version: 0.0.7
+Version: 0.1.0
 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
@@ -45,11 +45,11 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Localization
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
-Requires-Dist: aiohttp>=3.10.5
-Requires-Dist: fastapi>=0.116.1
-Requires-Dist: finalsa-common-models>=2.0.4
+Requires-Dist: aiohttp>=3.13.3
+Requires-Dist: fastapi>=0.128.0
+Requires-Dist: finalsa-common-models>=2.1.1
 Requires-Dist: finalsa-traceability>=1.0.1
-Requires-Dist: requests>=2.32.4
+Requires-Dist: requests>=2.32.5
 Description-Content-Type: text/markdown
 
 # Finalsa HTTP Client

finalsa_common_http_client-0.1.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+finalsa/http/__init__.py,sha256=w6M9CRcx2gCy1u-HLhLZ_0kQX92JEbFiGi4MBYqR3OI,498
+finalsa/http/_shared.py,sha256=N3lH8m7hCHLTRCDASi2U8-TCweuEIfKQDVtMQgX_j38,5246
+finalsa/http/async_client/__init__.py,sha256=L25WfVpUpPZlMv6-cgeWlNvmK5UJOhLZ1NOndcIsA9w,73
+finalsa/http/async_client/base.py,sha256=aZc_wY9RxiTGDhbXw6afMyCm9FAv_GsZqRO_SiOOJYY,7658
+finalsa/http/sync_client/__init__.py,sha256=ocLE6dofwYCD9_rJpIP1KhlIujRFcaJfhoaeXVrSCVE,59
+finalsa/http/sync_client/base.py,sha256=OQckgQgHrnxiNIRo6TNDtUGFs60b7F8PQoRAyd-ui3c,6769
+finalsa_common_http_client-0.1.0.dist-info/METADATA,sha256=W8yXtBhlYOiWmoh_-nohjXdygNbtwVczGv6qWrJhiWE,9102
+finalsa_common_http_client-0.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+finalsa_common_http_client-0.1.0.dist-info/licenses/LICENSE.md,sha256=yqzhfnTBr2S4lUBx-yibVPOIXRUDPrSUN9-_7AsC6OU,1084
+finalsa_common_http_client-0.1.0.dist-info/RECORD,,

finalsa_common_http_client-0.0.7.dist-info/RECORD

@@ -1,10 +0,0 @@
-finalsa/http/__init__.py,sha256=tTeA_AP5gfFiXF783AxX5ZtSiQXxR1jkQ196J9YxXNk,419
-finalsa/http/_shared.py,sha256=EdWPQwVrOd-yBs0VdIAKE8u2kiEm2gyraEvODJIZzek,3489
-finalsa/http/async_client/__init__.py,sha256=L25WfVpUpPZlMv6-cgeWlNvmK5UJOhLZ1NOndcIsA9w,73
-finalsa/http/async_client/base.py,sha256=22L6QLfjAF4H8z9CcE8PhNuI2lJFbUkRLE405YXUFWw,5735
-finalsa/http/sync_client/__init__.py,sha256=ocLE6dofwYCD9_rJpIP1KhlIujRFcaJfhoaeXVrSCVE,59
-finalsa/http/sync_client/base.py,sha256=IsyVZrTweg78eAA0cahp6RGJFhmHpeNYuTtVJuhZIZs,5126
-finalsa_common_http_client-0.0.7.dist-info/METADATA,sha256=wNuVrZs-9bFbQ_9jUQKJBlyDf0wSNU7N9COu-8fB3ZA,9102
-finalsa_common_http_client-0.0.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-finalsa_common_http_client-0.0.7.dist-info/licenses/LICENSE.md,sha256=yqzhfnTBr2S4lUBx-yibVPOIXRUDPrSUN9-_7AsC6OU,1084
-finalsa_common_http_client-0.0.7.dist-info/RECORD,,