apexdevkit 1.5.25__tar.gz → 1.6.2__tar.gz

{apexdevkit-1.5.25 → apexdevkit-1.6.2}/PKG-INFO

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

apexdevkit-1.6.2/apexdevkit/fastapi/dependable.py

@@ -0,0 +1,100 @@
+from dataclasses import dataclass, field
+from typing import Annotated, Any, Callable, Protocol, Self
+
+from fastapi import Depends, Path
+from fastapi.requests import Request
+
+from apexdevkit.fastapi import RestfulServiceBuilder
+from apexdevkit.fastapi.service import RestfulService
+from apexdevkit.testing import RestfulName
+
+
+def inject(dependency: str) -> Any:  # pragma: no cover
+    def get(request: Request) -> Any:
+        return getattr(request.app.state, dependency)
+
+    return Depends(get)
+
+
+class _Dependency(Protocol):
+    def as_dependable(self) -> type[RestfulServiceBuilder]:
+        pass
+
+
+@dataclass
+class ServiceDependency:
+    dependency: _Dependency
+
+    def as_dependable(self) -> type[RestfulService]:
+        Builder = self.dependency.as_dependable()
+
+        def _(builder: Builder) -> RestfulService:
+            return builder.build()
+
+        return Annotated[RestfulService, Depends(_)]
+
+
+@dataclass
+class ParentDependency:
+    parent: RestfulName
+    dependency: _Dependency
+
+    def as_dependable(self) -> type[RestfulServiceBuilder]:
+        Builder = self.dependency.as_dependable()
+        ParentId = Annotated[str, Path(alias=self.parent.singular + "_id")]
+
+        def _(builder: Builder, parent_id: ParentId) -> RestfulServiceBuilder:
+            return builder.with_parent(parent_id)
+
+        return Annotated[RestfulServiceBuilder, Depends(_)]
+
+
+@dataclass
+class UserDependency:
+    extract_user: Callable[..., Any]
+    dependency: _Dependency
+
+    def as_dependable(self) -> type[RestfulServiceBuilder]:
+        Builder = self.dependency.as_dependable()
+        User = Annotated[Any, Depends(self.extract_user)]
+
+        def _(builder: Builder, user: User) -> RestfulServiceBuilder:
+            return builder.with_user(user)
+
+        return Annotated[RestfulServiceBuilder, Depends(_)]
+
+
+@dataclass
+class InfraDependency:
+    infra: RestfulServiceBuilder
+
+    def as_dependable(self) -> type[RestfulServiceBuilder]:
+        def _() -> RestfulServiceBuilder:
+            return self.infra
+
+        return Annotated[RestfulServiceBuilder, Depends(_)]
+
+
+@dataclass
+class DependableBuilder:
+    dependency: _Dependency = field(init=False)
+
+    def from_infra(self, value: RestfulServiceBuilder) -> Self:
+        self.dependency = InfraDependency(value)
+
+        return self
+
+    def with_parent(self, value: RestfulName) -> Self:
+        dependable = DependableBuilder()
+        dependable.dependency = ParentDependency(value, self.dependency)
+
+        return dependable
+
+    def with_user(self, extract_user: Callable[..., Any]) -> Self:
+        dependable = DependableBuilder()
+        dependable.dependency = UserDependency(extract_user, self.dependency)
+
+        return dependable
+
+    def as_dependable(self) -> type[RestfulService]:
+        return ServiceDependency(self.dependency).as_dependable()

{apexdevkit-1.5.25 → apexdevkit-1.6.2}/apexdevkit/fastapi/router.py

@@ -1,14 +1,12 @@
 from dataclasses import dataclass, field
 from functools import cached_property
-from typing import Annotated, Any, Callable, Self, Type, TypeVar
+from typing import Annotated, Any, Protocol, Self, TypeVar
 
-from fastapi import APIRouter, Depends, HTTPException, Path
+from fastapi import APIRouter, Depends, Path
 from fastapi.responses import JSONResponse
 
