unique_toolkit 1.16.1__tar.gz → 1.16.2__tar.gz

{unique_toolkit-1.16.1 → unique_toolkit-1.16.2}/CHANGELOG.md

@@ -4,6 +4,8 @@ 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.16.2] - 2025-10-16
+- Reduce operation dependency on path instead of full url
 
 ## [1.16.1] - 2025-10-16
 - Update debug info for better tool call tracking

{unique_toolkit-1.16.1 → unique_toolkit-1.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 1.16.1
+Version: 1.16.2
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -117,6 +117,8 @@ 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.16.2] - 2025-10-16
+- Reduce operation dependency on path instead of full url
 
 ## [1.16.1] - 2025-10-16
 - Update debug info for better tool call tracking

{unique_toolkit-1.16.1 → unique_toolkit-1.16.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "1.16.1"
+version = "1.16.2"
 description = ""
 authors = [
     "Cedric Klinkert <cedric.klinkert@unique.ch>",

{unique_toolkit-1.16.1 → unique_toolkit-1.16.2}/unique_toolkit/_common/api_calling/human_verification_manager.py

@@ -280,9 +280,9 @@ if __name__ == "__main__":
     class CombinedParams(GetUserPathParams, GetUserRequestBody):
         pass
 
-    UserEndpoint = build_api_operation(
+    UserApiOperation = build_api_operation(
         method=EndpointMethods.GET,
-        url_template=Template("https://api.example.com/users/{user_id}"),
+        path_template=Template("/users/{user_id}"),
         path_params_constructor=GetUserPathParams,
         payload_constructor=GetUserRequestBody,
         response_model_type=UserResponse,
@@ -290,7 +290,7 @@ if __name__ == "__main__":
 
     human_verification_manager = HumanVerificationManagerForApiCalling(
         logger=logging.getLogger(__name__),
-        operation=UserEndpoint,
+        operation=UserApiOperation,
         requestor_type=RequestorType.FAKE,
         return_value={"id": 100, "name": "John Doe"},
     )

{unique_toolkit-1.16.1 → unique_toolkit-1.16.2}/unique_toolkit/_common/endpoint_builder.py

@@ -4,7 +4,7 @@ the endpoints without having to know the details of the endpoints.
 """
 
 from enum import StrEnum
-from string import Formatter, Template
+from string import Template
 from typing import (
     Any,
     Callable,
@@ -16,7 +16,6 @@ from typing import (
 )
 
 from pydantic import BaseModel
-from typing_extensions import deprecated
 
 # Paramspecs
 PayloadParamSpec = ParamSpec("PayloadParamSpec")
@@ -67,13 +66,12 @@ class ApiOperationProtocol(
     def response_model() -> type[ResponseType]: ...
 
     @staticmethod
-    def create_url(
+    def create_path(
         *args: PathParamsSpec.args, **kwargs: PathParamsSpec.kwargs
     ) -> str: ...
 
     @staticmethod
-    def create_url_from_model(path_params: PathParamsType) -> str: ...
-
+    def create_path_from_model(path_params: PathParamsType) -> str: ...
     @staticmethod
     def create_payload(
         *args: PayloadParamSpec.args, **kwargs: PayloadParamSpec.kwargs
@@ -98,7 +96,7 @@ class ApiOperationProtocol(
 def build_api_operation(
     *,
     method: HttpMethods,
-    url_template: Template,
+    path_template: Template,
     path_params_constructor: Callable[PathParamsSpec, PathParamsType],
     payload_constructor: Callable[PayloadParamSpec, PayloadType],
     response_model_type: type[ResponseType],
@@ -143,33 +141,19 @@ def build_api_operation(
             return response_model_type
 
         @staticmethod
-        def create_url(
-            *args: PathParamsSpec.args,
-            **kwargs: PathParamsSpec.kwargs,
-        ) -> str:
-            """Create URL from path parameters."""
-            path_model = Operation.path_params_model()(*args, **kwargs)
-            path_dict = path_model.model_dump(**dump_options)
-
-            # Extract expected path parameters from template
-            template_params = [
-                fname
-                for _, fname, _, _ in Formatter().parse(url_template.template)
-                if fname is not None
-            ]
-
-            # Verify all required path parameters are present
-            missing_params = [
-                param for param in template_params if param not in path_dict
-            ]
-            if missing_params:
-                raise ValueError(f"Missing path parameters: {missing_params}")
-
-            return url_template.substitute(**path_dict)
+        def path_template() -> Template:
+            return path_template
 
         @staticmethod
-        def create_url_from_model(path_params: PathParamsType) -> str:
-            return url_template.substitute(**path_params.model_dump(**dump_options))
+        def create_path_from_model(path_params: PathParamsType) -> str:
+            return path_template.substitute(**path_params.model_dump(**dump_options))
+
+        @staticmethod
+        def create_path(
+            *args: PathParamsSpec.args, **kwargs: PathParamsSpec.kwargs
+        ) -> str:
+            model = Operation.path_params_model()(*args, **kwargs)
+            return Operation.create_path_from_model(model)
 
         @staticmethod
         def create_payload(
@@ -204,81 +188,3 @@ def build_api_operation(
             return path_params, payload
 
     return Operation
-
-
-@deprecated("Use ApiOperationProtocol instead")
-class EndpointClassProtocol(ApiOperationProtocol):
-    pass
-
-
-@deprecated("Use build_api_operation instead")
-def build_endpoint_class(
-    *,
-    method: HttpMethods,
-    url_template: Template,
-    path_params_constructor: Callable[PathParamsSpec, PathParamsType],
-    payload_constructor: Callable[PayloadParamSpec, PayloadType],
-    response_model_type: type[ResponseType],
-    dump_options: dict | None = None,
-) -> type[
-    ApiOperationProtocol[
-        PathParamsSpec,
-        PathParamsType,
-        PayloadParamSpec,
-        PayloadType,
-        ResponseType,
-    ]
-]:
-    return build_api_operation(
-        method=method,
-        url_template=url_template,
-        path_params_constructor=path_params_constructor,
-        payload_constructor=payload_constructor,
-        response_model_type=response_model_type,
-        dump_options=dump_options,
-    )
-
-
-if __name__ == "__main__":
-    # Example models
-    class GetUserPathParams(BaseModel):
-        """Path parameters for the user endpoint."""
-
-        user_id: int
-
-    class GetUserRequestBody(BaseModel):
-        """Request body/query parameters for the user endpoint."""
-
-        include_profile: bool = False
-
-    class UserResponse(BaseModel):
-        """Response model for user data."""
-
-        id: int
-        name: str
-
-    # Example usage of make_endpoint_class
-    UserOperation = build_endpoint_class(
-        url_template=Template("/users/${user_id}"),
-        path_params_constructor=GetUserPathParams,
-        payload_constructor=GetUserRequestBody,
-        response_model_type=UserResponse,
-        method=EndpointMethods.GET,
-    )
-
-    # Create URL from path parameters
-    url = UserOperation.create_url(user_id=123)
-    print(f"URL: {url}")
-
-    # Create payload from request body parameters
-    payload = UserOperation.create_payload(include_profile=True)
-    print(f"Payload: {payload}")
-
-    # Create response from endpoint
-    response = UserOperation.handle_response(
-        {
-            "id": 123,
-            "name": "John Doe",
-        }
-    )
-    print(f"Response: {response}")

{unique_toolkit-1.16.1 → unique_toolkit-1.16.2}/unique_toolkit/_common/endpoint_requestor.py

@@ -2,7 +2,7 @@ from enum import StrEnum
 from typing import Any, Callable, Generic, Protocol, TypeVar
 from urllib.parse import urljoin, urlparse
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 from typing_extensions import ParamSpec
 
 from unique_toolkit._common.endpoint_builder import (
@@ -25,25 +25,15 @@ 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()
+class RequestContext(BaseModel):
+    base_url: str
+    headers: dict[str, str] = Field(default_factory=dict)
 
-    return urljoin(base_url, url)
 
-
-class RequestContext(BaseModel):
-    base_url: str = ""
-    headers: dict[str, str] | None = None
+def _verify_url(url: str) -> None:
+    parse_result = urlparse(url)
+    if not (parse_result.netloc and parse_result.scheme):
+        raise ValueError("Scheme and netloc are required for url")
 
 
 class EndpointRequestorProtocol(Protocol, Generic[CombinedParamsSpec, ResponseT_co]):
@@ -142,12 +132,15 @@ def build_request_requestor(
                 combined=kwargs
             )
 
-            url = cls._operation.create_url_from_model(path_params)
+            path = cls._operation.create_path_from_model(path_params)
+            url = urljoin(context.base_url, path)
+            _verify_url(url)
+
             payload = cls._operation.create_payload_from_model(payload_model)
 
             response = requests.request(
                 method=cls._operation.request_method(),
-                url=_construct_full_url(context.base_url, url),
+                url=url,
                 headers=context.headers,
                 json=payload,
             )
@@ -198,13 +191,13 @@ def build_httpx_requestor(
                 combined=kwargs
             )
 
+            path = cls._operation.create_path_from_model(path_params)
+            url = urljoin(context.base_url, path)
+            _verify_url(url)
             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),
-                    ),
+                    url=url,
                     headers=headers,
                     json=cls._operation.create_payload_from_model(payload_model),
                 )
@@ -223,13 +216,13 @@ def build_httpx_requestor(
                 combined=kwargs
             )
 
+            path = cls._operation.create_path_from_model(path_params)
+            url = urljoin(context.base_url, path)
+            _verify_url(url)
             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),
-                    ),
+                    url=url,
                     headers=headers,
                     json=cls._operation.create_payload_from_model(payload_model),
                 )
@@ -279,14 +272,14 @@ def build_aiohttp_requestor(
             path_params, payload_model = cls._operation.models_from_combined(
                 combined=kwargs
             )
+            path = cls._operation.create_path_from_model(path_params)
+            url = urljoin(context.base_url, path)
+            _verify_url(url)
 
             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),
-                    ),
+                    url=url,
                     headers=headers,
                     json=cls._operation.create_payload_from_model(payload_model),
                 )
@@ -360,7 +353,7 @@ if __name__ == "__main__":
 
     UserEndpoint = build_api_operation(
         method=HttpMethods.GET,
-        url_template=Template("https://api.example.com/users/{user_id}"),
+        path_template=Template("/users/{user_id}"),
         path_params_constructor=GetUserPathParams,
         payload_constructor=GetUserRequestBody,
         response_model_type=UserResponse,