apexdevkit 1.5.23__tar.gz → 1.5.24__tar.gz

{apexdevkit-1.5.23 → apexdevkit-1.5.24}/PKG-INFO

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

apexdevkit-1.5.24/apexdevkit/fastapi/resource.py

@@ -0,0 +1,129 @@
+from dataclasses import dataclass
+from functools import cached_property
+from typing import Any, Callable
+
+from starlette.responses import JSONResponse
+
+from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
+from apexdevkit.fastapi.response import RestfulResponse
+from apexdevkit.testing import RestfulName
+
+_Response = JSONResponse | dict[str, Any]
+
+
+@dataclass
+class RestfulResource:
+    name: RestfulName
+
+    @cached_property
+    def response(self) -> RestfulResponse:
+        return RestfulResponse(name=self.name)
+
+    def create_one(self, Service, Item) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(service: Service, item: Item) -> _Response:
+            try:
+                item = service.create_one(item)
+            except ExistsError as e:
+                return JSONResponse(self.response.exists(e), 409)
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+            return self.response.created_one(item)
+
+        return endpoint
+
+    def create_many(self, Service, Collection) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(service: Service, items: Collection) -> _Response:
+            try:
+                return self.response.created_many(service.create_many(items))
+            except ExistsError as e:
+                return JSONResponse(self.response.exists(e), 409)
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+        return endpoint
+
+    def read_one(self, Service, ItemId) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(service: Service, item_id: ItemId) -> _Response:
+            try:
+                return self.response.found_one(service.read_one(item_id))
+            except DoesNotExistError as e:
+                return JSONResponse(self.response.not_found(e), 404)
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+        return endpoint
+
+    def read_all(self, Service) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(service: Service) -> _Response:
+            try:
+                return self.response.found_many(list(service.read_all()))
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+        return endpoint
+
+    def update_one(self, Service, ItemId, Updates) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(service: Service, item_id: ItemId, updates: Updates) -> _Response:
+            try:
+                service.update_one(item_id, **updates)
+            except DoesNotExistError as e:
+                return JSONResponse(self.response.not_found(e), 404)
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+            return self.response.ok()
+
+        return endpoint
+
+    def update_many(self, Service, Collection) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(service: Service, items: Collection) -> _Response:
+            try:
+                service.update_many(items)
+            except DoesNotExistError as e:
+                return JSONResponse(self.response.not_found(e), 404)
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+            return self.response.ok()
+
+        return endpoint
+
+    def replace_one(self, Service, Item) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(service: Service, item: Item) -> _Response:
+            try:
+                service.replace_one(item)
+            except DoesNotExistError as e:
+                return JSONResponse(self.response.not_found(e), 404)
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+            return self.response.ok()
+
+        return endpoint
+
+    def replace_many(self, Service, Collection) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(service: Service, items: Collection) -> _Response:
+            try:
+                service.replace_many(items)
+            except DoesNotExistError as e:
+                return JSONResponse(self.response.not_found(e), 404)
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+            return self.response.ok()
+
+        return endpoint
+
+    def delete_one(self, Service, ItemId) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(service: Service, item_id: ItemId) -> _Response:
+            try:
+                service.delete_one(item_id)
+            except DoesNotExistError as e:
+                return JSONResponse(self.response.not_found(e), 404)
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+            return self.response.ok()
+
+        return endpoint

{apexdevkit-1.5.23 → apexdevkit-1.5.24}/apexdevkit/fastapi/router.py

@@ -1,12 +1,14 @@
 from dataclasses import dataclass, field
 from functools import cached_property
-from typing import Annotated, Any, Callable, Self, TypeVar
+from typing import Annotated, Any, Callable, Self, Type, TypeVar
 
-from fastapi import APIRouter, Depends, Path
+from fastapi import APIRouter, Depends, HTTPException, Path
 from fastapi.responses import JSONResponse
 
+from apexdevkit.error import DoesNotExistError
 from apexdevkit.fastapi.builder import RestfulServiceBuilder
