apexdevkit 1.30.3__tar.gz → 1.31.1__tar.gz

{apexdevkit-1.30.3 → apexdevkit-1.31.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: apexdevkit
-Version: 1.30.3
+Version: 1.31.1
 Summary: Apex Development Tools for python.
 License-File: LICENSE
 Author: Apex Dev
 Author-email: dev@apex.ge
-Requires-Python: >=3.11
+Requires-Python: >=3.11,<4
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -13,11 +13,10 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: fastapi
 Requires-Dist: httpx
+Requires-Dist: pydantic
 Requires-Dist: pymssql (==2.*)
 Requires-Dist: python-dotenv
 Requires-Dist: sentry-sdk[fastapi]
-Requires-Dist: tomlkit
-Requires-Dist: typer
 Requires-Dist: uvicorn
 Description-Content-Type: text/markdown
 

{apexdevkit-1.30.3 → apexdevkit-1.31.1}/apexdevkit/fastapi/__init__.py

@@ -1,5 +1,6 @@
 from apexdevkit.fastapi.builder import FastApiBuilder, RestfulServiceBuilder
 from apexdevkit.fastapi.dependable import inject
+from apexdevkit.fastapi.router import RestfulRouter, RouterWithHiddenUnderscoreRoutes
 from apexdevkit.fastapi.service import RestfulRepository
 
 __all__ = [
@@ -7,4 +8,6 @@ __all__ = [
     "RestfulServiceBuilder",
     "inject",
     "RestfulRepository",
+    "RestfulRouter",
+    "RouterWithHiddenUnderscoreRoutes",
 ]

{apexdevkit-1.30.3 → apexdevkit-1.31.1}/apexdevkit/fastapi/resource.py

@@ -3,8 +3,8 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any, Union
 
+from fastapi.responses import JSONResponse
 from pydantic import BaseModel
-from starlette.responses import JSONResponse
 
 from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
 from apexdevkit.fastapi.response import RestfulResponse

{apexdevkit-1.30.3 → apexdevkit-1.31.1}/apexdevkit/fastapi/router.py

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 from dataclasses import dataclass, field
 from enum import Enum
 from typing import Annotated, Any, Protocol, Self, TypeVar
@@ -12,6 +13,38 @@ from apexdevkit.fastapi.schema import RestfulSchema, Schema, SchemaFields
 from apexdevkit.fastapi.service import RawCollection, RawItem, RestfulService
 from apexdevkit.fluent import FluentDict
 
+
+class RouterWithHiddenUnderscoreRoutes(APIRouter):
+    def add_api_route(
+        self,
+        path: str,
+        endpoint: Callable[..., Any],
+        **kwargs: Any,
+    ) -> None:
+        super().add_api_route(path, endpoint, **kwargs)
+        self._add_underscored_api_route(path, endpoint, kwargs.copy())
+
+    def _add_underscored_api_route(
+        self,
+        path: str,
+        endpoint: Callable[..., Any],
+        kwargs: dict[str, Any],
+    ) -> None:
+        if "-" not in path:
+            return
+
+        op_id = kwargs.get("operation_id", endpoint.__name__) or endpoint.__name__
+        kwargs["operation_id"] = f"{op_id}_alias"
+        kwargs["include_in_schema"] = False
+
+        # Register the underscored route pointing to the same endpoint
+        super().add_api_route(
+            path=path.replace("-", "_"),
+            endpoint=endpoint,
+            **kwargs,
+        )
+
+
 _Response = JSONResponse | dict[str, Any]
 
 T = TypeVar("T")
@@ -27,7 +60,7 @@ class RestfulRouter:
     name: RestfulName
 
     parent: RestfulName | None = None
-    router: APIRouter = field(default_factory=APIRouter)
+    router: APIRouter = field(default_factory=RouterWithHiddenUnderscoreRoutes)
 
     _schema: RestfulSchema = field(init=False)
     _dependency: Dependency | None = field(init=False, default=None)

{apexdevkit-1.30.3 → apexdevkit-1.31.1}/apexdevkit/http/__init__.py

@@ -1,6 +1,6 @@
 from .fake import FakeHttp
 from .fluent import FluentHttp, FluentHttpRequest, FluentHttpResponse, Http, HttpMethod
-from .httpx import Httpx, HttpxConfig
+from .httpx import Httpx, HttpxConfig, SignPayloadWith
 from .json import JsonDict
 from .url import HttpUrl
 
@@ -13,6 +13,7 @@ __all__ = [
     "HttpMethod",
     "Httpx",
     "HttpxConfig",
+    "SignPayloadWith",
     "JsonDict",
     "HttpUrl",
 ]

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

@@ -0,0 +1,10 @@
+from .client import Httpx, HttpxConfig
+from .hooks import DefaultHandler, HttpxHandler, SignPayloadWith
+
+__all__ = [
+    "Httpx",
+    "HttpxConfig",
+    "SignPayloadWith",
+    "DefaultHandler",
+    "HttpxHandler",
+]

{apexdevkit-1.30.3 → apexdevkit-1.31.1}/apexdevkit/http/httpx/hooks.py

@@ -4,6 +4,9 @@ from dataclasses import dataclass
 from typing import Generic, Protocol, TypeVar
 
 import httpx
+from httpx import Request, SyncByteStream
+
+from apexdevkit.security import Authority
 
 ContextT = TypeVar("ContextT", contravariant=True)
 
@@ -70,3 +73,13 @@ class AfterResponseHook:
                 self.handler.on_delete(response)
             case _:
                 pass
+
+
+@dataclass(frozen=True)
+class SignPayloadWith(DefaultHandler[Request]):
+    authority: Authority
+
+    def on_post(self, context: Request) -> None:
+        assert isinstance(context.stream, SyncByteStream)
+        signature = self.authority.sign(next(iter(context.stream)).decode())
+        context.headers[signature.name] = signature.value

{apexdevkit-1.30.3 → apexdevkit-1.31.1}/pyproject.toml

@@ -1,37 +1,33 @@
 [project]
 name = "apexdevkit"
-version = "1.30.3"
+version = "1.31.1"
 description = "Apex Development Tools for python."
 readme = "README.md"
 authors = [
     { name = "Apex Dev", email = "dev@apex.ge" }
 ]
 dynamic = ["dependencies"]
-requires-python = ">=3.11"
+requires-python = ">=3.11,<4"
 
 [tool.poetry.dependencies]
-httpx = "*"
 fastapi = "*"
-uvicorn = "*"
-sentry-sdk = { extras = ["fastapi"], version = "*" }
+httpx = "*"
 python-dotenv = "*"
 pymssql = "2.*"
-typer = "*"
-tomlkit = "*"
+pydantic = "*"
+sentry-sdk = { extras = ["fastapi"], version = "*" }
+uvicorn = "*"
 
 [tool.poetry.group.dev.dependencies]
-approvaltests = "*"
+apexcodexpy = "0.6.5"
 pytest = "*"
 pytest-approvaltests = "*"
 pytest-cov = "*"
+pytest-env = "*"
 pytest-recording = "*"
 coverage = "*"
 faker = "*"
 
-
-[tool.poetry.group.lint.dependencies]
-apexcodexpy = "0.4.1"
-
 [tool.mypy]
 ignore_missing_imports = true
 strict = true
@@ -42,6 +38,11 @@ exclude = [
 show_error_codes = true
 pretty = true
 
+[tool.deptry]
+extend_exclude = [
+    "apexdevkit/testing",
+]
+
 [tool.ruff.lint]
 select = [
     "A",
@@ -80,3 +81,8 @@ source = [
 skip_empty = true
 skip_covered = true
 show_missing = true
+
+[tool.pytest]
+env = [
+    "ECHO_SERVER=http://httpbin.org"
+]

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

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