unique_toolkit 1.8.1__py3-none-any.whl → 1.9.0__py3-none-any.whl

unique_toolkit/_common/api_calling/human_verification_manager.py

@@ -15,6 +15,7 @@ from unique_toolkit._common.endpoint_builder import (
     ResponseType,
 )
 from unique_toolkit._common.endpoint_requestor import (
+    RequestContext,
     RequestorType,
     build_requestor,
 )
@@ -163,7 +164,7 @@ class HumanVerificationManagerForApiCalling(
     def call_api(
         self,
         *,
-        headers: dict[str, str],
+        context: RequestContext,
         path_params: PathParamsType,
         payload: PayloadType,
     ) -> ResponseType:
@@ -171,7 +172,7 @@ class HumanVerificationManagerForApiCalling(
         params.update(payload.model_dump())
 
         response = self._requestor.request(
-            headers=headers,
+            context=context,
             **params,
         )
         return self._operation.handle_response(response)

unique_toolkit/_common/endpoint_requestor.py

@@ -1,5 +1,6 @@
 from enum import StrEnum
 from typing import Any, Callable, Generic, Protocol, TypeVar
+from urllib.parse import urljoin, urlparse
 
 from pydantic import BaseModel
 from typing_extensions import ParamSpec
@@ -24,11 +25,40 @@ CombinedParamsType = TypeVar("CombinedParamsType", bound=BaseModel)
 ResponseT_co = TypeVar("ResponseT_co", bound=BaseModel, covariant=True)
 
 
+def _construct_full_url(base_url: str, url: str) -> str:
+    """
+    Construct full URL from base_url and url.
+    If base_url is provided and url is absolute, strip the scheme/netloc from url.
+    """
+    if not base_url:
+        return url
+
+    parsed = urlparse(url)
+    if parsed.scheme:
+        # URL is absolute, extract only path + query + fragment
+        url = parsed._replace(scheme="", netloc="").geturl()
+
+    return urljoin(base_url, url)
+
+
+class RequestContext(BaseModel):
+    base_url: str = ""
+    headers: dict[str, str] | None = None
+
+
 class EndpointRequestorProtocol(Protocol, Generic[CombinedParamsSpec, ResponseT_co]):
     @classmethod
     def request(
         cls,
-        headers: dict[str, str],
+        context: RequestContext,
+        *args: CombinedParamsSpec.args,
+        **kwargs: CombinedParamsSpec.kwargs,
+    ) -> ResponseT_co: ...
+
+    @classmethod
+    async def request_async(
+        cls,
+        context: RequestContext,
         *args: CombinedParamsSpec.args,
         **kwargs: CombinedParamsSpec.kwargs,
     ) -> ResponseT_co: ...
@@ -53,7 +83,7 @@ def build_fake_requestor(
         @classmethod
         def request(
             cls,
-            headers: dict[str, str],
+            context: RequestContext,
             *args: CombinedParamsSpec.args,
             **kwargs: CombinedParamsSpec.kwargs,
         ) -> ResponseType:
@@ -68,6 +98,18 @@ def build_fake_requestor(
 
             return cls._operation.handle_response(return_value)
 
+        @classmethod
+        async def request_async(
+            cls,
+            context: RequestContext,
+            headers: dict[str, str] | None = None,
+            *args: CombinedParamsSpec.args,
+            **kwargs: CombinedParamsSpec.kwargs,
+        ) -> ResponseType:
+            raise NotImplementedError(
+                "Async request not implemented for fake requestor"
+            )
+
     return FakeRequestor
 
 
@@ -91,7 +133,7 @@ def build_request_requestor(
         @classmethod
         def request(
             cls,
-            headers: dict[str, str],
+            context: RequestContext,
             *args: CombinedParamsSpec.args,
             **kwargs: CombinedParamsSpec.kwargs,
         ) -> ResponseType:
@@ -105,18 +147,159 @@ def build_request_requestor(
 
             response = requests.request(
                 method=cls._operation.request_method(),
-                url=url,
-                headers=headers,
+                url=_construct_full_url(context.base_url, url),
+                headers=context.headers,
                 json=payload,
             )
             return cls._operation.handle_response(response.json())
 
+        @classmethod
+        async def request_async(
+            cls,
+            base_url: str = "",
+            headers: dict[str, str] | None = None,
+            *args: CombinedParamsSpec.args,
+            **kwargs: CombinedParamsSpec.kwargs,
+        ) -> ResponseType:
+            raise NotImplementedError(
+                "Async request not implemented for request requestor"
+            )
+
     return RequestRequestor
 
 
+def build_httpx_requestor(
+    operation_type: type[
+        ApiOperationProtocol[
+            PathParamsSpec,
+            PathParamsType,
+            PayloadParamSpec,
+            PayloadType,
+            ResponseType,
+        ]
+    ],
+    combined_model: Callable[CombinedParamsSpec, CombinedParamsType],
+) -> type[EndpointRequestorProtocol[CombinedParamsSpec, ResponseType]]:
+    import httpx
+
+    class HttpxRequestor(EndpointRequestorProtocol):
+        _operation = operation_type
+
+        @classmethod
+        def request(
+            cls,
+            context: RequestContext,
+            *args: CombinedParamsSpec.args,
+            **kwargs: CombinedParamsSpec.kwargs,
+        ) -> ResponseType:
+            headers = context.headers or {}
+
+            path_params, payload_model = cls._operation.models_from_combined(
+                combined=kwargs
+            )
+
+            with httpx.Client() as client:
+                response = client.request(
+                    method=cls._operation.request_method(),
+                    url=_construct_full_url(
+                        base_url=context.base_url,
+                        url=cls._operation.create_url_from_model(path_params),
+                    ),
+                    headers=headers,
+                    json=cls._operation.create_payload_from_model(payload_model),
+                )
+                return cls._operation.handle_response(response.json())
+
+        @classmethod
+        async def request_async(
+            cls,
+            context: RequestContext,
+            *args: CombinedParamsSpec.args,
+            **kwargs: CombinedParamsSpec.kwargs,
+        ) -> ResponseType:
+            headers = context.headers or {}
+
+            path_params, payload_model = cls._operation.models_from_combined(
+                combined=kwargs
+            )
+
+            async with httpx.AsyncClient() as client:
+                response = await client.request(
+                    method=cls._operation.request_method(),
+                    url=_construct_full_url(
+                        base_url=context.base_url,
+                        url=cls._operation.create_url_from_model(path_params),
+                    ),
+                    headers=headers,
+                    json=cls._operation.create_payload_from_model(payload_model),
+                )
+                return cls._operation.handle_response(response.json())
+
+    return HttpxRequestor
+
+
+def build_aiohttp_requestor(
+    operation_type: type[
+        ApiOperationProtocol[
+            PathParamsSpec,
+            PathParamsType,
+            PayloadParamSpec,
+            PayloadType,
+            ResponseType,
+        ]
+    ],
+    combined_model: Callable[CombinedParamsSpec, CombinedParamsType],
+) -> type[EndpointRequestorProtocol[CombinedParamsSpec, ResponseType]]:
+    import aiohttp
+
+    class AiohttpRequestor(EndpointRequestorProtocol):
+        _operation = operation_type
+
+        @classmethod
+        def request(
+            cls,
+            context: RequestContext,
+            *args: CombinedParamsSpec.args,
+            **kwargs: CombinedParamsSpec.kwargs,
+        ) -> ResponseType:
+            raise NotImplementedError(
+                "Sync request not implemented for aiohttp requestor"
+            )
+
+        @classmethod
+        async def request_async(
+            cls,
+            context: RequestContext,
+            headers: dict[str, str] | None = None,
+            *args: CombinedParamsSpec.args,
+            **kwargs: CombinedParamsSpec.kwargs,
+        ) -> ResponseType:
+            headers = context.headers or {}
+
+            path_params, payload_model = cls._operation.models_from_combined(
+                combined=kwargs
+            )
+
+            async with aiohttp.ClientSession() as session:
+                response = await session.request(
+                    method=cls._operation.request_method(),
+                    url=_construct_full_url(
+                        base_url=context.base_url,
+                        url=cls._operation.create_url_from_model(path_params),
+                    ),
+                    headers=headers,
+                    json=cls._operation.create_payload_from_model(payload_model),
+                )
+            return cls._operation.handle_response(await response.json())
+
+    return AiohttpRequestor
+
+
 class RequestorType(StrEnum):
     REQUESTS = "requests"
     FAKE = "fake"
+    HTTPIX = "httpx"
+    AIOHTTP = "aiohttp"
 
 
 def build_requestor(
@@ -147,6 +330,14 @@ def build_requestor(
                 combined_model=combined_model,
                 return_value=return_value,
             )
+        case RequestorType.HTTPIX:
+            return build_httpx_requestor(
+                operation_type=operation_type, combined_model=combined_model
+            )
+        case RequestorType.AIOHTTP:
+            return build_aiohttp_requestor(
+                operation_type=operation_type, combined_model=combined_model
+            )
 
 
 if __name__ == "__main__":
@@ -183,19 +374,19 @@ if __name__ == "__main__":
 
     # Note that the return value is a pydantic UserResponse object
     response = FakeUserRequestor().request(
-        headers={"a": "b"},
+        context=RequestContext(headers={"a": "b"}),
         user_id=123,
         include_profile=True,
     )
 
-    RequestRequstor = build_request_requestor(
+    RequestRequestor = build_request_requestor(
         operation_type=UserEndpoint,
         combined_model=CombinedParams,
     )
 
     # Check type hints
-    response = RequestRequstor().request(
-        headers={"a": "b"}, user_id=123, include_profile=True
+    response = RequestRequestor().request(
+        context=RequestContext(headers={"a": "b"}), user_id=123, include_profile=True
     )
 
     print(response.model_dump())

{unique_toolkit-1.8.1.dist-info → unique_toolkit-1.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 1.8.1
+Version: 1.9.0
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -118,6 +118,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.9.0] - 2026-10-04
+- Define the RequestContext and add aihttp/httpx requestors
+
 ## [1.8.1] - 2026-10-03
 - Fix bug where sub agent evaluation config variable `include_evaluation` did not include aliases for previous names.
 

{unique_toolkit-1.8.1.dist-info → unique_toolkit-1.9.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 unique_toolkit/__init__.py,sha256=nbOYPIKERt-ITsgifrnJhatn1YNR38Ntumw-dCn_tsA,714
 unique_toolkit/_common/_base_service.py,sha256=S8H0rAebx7GsOldA7xInLp3aQJt9yEPDQdsGSFRJsGg,276
 unique_toolkit/_common/_time_utils.py,sha256=ztmTovTvr-3w71Ns2VwXC65OKUUh-sQlzbHdKTQWm-w,135
-unique_toolkit/_common/api_calling/human_verification_manager.py,sha256=UMOkY1cNhJ6JmtiBl3a4mQ3J21uOyKoCbVu7nR3A5eY,7799
+unique_toolkit/_common/api_calling/human_verification_manager.py,sha256=wgK0hefTh3pdrs8kH26Pba46ROQoFihEhT4r6h189wo,7819
 unique_toolkit/_common/base_model_type_attribute.py,sha256=7rzVqjXa0deYEixeo_pJSJcQ7nKXpWK_UGpOiEH3yZY,10382
 unique_toolkit/_common/chunk_relevancy_sorter/config.py,sha256=kDSEcXeIWGvzK4IXT3pBofTXeUnq3a9qRWaPllweR-s,1817
 unique_toolkit/_common/chunk_relevancy_sorter/exception.py,sha256=1mY4zjbvnXsd5oIxwiVsma09bS2XRnHrxW8KJBGtgCM,126
@@ -10,7 +10,7 @@ unique_toolkit/_common/chunk_relevancy_sorter/service.py,sha256=ZX1pxcy53zh3Ha0_
 unique_toolkit/_common/chunk_relevancy_sorter/tests/test_service.py,sha256=UhDllC40Y1OUQvkU6pe3nu6NR7v0d25yldE6FyozuZI,8926
 unique_toolkit/_common/default_language_model.py,sha256=tmHSqg6e8G7RmKqmdE_tmLxkSN0x-aGoyUdy6Pl2oAE,334
 unique_toolkit/_common/endpoint_builder.py,sha256=WzJrJ7azUQhvQRd-vsFFoyj6omJpHiVYrh1UFxNQvVg,8242
-unique_toolkit/_common/endpoint_requestor.py,sha256=JbbfJGLxgxLz8a3Yx1FdJvdHGbCYO8MSBd7cLg_Mtp0,5927
+unique_toolkit/_common/endpoint_requestor.py,sha256=7rDpeEvmQbLtn3iNW8NftyvAqDkLFGHoYN1h5AFDxho,12319
 unique_toolkit/_common/exception.py,sha256=hwh60UUawHDyPFNs-Wom-Gc6Yb09gPelftAuW1tXE6o,779
 unique_toolkit/_common/feature_flags/schema.py,sha256=F1NdVJFNU8PKlS7bYzrIPeDu2LxRqHSM9pyw622a1Kk,547
 unique_toolkit/_common/pydantic/rjsf_tags.py,sha256=T3AZIF8wny3fFov66s258nEl1GqfKevFouTtG6k9PqU,31219
@@ -144,7 +144,7 @@ unique_toolkit/short_term_memory/schemas.py,sha256=OhfcXyF6ACdwIXW45sKzjtZX_gkcJ
 unique_toolkit/short_term_memory/service.py,sha256=5PeVBu1ZCAfyDb2HLVvlmqSbyzBBuE9sI2o9Aajqjxg,8884
 unique_toolkit/smart_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unique_toolkit/smart_rules/compile.py,sha256=cxWjb2dxEI2HGsakKdVCkSNi7VK9mr08w5sDcFCQyWI,9553
-unique_toolkit-1.8.1.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-1.8.1.dist-info/METADATA,sha256=a-HKRebSMmdRJJIcrobwi1hcz9USNnUe8pPeVao9oTo,35013
-unique_toolkit-1.8.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-1.8.1.dist-info/RECORD,,
+unique_toolkit-1.9.0.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-1.9.0.dist-info/METADATA,sha256=93QwMegTzGuio7DAZx1G75b02h0mD90HidVNGM2jx1A,35098
+unique_toolkit-1.9.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-1.9.0.dist-info/RECORD,,