-from apexdevkit.fastapi.resource import RestfulRootResource, RestfulSubResource
+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
@@ -50,16 +52,17 @@ class RestfulRouter:
         return RestfulSchema(name=self.name, fields=self.fields)
 
     @property
-    def resource(self) -> RestfulRootResource | RestfulSubResource:
-        if not self.parent:
-            return RestfulRootResource(self.name, self.infra)
-
-        return RestfulSubResource(self.name, self.infra, RestfulName(self.parent))
+    def resource(self) -> RestfulResource:
+        return RestfulResource(self.name)
 
     @property
     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 + "}"
@@ -92,10 +95,7 @@ class RestfulRouter:
         self.router.add_api_route(
             "",
             self.resource.create_one(
-                User=Annotated[
-                    Any,
-                    Depends(extract_user),
-                ],
+                Service=self._service(extract_user),
                 Item=Annotated[
                     RawItem,
                     Depends(self.schema.for_create_one()),
@@ -119,10 +119,7 @@ class RestfulRouter:
         self.router.add_api_route(
             "/batch",
             self.resource.create_many(
-                User=Annotated[
-                    Any,
-                    Depends(extract_user),
-                ],
+                Service=self._service(extract_user),
                 Collection=Annotated[
                     RawCollection,
                     Depends(self.schema.for_create_many()),
@@ -146,10 +143,7 @@ class RestfulRouter:
         self.router.add_api_route(
             self.item_path,
             self.resource.read_one(
-                User=Annotated[
-                    Any,
-                    Depends(extract_user),
-                ],
+                Service=self._service(extract_user),
                 ItemId=Annotated[
                     str,
                     Path(alias=self.id_alias),
@@ -173,10 +167,7 @@ class RestfulRouter:
         self.router.add_api_route(
             "",
             self.resource.read_all(
-                User=Annotated[
-                    Any,
-                    Depends(extract_user),
-                ],
+                Service=self._service(extract_user),
             ),
             methods=["GET"],
             status_code=200,
@@ -196,10 +187,7 @@ class RestfulRouter:
         self.router.add_api_route(
             self.item_path,
             self.resource.update_one(
-                User=Annotated[
-                    Any,
-                    Depends(extract_user),
-                ],
+                Service=self._service(extract_user),
                 ItemId=Annotated[
                     str,
                     Path(alias=self.id_alias),
@@ -227,10 +215,7 @@ class RestfulRouter:
         self.router.add_api_route(
             "",
             self.resource.update_many(
-                User=Annotated[
-                    Any,
-                    Depends(extract_user),
-                ],
+                Service=self._service(extract_user),
                 Collection=Annotated[
                     RawCollection,
                     Depends(self.schema.for_update_many()),
@@ -254,10 +239,7 @@ class RestfulRouter:
         self.router.add_api_route(
             "",
             self.resource.replace_one(
-                User=Annotated[
-                    Any,
-                    Depends(extract_user),
-                ],
+                Service=self._service(extract_user),
                 Item=Annotated[
                     RawItem,
                     Depends(self.schema.for_replace_one()),
@@ -281,10 +263,7 @@ class RestfulRouter:
         self.router.add_api_route(
             "/batch",
             self.resource.replace_many(
-                User=Annotated[
-                    Any,
-                    Depends(extract_user),
-                ],
+                Service=self._service(extract_user),
                 Collection=Annotated[
                     RawCollection,
                     Depends(self.schema.for_replace_many()),
@@ -308,10 +287,7 @@ class RestfulRouter:
         self.router.add_api_route(
             self.item_path,
             self.resource.delete_one(
-                User=Annotated[
-                    Any,
-                    Depends(extract_user),
-                ],
+                Service=self._service(extract_user),
                 ItemId=Annotated[
                     str,
                     Path(alias=self.id_alias),
@@ -346,3 +322,32 @@ class RestfulRouter:
 
     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.23 → apexdevkit-1.5.24}/pyproject.toml

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

apexdevkit-1.5.23/apexdevkit/fastapi/resource.py

@@ -1,342 +0,0 @@
-from dataclasses import dataclass
-from functools import cached_property
-from typing import Annotated, Any, Callable
-
-from fastapi import Path
-from starlette.responses import JSONResponse
-
-from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
-from apexdevkit.fastapi.builder import RestfulServiceBuilder
-from apexdevkit.fastapi.response import RestfulResponse
-from apexdevkit.testing import RestfulName
-
-_Response = JSONResponse | dict[str, Any]
-
-
-@dataclass
-class RestfulSubResource:
-    name: RestfulName
-    infra: RestfulServiceBuilder
-    parent: RestfulName
-
-    @property
-    def parent_id_alias(self) -> str:
-        return self.parent.singular + "_id"
-
-    @cached_property
-    def response(self) -> RestfulResponse:
-        return RestfulResponse(name=self.name)
-
-    def create_one(self, User, Item) -> Callable[..., _Response]:  # type: ignore
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def endpoint(user: User, parent_id: ParentId, item: Item) -> _Response:
-            try:
-                service = self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                return JSONResponse(RestfulResponse(self.parent).not_found(e), 404)
-
-            try:
-                item = service.create_one(item)
-            except ExistsError as e:
-                return JSONResponse(self.response.exists(e), 409)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.created_one(item)
-
-        return endpoint
-
-    def create_many(self, User, Collection) -> Callable[..., _Response]:  # type: ignore
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def endpoint(user: User, parent_id: ParentId, items: Collection) -> _Response:
-            try:
-                service = self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                return JSONResponse(RestfulResponse(self.parent).not_found(e), 404)
-
-            try:
-                return self.response.created_many(service.create_many(items))
-            except ExistsError as e:
-                return JSONResponse(self.response.exists(e), 409)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-        return endpoint
-
-    def read_one(self, User, ItemId) -> Callable[..., _Response]:  # type: ignore
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def endpoint(user: User, parent_id: ParentId, item_id: ItemId) -> _Response:
-            try:
-                service = self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                return JSONResponse(RestfulResponse(self.parent).not_found(e), 404)
-
-            try:
-                return self.response.found_one(service.read_one(item_id))
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-        return endpoint
-
-    def read_all(self, User) -> Callable[..., _Response]:  # type: ignore
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def endpoint(user: User, parent_id: ParentId) -> _Response:
-            try:
-                service = self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                return JSONResponse(RestfulResponse(self.parent).not_found(e), 404)
-
-            try:
-                return self.response.found_many(list(service.read_all()))
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-        return endpoint
-
-    def update_one(self, User, ItemId, Updates) -> Callable[..., _Response]:  # type: ignore
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def endpoint(
-            user: User,
-            parent_id: ParentId,
-            item_id: ItemId,
-            updates: Updates,
-        ) -> _Response:
-            try:
-                service = self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                return JSONResponse(RestfulResponse(self.parent).not_found(e), 404)
-
-            try:
-                service.update_one(item_id, **updates)
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.ok()
-
-        return endpoint
-
-    def update_many(self, User, Collection) -> Callable[..., _Response]:  # type: ignore
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def endpoint(user: User, parent_id: ParentId, items: Collection) -> _Response:
-            try:
-                service = self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                return JSONResponse(RestfulResponse(self.parent).not_found(e), 404)
-
-            try:
-                service.update_many(items)
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.ok()
-
-        return endpoint
-
-    def replace_one(self, User, Item) -> Callable[..., _Response]:  # type: ignore
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def endpoint(user: User, parent_id: ParentId, item: Item) -> _Response:
-            try:
-                service = self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                return JSONResponse(RestfulResponse(self.parent).not_found(e), 404)
-
-            try:
-                service.replace_one(item)
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.ok()
-
-        return endpoint
-
-    def replace_many(self, User, Collection) -> Callable[..., _Response]:  # type: ignore
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def endpoint(user: User, parent_id: ParentId, items: Collection) -> _Response:
-            try:
-                service = self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                return JSONResponse(RestfulResponse(self.parent).not_found(e), 404)
-
-            try:
-                service.replace_many(items)
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.ok()
-
-        return endpoint
-
-    def delete_one(self, User, ItemId) -> Callable[..., _Response]:  # type: ignore
-        ParentId = Annotated[str, Path(alias=self.parent_id_alias)]
-
-        def endpoint(user: User, parent_id: ParentId, item_id: ItemId) -> _Response:
-            try:
-                service = self.infra.with_user(user).with_parent(parent_id).build()
-            except DoesNotExistError as e:
-                return JSONResponse(RestfulResponse(self.parent).not_found(e), 404)
-
-            try:
-                service.delete_one(item_id)
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.ok()
-
-        return endpoint
-
-
-@dataclass
-class RestfulRootResource:
-    name: RestfulName
-    infra: RestfulServiceBuilder
-
-    @cached_property
-    def response(self) -> RestfulResponse:
-        return RestfulResponse(name=self.name)
-
-    def create_one(self, User, Item) -> Callable[..., _Response]:  # type: ignore
-        def endpoint(user: User, item: Item) -> _Response:
-            service = self.infra.with_user(user).build()
-
-            try:
-                item = service.create_one(item)
-            except ExistsError as e:
-                return JSONResponse(self.response.exists(e), 409)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.created_one(item)
-
-        return endpoint
-
-    def create_many(self, User, Collection) -> Callable[..., _Response]:  # type: ignore
-        def endpoint(user: User, items: Collection) -> _Response:
-            service = self.infra.with_user(user).build()
-
-            try:
-                return self.response.created_many(service.create_many(items))
-            except ExistsError as e:
-                return JSONResponse(self.response.exists(e), 409)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-        return endpoint
-
-    def read_one(self, User, ItemId) -> Callable[..., _Response]:  # type: ignore
-        def endpoint(user: User, item_id: ItemId) -> _Response:
-            service = self.infra.with_user(user).build()
-
-            try:
-                return self.response.found_one(service.read_one(item_id))
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-        return endpoint
-
-    def read_all(self, User) -> Callable[..., _Response]:  # type: ignore
-        def endpoint(user: User) -> _Response:
-            service = self.infra.with_user(user).build()
-
-            try:
-                return self.response.found_many(list(service.read_all()))
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-        return endpoint
-
-    def update_one(self, User, ItemId, Updates) -> Callable[..., _Response]:  # type: ignore
-        def endpoint(user: User, item_id: ItemId, updates: Updates) -> _Response:
-            service = self.infra.with_user(user).build()
-
-            try:
-                service.update_one(item_id, **updates)
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.ok()
-
-        return endpoint
-
-    def update_many(self, User, Collection) -> Callable[..., _Response]:  # type: ignore
-        def endpoint(user: User, items: Collection) -> _Response:
-            service = self.infra.with_user(user).build()
-
-            try:
-                service.update_many(items)
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.ok()
-
-        return endpoint
-
-    def replace_one(self, User, Item) -> Callable[..., _Response]:  # type: ignore
-        def endpoint(user: User, item: Item) -> _Response:
-            service = self.infra.with_user(user).build()
-
-            try:
-                service.replace_one(item)
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.ok()
-
-        return endpoint
-
-    def replace_many(self, User, Collection) -> Callable[..., _Response]:  # type: ignore
-        def endpoint(user: User, items: Collection) -> _Response:
-            service = self.infra.with_user(user).build()
-
-            try:
-                service.replace_many(items)
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.ok()
-
-        return endpoint
-
-    def delete_one(self, User, ItemId) -> Callable[..., _Response]:  # type: ignore
-        def endpoint(user: User, item_id: ItemId) -> _Response:
-            service = self.infra.with_user(user).build()
-
-            try:
-                service.delete_one(item_id)
-            except DoesNotExistError as e:
-                return JSONResponse(self.response.not_found(e), 404)
-            except ForbiddenError as e:
-                return JSONResponse(self.response.forbidden(e), 403)
-
-            return self.response.ok()
-
-        return endpoint