-from apexdevkit.error import DoesNotExistError
 from apexdevkit.fastapi.builder import RestfulServiceBuilder
 from apexdevkit.fastapi.resource import RestfulResource
-from apexdevkit.fastapi.response import RestfulResponse
 from apexdevkit.fastapi.schema import RestfulSchema, SchemaFields
 from apexdevkit.fastapi.service import RawCollection, RawItem, RestfulService
 from apexdevkit.testing import RestfulName
@@ -18,6 +16,11 @@ _Response = JSONResponse | dict[str, Any]
 T = TypeVar("T")
 
 
+class Dependable(Protocol):
+    def as_dependable(self) -> type[RestfulService]:
+        pass
+
+
 @dataclass
 class PreBuiltRestfulService(RestfulServiceBuilder):  # pragma: no cover
     service: RestfulService
@@ -26,27 +29,13 @@ class PreBuiltRestfulService(RestfulServiceBuilder):  # pragma: no cover
         return self.service
 
 
-def no_user() -> None:
-    pass
-
-
 @dataclass
 class RestfulRouter:
-    service: RestfulService | None = None
-
     router: APIRouter = field(default_factory=APIRouter)
 
     name: RestfulName = field(init=False)
     fields: SchemaFields = field(init=False)
 
-    parent: str = field(init=False, default="")
-
-    infra: RestfulServiceBuilder = field(init=False)
-
-    def __post_init__(self) -> None:  # pragma: no cover
-        if self.service:
-            self.with_infra(PreBuiltRestfulService(self.service))
-
     @cached_property
     def schema(self) -> RestfulSchema:
         return RestfulSchema(name=self.name, fields=self.fields)
@@ -59,10 +48,6 @@ class RestfulRouter:
     def id_alias(self) -> str:
         return self.name.singular + "_id"
 
-    @property
-    def parent_id_alias(self) -> str:
-        return self.parent + "_id"
-
     @property
     def item_path(self) -> str:
         return "/{" + self.id_alias + "}"
@@ -77,25 +62,15 @@ class RestfulRouter:
 
         return self
 
