apexdevkit 1.25.2__tar.gz → 1.25.4__tar.gz

{apexdevkit-1.25.2 → apexdevkit-1.25.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apexdevkit
-Version: 1.25.2
+Version: 1.25.4
 Summary: Apex Development Tools for python.
 License-File: LICENSE
 Author: Apex Dev

{apexdevkit-1.25.2 → apexdevkit-1.25.4}/apexdevkit/fastapi/builder.py

@@ -6,10 +6,11 @@ from dataclasses import dataclass, field
 from typing import Any, Self
 
 from fastapi import APIRouter, FastAPI
-from starlette.middleware.cors import CORSMiddleware
-from starlette.responses import JSONResponse
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse
 
 from apexdevkit.error import ApiError
+from apexdevkit.fastapi.dependable import DependableBuilder
 from apexdevkit.fastapi.service import RestfulService
 
 
@@ -51,14 +52,16 @@ class FastApiBuilder:
     def with_routes(self, values: Mapping[str, APIRouter]) -> Self:
         for key, value in values.items():
             self.app.include_router(
-                value, prefix=f"/{key}", tags=value.tags or [key.title()]
+                value,
+                prefix=_Endpoint(key).normilized(),
+                tags=value.tags or [key.title()],
             )
 
         return self
 
     def with_mounted(self, **apps: FastAPI) -> Self:
         for path, app in apps.items():
-            self.app.mount(f"/{path.replace('_', '-')}", app)
+            self.app.mount(_Endpoint(path).normilized(), app)
 
         return self
 
@@ -84,6 +87,9 @@ class RestfulServiceBuilder(ABC):
     parent_id: str = field(init=False)
     user: Any = field(init=False)
 
+    def as_dependable(self) -> DependableBuilder:
+        return DependableBuilder.from_builder(self)
+
     def with_user(self, user: Any) -> RestfulServiceBuilder:
         self.user = user
 
@@ -105,3 +111,14 @@ class PreBuilt(RestfulServiceBuilder):  # pragma: no cover
 
     def build(self) -> RestfulService:
         return self.service
+
+
+@dataclass(frozen=True)
+class _Endpoint:
+    raw: str
+
+    def normilized(self) -> str:
+        return f"/{self.raw.replace('_', '-')}"
+
+    def __str__(self) -> str:
+        return self.normilized()

{apexdevkit-1.25.2 → apexdevkit-1.25.4}/apexdevkit/fastapi/dependable.py

@@ -6,8 +6,6 @@ from fastapi import Depends, Path
 from fastapi.requests import Request
 
 from apexdevkit.error import ApiError, DoesNotExistError, ForbiddenError
-from apexdevkit.fastapi import RestfulServiceBuilder
-from apexdevkit.fastapi.builder import PreBuilt
 from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fastapi.response import RestfulResponse
 from apexdevkit.fastapi.service import RestfulService
@@ -20,8 +18,19 @@ def inject(dependency: str) -> Any:  # pragma: no cover
     return Depends(get)
 
 
+class _ServiceBuilder(Protocol):
+    def with_user(self, user: Any) -> "_ServiceBuilder":
+        pass
+
+    def with_parent(self, identity: str) -> "_ServiceBuilder":
+        pass
+
+    def build(self) -> RestfulService:  # pragma: no cover
+        pass
+
+
 class _Dependency(Protocol):
-    def as_dependable(self) -> type[RestfulServiceBuilder]:
+    def as_dependable(self) -> type[_ServiceBuilder]:
         pass
 
 
@@ -48,19 +57,19 @@ class ParentDependency:
     parent: RestfulName
     dependency: _Dependency
 
-    def as_dependable(self) -> type[RestfulServiceBuilder]:
+    def as_dependable(self) -> type[_ServiceBuilder]:
         Builder = self.dependency.as_dependable()
         ParentId = Annotated[
             str, Path(alias=self.parent.singular.replace("-", "_") + "_id")
         ]
 
-        def _(builder: Builder, parent_id: ParentId) -> RestfulServiceBuilder:
+        def _(builder: Builder, parent_id: ParentId) -> _ServiceBuilder:
             try:
                 return builder.with_parent(parent_id)
             except DoesNotExistError as e:
                 raise ApiError(404, RestfulResponse(self.parent).not_found(e)) from e
 
-        return Annotated[RestfulServiceBuilder, Depends(_)]
+        return Annotated[_ServiceBuilder, Depends(_)]
 
 
 @dataclass(frozen=True)
@@ -68,28 +77,28 @@ class UserDependency:
     extract_user: Callable[..., Any]
     dependency: _Dependency
 
-    def as_dependable(self) -> type[RestfulServiceBuilder]:
+    def as_dependable(self) -> type[_ServiceBuilder]:
         Builder = self.dependency.as_dependable()
         User = Annotated[Any, Depends(self.extract_user)]
 
-        def _(builder: Builder, user: User) -> RestfulServiceBuilder:
+        def _(builder: Builder, user: User) -> _ServiceBuilder:
             return builder.with_user(user)
 
-        return Annotated[RestfulServiceBuilder, Depends(_)]
+        return Annotated[_ServiceBuilder, Depends(_)]
 
 
-_BuilderCallable = Callable[..., RestfulServiceBuilder]
+_BuilderCallable = Callable[..., _ServiceBuilder]
 
 
 @dataclass(frozen=True)
 class BuilderCallableDependency:
     create_builder: _BuilderCallable
 
-    def as_dependable(self) -> type[RestfulServiceBuilder]:
-        def _() -> RestfulServiceBuilder:
+    def as_dependable(self) -> type[_ServiceBuilder]:
+        def _() -> _ServiceBuilder:
             return self.create_builder()
 
-        return Annotated[RestfulServiceBuilder, Depends(_)]
+        return Annotated[_ServiceBuilder, Depends(_)]
 
 
 @dataclass(frozen=True)
@@ -101,13 +110,9 @@ class DependableBuilder:
         return cls(BuilderCallableDependency(value))
 
     @classmethod
-    def from_builder(cls, value: RestfulServiceBuilder) -> "DependableBuilder":
+    def from_builder(cls, value: _ServiceBuilder) -> "DependableBuilder":
         return cls(BuilderCallableDependency(lambda: value))
 
-    @classmethod
-    def from_service(cls, value: RestfulService) -> "DependableBuilder":
-        return cls(BuilderCallableDependency(lambda: PreBuilt(value)))
-
     def with_parent(self, value: RestfulName) -> "DependableBuilder":
         return DependableBuilder(ParentDependency(value, self.dependency))
 

{apexdevkit-1.25.2 → apexdevkit-1.25.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apexdevkit"
-version = "1.25.2"
+version = "1.25.4"
 description = "Apex Development Tools for python."
 readme = "README.md"
 authors = [