apexdevkit 1.3.15__tar.gz → 1.4.2__tar.gz

{apexdevkit-1.3.15 → apexdevkit-1.4.2}/PKG-INFO

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

{apexdevkit-1.3.15 → apexdevkit-1.4.2}/apexdevkit/fastapi/router.py

@@ -1,8 +1,10 @@
+from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
 from functools import cached_property
-from typing import Annotated, Any, Iterable, Protocol, Self, TypeVar
+from typing import Annotated, Any, Callable, Iterable, Self, TypeVar
 
 from fastapi import APIRouter, Depends, Path
+from fastapi.requests import Request
 from fastapi.responses import JSONResponse
 
 from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
@@ -78,19 +80,38 @@ class RestfulResponse:
 T = TypeVar("T")
 
 
-class RestfulServiceInfra(Protocol):
-    def service_for(self, parent_id: str) -> RestfulService:
+@dataclass
+class RestfulServiceBuilder(ABC):
+    parent_id: str = field(init=False)
+    user: Any = field(init=False)
+
+    def with_user(self, user: Any) -> "RestfulServiceBuilder":
+        self.user = user
+
+        return self
+
+    def with_parent(self, identity: str) -> "RestfulServiceBuilder":
+        self.parent_id = identity
+
+        return self
+
+    @abstractmethod
+    def build(self) -> RestfulService:
         pass
 
 
-@dataclass(frozen=True)
-class SingleRestfulServiceInfra:
+@dataclass
+class PreBuiltRestfulService(RestfulServiceBuilder):
     service: RestfulService
 
-    def service_for(self, parent_id: str) -> RestfulService:
+    def build(self) -> RestfulService:
         return self.service
 
 
+def no_user(request: Request) -> None:
+    pass
+
+
 @dataclass
 class RestfulRouter:
     service: RestfulService | None = None
@@ -99,13 +120,13 @@ class RestfulRouter:
 
     name: RestfulName = field(init=False)
     fields: SchemaFields = field(init=False)
-    infra: RestfulServiceInfra = field(init=False)
+    infra: RestfulServiceBuilder = field(init=False)
 
     parent: str = field(init=False, default="")
 
     def __post_init__(self) -> None:
         if self.service:
-            self.infra = SingleRestfulServiceInfra(self.service)
+            self.infra = PreBuiltRestfulService(self.service)
 
     @cached_property
     def response(self) -> RestfulResponse:
@@ -148,16 +169,20 @@ class RestfulRouter:
         return self
 
     def with_service(self, value: RestfulService) -> Self:
-        self.infra = SingleRestfulServiceInfra(value)
+        self.infra = PreBuiltRestfulService(value)
 
         return self
 
-    def with_infra(self, value: RestfulServiceInfra) -> Self:
+    def with_infra(self, value: RestfulServiceBuilder) -> Self:
         self.infra = value
 
         return self
 
-    def with_create_one_endpoint(self, is_documented: bool = True) -> Self:
+    def with_create_one_endpoint(
+        self,
+        is_documented: bool = True,
+        extract_user: Callable[[Request], Any] = no_user,
+    ) -> Self:
         parent_id_type = Annotated[
             str,
             Path(alias=self.parent_id_alias, default_factory=str),
@@ -175,9 +200,13 @@ class RestfulRouter:
             response_model=self.schema.for_item(),
             include_in_schema=is_documented,
         )
-        def create_one(parent_id: parent_id_type, item: item_type) -> _Response:
+        def create_one(
+            user: Annotated[Any, Depends(extract_user)],
+            parent_id: parent_id_type,
+            item: item_type,
+        ) -> _Response:
             try:
-                service = self.infra.service_for(parent_id)
+                service = self.infra.with_user(user).with_parent(parent_id).build()
             except DoesNotExistError as e:
                 return JSONResponse(
                     RestfulResponse(RestfulName(self.parent)).not_found(e), 404
@@ -192,7 +221,11 @@ class RestfulRouter:
 
         return self
 
-    def with_create_many_endpoint(self, is_documented: bool = True) -> Self:
+    def with_create_many_endpoint(
+        self,
+        is_documented: bool = True,
+        extract_user: Callable[[Request], Any] = no_user,
+    ) -> Self:
         parent_id_type = Annotated[
             str,
             Path(alias=self.parent_id_alias, default_factory=str),
@@ -210,9 +243,13 @@ class RestfulRouter:
             response_model=self.schema.for_collection(),
             include_in_schema=is_documented,
         )
-        def create_many(parent_id: parent_id_type, items: collection_type) -> _Response:
+        def create_many(
+            user: Annotated[Any, Depends(extract_user)],
+            parent_id: parent_id_type,
+            items: collection_type,
+        ) -> _Response:
             try:
-                service = self.infra.service_for(parent_id)
+                service = self.infra.with_user(user).with_parent(parent_id).build()
             except DoesNotExistError as e:
                 return JSONResponse(
                     RestfulResponse(RestfulName(self.parent)).not_found(e), 404
@@ -225,7 +262,11 @@ class RestfulRouter:
 
         return self
 
-    def with_read_one_endpoint(self, is_documented: bool = True) -> Self:
+    def with_read_one_endpoint(
+        self,
+        is_documented: bool = True,
+        extract_user: Callable[[Request], Any] = no_user,
+    ) -> Self:
         id_type = Annotated[str, Path(alias=self.id_alias)]
         parent_id_type = Annotated[
             str,
@@ -239,8 +280,12 @@ class RestfulRouter:
             response_model=self.schema.for_item(),
             include_in_schema=is_documented,
         )
-        def read_one(parent_id: parent_id_type, item_id: id_type) -> _Response:
-            service = self.infra.service_for(parent_id)
+        def read_one(
+            user: Annotated[Any, Depends(extract_user)],
+            parent_id: parent_id_type,
+            item_id: id_type,
+        ) -> _Response:
+            service = self.infra.with_user(user).with_parent(parent_id).build()
 
             try:
                 return self.response.found_one(service.read_one(item_id))
@@ -249,7 +294,11 @@ class RestfulRouter:
 
         return self
 
-    def with_read_all_endpoint(self, is_documented: bool = True) -> Self:
+    def with_read_all_endpoint(
+        self,
+        is_documented: bool = True,
+        extract_user: Callable[[Request], Any] = no_user,
+    ) -> Self:
         parent_id_type = Annotated[
             str,
             Path(alias=self.parent_id_alias, default_factory=str),
@@ -262,14 +311,21 @@ class RestfulRouter:
             response_model=self.schema.for_collection(),
             include_in_schema=is_documented,
         )
-        def read_all(parent_id: parent_id_type) -> _Response:
-            service = self.infra.service_for(parent_id)
+        def read_all(
+            user: Annotated[Any, Depends(extract_user)],
+            parent_id: parent_id_type,
+        ) -> _Response:
+            service = self.infra.with_user(user).with_parent(parent_id).build()
 
             return self.response.found_many(list(service.read_all()))
 
         return self
 
-    def with_update_one_endpoint(self, is_documented: bool = True) -> Self:
+    def with_update_one_endpoint(
+        self,
+        is_documented: bool = True,
+        extract_user: Callable[[Request], Any] = no_user,
+    ) -> Self:
         parent_id_type = Annotated[
             str,
             Path(alias=self.parent_id_alias, default_factory=str),
@@ -288,11 +344,12 @@ class RestfulRouter:
             include_in_schema=is_documented,
         )
         def update_one(
+            user: Annotated[Any, Depends(extract_user)],
             parent_id: parent_id_type,
             item_id: id_type,
             updates: update_type,
         ) -> _Response:
-            service = self.infra.service_for(parent_id)
+            service = self.infra.with_user(user).with_parent(parent_id).build()
 
             try:
                 service.update_one(item_id, **updates)
@@ -305,7 +362,11 @@ class RestfulRouter:
 
         return self
 
-    def with_update_many_endpoint(self, is_documented: bool = True) -> Self:
+    def with_update_many_endpoint(
+        self,
+        is_documented: bool = True,
+        extract_user: Callable[[Request], Any] = no_user,
+    ) -> Self:
         parent_id_type = Annotated[
             str,
             Path(alias=self.parent_id_alias, default_factory=str),
@@ -322,8 +383,12 @@ class RestfulRouter:
             response_model=self.schema.for_no_data(),
             include_in_schema=is_documented,
         )
-        def update_many(parent_id: parent_id_type, items: collection_type) -> _Response:
-            service = self.infra.service_for(parent_id)
+        def update_many(
+            user: Annotated[Any, Depends(extract_user)],
+            parent_id: parent_id_type,
+            items: collection_type,
+        ) -> _Response:
+            service = self.infra.with_user(user).with_parent(parent_id).build()
 
             service.update_many(items)
 
@@ -331,7 +396,11 @@ class RestfulRouter:
 
         return self
 
-    def with_delete_one_endpoint(self, is_documented: bool = True) -> Self:
+    def with_delete_one_endpoint(
+        self,
+        is_documented: bool = True,
+        extract_user: Callable[[Request], Any] = no_user,
+    ) -> Self:
         parent_id_type = Annotated[
             str,
             Path(alias=self.parent_id_alias, default_factory=str),
@@ -345,8 +414,12 @@ class RestfulRouter:
             response_model=self.schema.for_no_data(),
             include_in_schema=is_documented,
         )
-        def delete_one(parent_id: parent_id_type, item_id: id_type) -> _Response:
-            service = self.infra.service_for(parent_id)
+        def delete_one(
+            user: Annotated[Any, Depends(extract_user)],
+            parent_id: parent_id_type,
+            item_id: id_type,
+        ) -> _Response:
+            service = self.infra.with_user(user).with_parent(parent_id).build()
 
             try:
                 service.delete_one(item_id)

{apexdevkit-1.3.15 → apexdevkit-1.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.3.15"
+version = "1.4.2"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"