-    def with_parent(self, name: str) -> Self:
-        self.parent = name
-
-        return self
-
-    def with_infra(self, value: RestfulServiceBuilder) -> Self:
-        self.infra = value
-
-        return self
-
     def with_create_one_endpoint(
         self,
+        dependable: Dependable,
         is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
     ) -> Self:
         self.router.add_api_route(
             "",
             self.resource.create_one(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 Item=Annotated[
                     RawItem,
                     Depends(self.schema.for_create_one()),
@@ -112,14 +87,12 @@ class RestfulRouter:
         return self
 
     def with_create_many_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             "/batch",
             self.resource.create_many(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 Collection=Annotated[
                     RawCollection,
                     Depends(self.schema.for_create_many()),
@@ -136,14 +109,12 @@ class RestfulRouter:
         return self
 
     def with_read_one_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             self.item_path,
             self.resource.read_one(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 ItemId=Annotated[
                     str,
                     Path(alias=self.id_alias),
@@ -160,14 +131,12 @@ class RestfulRouter:
         return self
 
     def with_read_all_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             "",
             self.resource.read_all(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
             ),
             methods=["GET"],
             status_code=200,
@@ -180,14 +149,12 @@ class RestfulRouter:
         return self
 
     def with_update_one_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             self.item_path,
             self.resource.update_one(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 ItemId=Annotated[
                     str,
                     Path(alias=self.id_alias),
@@ -208,14 +175,12 @@ class RestfulRouter:
         return self
 
     def with_update_many_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             "",
             self.resource.update_many(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 Collection=Annotated[
                     RawCollection,
                     Depends(self.schema.for_update_many()),
@@ -232,14 +197,12 @@ class RestfulRouter:
         return self
 
     def with_replace_one_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             "",
             self.resource.replace_one(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 Item=Annotated[
                     RawItem,
                     Depends(self.schema.for_replace_one()),
@@ -256,14 +219,12 @@ class RestfulRouter:
         return self
 
     def with_replace_many_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             "/batch",
             self.resource.replace_many(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 Collection=Annotated[
                     RawCollection,
                     Depends(self.schema.for_replace_many()),
@@ -280,14 +241,12 @@ class RestfulRouter:
         return self
 
     def with_delete_one_endpoint(
-        self,
-        is_documented: bool = True,
-        extract_user: Callable[..., Any] = no_user,
+        self, dependable: Dependable, is_documented: bool = True
     ) -> Self:
         self.router.add_api_route(
             self.item_path,
             self.resource.delete_one(
-                Service=self._service(extract_user),
+                Service=dependable.as_dependable(),
                 ItemId=Annotated[
                     str,
                     Path(alias=self.id_alias),
@@ -309,45 +268,16 @@ class RestfulRouter:
 
         return self
 
-    def default(self) -> Self:
+    def default(self, dependable: Dependable) -> Self:
         return (
-            self.with_create_one_endpoint()
-            .with_create_many_endpoint()
-            .with_read_one_endpoint()
-            .with_read_all_endpoint()
-            .with_update_one_endpoint()
-            .with_update_many_endpoint()
-            .with_delete_one_endpoint()
+            self.with_create_one_endpoint(dependable)
+            .with_create_many_endpoint(dependable)
+            .with_read_one_endpoint(dependable)
+            .with_read_all_endpoint(dependable)
+            .with_update_one_endpoint(dependable)
+            .with_update_many_endpoint(dependable)
+            .with_delete_one_endpoint(dependable)
         )
 
     def build(self) -> APIRouter:
         return self.router
-
-    def _service(
-        self, extract_user: Callable[..., Any] = no_user
-    ) -> Type[RestfulService]:
-        User = Annotated[Any, Depends(extract_user)]
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def srv_child(user: User, parent_id: ParentId) -> RestfulService:
-            try:
-                return self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                raise HTTPException(
-                    status_code=404,
-                    detail=RestfulResponse(RestfulName(self.parent)).not_found(e),
-                )
-
-        def srv_root(user: User) -> RestfulService:
-            try:
-                return self.infra.with_user(user).build()
-            except DoesNotExistError as e:
-                raise HTTPException(
-                    status_code=404,
-                    detail=RestfulResponse(RestfulName(self.parent)).not_found(e),
-                )
-
-        if self.parent:
-            return Annotated[RestfulService, Depends(srv_child)]  # type: ignore
-        else:
-            return Annotated[RestfulService, Depends(srv_root)]  # type: ignore

{apexdevkit-1.5.25 → apexdevkit-1.6.2}/apexdevkit/http/url.py

@@ -6,4 +6,4 @@ class HttpUrl:
     value: str
 
     def __add__(self, endpoint: str) -> str:
-        return self.value.strip("/") + "/" + endpoint.strip("/")
+        return (self.value.strip("/") + "/" + endpoint.strip("/")).strip("/")

{apexdevkit-1.5.25 → apexdevkit-1.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.5.25"
+version = "1.6.2"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"
@@ -25,7 +25,7 @@ ruff = "*"
 python_version = "3.11"
 ignore_missing_imports = true
 strict = true
-exclude = ["apexdevkit/fastapi/schema.py"]
+exclude = ["apexdevkit/fastapi/schema.py", "apexdevkit/fastapi/dependable.py"]
 
 [tool.ruff]
 target-version = "py311"

apexdevkit-1.5.25/apexdevkit/fastapi/dependable.py

@@ -1,11 +0,0 @@
-from typing import Any
-
-from fastapi import Depends
-from fastapi.requests import Request
-
-
-def inject(dependency: str) -> Any:  # pragma: no cover
-    def get(request: Request) -> Any:
-        return getattr(request.app.state, dependency)
-
-    return Depends(get)