apexdevkit 1.18.11__tar.gz → 1.19.1__tar.gz

{apexdevkit-1.18.11 → apexdevkit-1.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: apexdevkit
-Version: 1.18.11
+Version: 1.19.1
 Summary: Apex Development Tools for python.
 Author: Apex Dev
 Author-email: dev@apex.ge

{apexdevkit-1.18.11 → apexdevkit-1.19.1}/apexdevkit/fastapi/builder.py

@@ -53,7 +53,7 @@ class FastApiBuilder:
 
     def with_mounted(self, **apps: FastAPI) -> Self:
         for path, app in apps.items():
-            self.app.mount(f'/{path.replace("_", "-")}', app)
+            self.app.mount(f"/{path.replace('_', '-')}", app)
 
         return self
 

apexdevkit-1.19.1/apexdevkit/http/httpx/__init__.py

@@ -0,0 +1,6 @@
+from .client import Httpx, HttpxConfig
+
+__all__ = [
+    "Httpx",
+    "HttpxConfig",
+]

apexdevkit-1.18.11/apexdevkit/http/httpx.py → apexdevkit-1.19.1/apexdevkit/http/httpx/client.py

@@ -1,15 +1,22 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import Any, Iterator, Mapping, Self
+from typing import Any, Callable, Iterator, Mapping
 
 import httpx
-from httpx import Client
 
 from apexdevkit.http.fluent import HttpMethod, HttpResponse
+from apexdevkit.http.httpx.hooks import (
+    AfterResponseHook,
+    BeforeRequestHook,
+    HttpxHandler,
+)
 from apexdevkit.http.json import JsonDict
 from apexdevkit.http.url import HttpUrl
 
+_RequestHandler = HttpxHandler[httpx.Request]
+_ResponseHandler = HttpxHandler[httpx.Response]
+
 
 def default_config() -> HttpxConfig:
     return HttpxConfig()
@@ -21,10 +28,6 @@ class Httpx:
 
     config: HttpxConfig = field(default_factory=default_config)
 
-    @classmethod
-    def create_for(cls, url: str) -> Self:
-        return cls(Client(base_url=url))
-
     def with_endpoint(self, value: str) -> Httpx:
         return Httpx(self.client, self.config.with_endpoint(value))
 
@@ -45,6 +48,53 @@ class Httpx:
             )
         )
 
+    @dataclass
+    class Builder:
+        config: HttpxConfig = field(default_factory=default_config)
+
+        request_handlers: list[_RequestHandler] = field(default_factory=list)
+        response_handlers: list[_ResponseHandler] = field(default_factory=list)
+
+        url: str = field(init=False)
+
+        def with_url(self, value: str) -> Httpx.Builder:
+            self.url = value
+
+            return self
+
+        def and_config(self, value: HttpxConfig) -> Httpx.Builder:
+            self.config = value
+
+            return self
+
+        def before_request(self, handler: _RequestHandler) -> Httpx.Builder:
+            self.request_handlers.append(handler)
+
+            return self
+
+        def after_response(self, handler: _ResponseHandler) -> Httpx.Builder:
+            self.response_handlers.append(handler)
+
+            return self
+
+        def build(self) -> Httpx:
+            return Httpx(self._build_client(), self.config)
+
+        def _build_client(self) -> httpx.Client:
+            return httpx.Client(
+                base_url=self.url,
+                event_hooks={
+                    "request": self._build_before_request_hooks(),
+                    "response": self._build_after_response_hooks(),
+                },
+            )
+
+        def _build_before_request_hooks(self) -> list[Callable[..., Any]]:
+            return [BeforeRequestHook(handler) for handler in self.request_handlers]
+
+        def _build_after_response_hooks(self) -> list[Callable[..., Any]]:
+            return [AfterResponseHook(handler) for handler in self.response_handlers]
+
 
 @dataclass(frozen=True)
 class _HttpxResponse:

apexdevkit-1.19.1/apexdevkit/http/httpx/hooks.py

@@ -0,0 +1,72 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Generic, Protocol, TypeVar
+
+import httpx
+
+ContextT = TypeVar("ContextT", contravariant=True)
+
+
+class HttpxHandler(Protocol[ContextT]):
+    def on_get(self, context: ContextT) -> None:
+        pass
+
+    def on_post(self, context: ContextT) -> None:
+        pass
+
+    def on_patch(self, context: ContextT) -> None:
+        pass
+
+    def on_delete(self, context: ContextT) -> None:
+        pass
+
+
+class DefaultHandler(Generic[ContextT]):
+    def on_get(self, context: ContextT) -> None:
+        pass
+
+    def on_post(self, context: ContextT) -> None:
+        pass
+
+    def on_patch(self, context: ContextT) -> None:
+        pass
+
+    def on_delete(self, context: ContextT) -> None:
+        pass
+
+
+@dataclass(frozen=True)
+class BeforeRequestHook:
+    handler: HttpxHandler[httpx.Request]
+
+    def __call__(self, request: httpx.Request) -> None:
+        match request.method.upper():
+            case "GET":
+                self.handler.on_get(request)
+            case "POST":
+                self.handler.on_post(request)
+            case "PATCH":
+                self.handler.on_patch(request)
+            case "DELETE":
+                self.handler.on_delete(request)
+            case _:
+                pass
+
+
+@dataclass(frozen=True)
+class AfterResponseHook:
+    handler: HttpxHandler[httpx.Response]
+
+    def __call__(self, response: httpx.Response) -> None:
+        match response.request.method.upper():
+            case "GET":
+                self.handler.on_get(response)
+            case "POST":
+                self.handler.on_post(response)
+            case "PATCH":
+                self.handler.on_patch(response)
+            case "DELETE":
+                self.handler.on_delete(response)
+            case _:
+                pass

{apexdevkit-1.18.11 → apexdevkit-1.19.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.18.11"
+version = "1.19.1"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"