apexdevkit 1.5.20__tar.gz → 1.5.22__tar.gz

{apexdevkit-1.5.20 → apexdevkit-1.5.22}/PKG-INFO

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

{apexdevkit-1.5.20 → apexdevkit-1.5.22}/apexdevkit/fastapi/builder.py

@@ -1,8 +1,11 @@
+from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
 from typing import Any, Self
 
 from fastapi import APIRouter, FastAPI
 
+from apexdevkit.fastapi.service import RestfulService
+
 
 @dataclass
 class FastApiBuilder:
@@ -37,3 +40,23 @@ class FastApiBuilder:
             self.app.include_router(value, prefix=f"/{key}", tags=[key.title()])
 
         return self
+
+
+@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:  # pragma: no cover
+        pass

apexdevkit-1.5.22/apexdevkit/fastapi/resource.py

@@ -0,0 +1,177 @@
+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.builder import RestfulServiceBuilder
+from apexdevkit.fastapi.response import RestfulResponse
+from apexdevkit.testing import RestfulName
+
+_Response = JSONResponse | dict[str, Any]
+
+
+@dataclass
+class RestfulResource:
+    name: RestfulName
+    infra: RestfulServiceBuilder
+    parent: RestfulName
+
+    @cached_property
+    def response(self) -> RestfulResponse:
+        return RestfulResponse(name=self.name)
+
+    def create_one(self, User, ParentId, Item) -> Callable[..., _Response]:  # type: ignore
+        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, ParentId, Collection) -> Callable[..., _Response]:  # type: ignore
+        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, ParentId, ItemId) -> Callable[..., _Response]:  # type: ignore
+        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, ParentId) -> Callable[..., _Response]:  # type: ignore
+        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, ParentId, ItemId, Updates) -> Callable[..., _Response]:  # type: ignore
+        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, ParentId, Collection) -> Callable[..., _Response]:  # type: ignore
+        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, ParentId, Item) -> Callable[..., _Response]:  # type: ignore
+        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, ParentId, Collection) -> Callable[..., _Response]:  # type: ignore
+        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, ParentId, ItemId) -> Callable[..., _Response]:  # type: ignore
+        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

apexdevkit-1.5.22/apexdevkit/fastapi/response.py

@@ -0,0 +1,130 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Iterable
+
+from fastapi import status
+from fastapi.responses import JSONResponse
+
+from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
+from apexdevkit.testing import RestfulName
+
+
+class SuccessResponse(dict[str, Any]):
+    def __init__(self, status_code: int, **kwargs: Any):
+        super().__init__(
+            {
+                "status": "success",
+                "code": status_code,
+                "data": {**kwargs},
+            }
+        )
+
+
+class ResourceFound(SuccessResponse):
+    def __init__(self, **kwargs: Any):
+        super().__init__(status_code=status.HTTP_200_OK, **kwargs)
+
+
+class ResourceCreated(SuccessResponse):
+    def __init__(self, **kwargs: Any):
+        super().__init__(status_code=status.HTTP_201_CREATED, **kwargs)
+
+
+class ErrorResponse(JSONResponse):
+    def __init__(self, status_code: int, message: str, **kwargs: Any):
+        content = {
+            "status": "fail",
+            "code": status_code,
+            "error": {"message": message},
+        }
+
+        if kwargs:
+            content["data"] = {**kwargs}
+
+        super().__init__(status_code=status_code, content=content)
+
+
+class BadRequest(ErrorResponse):
+    def __init__(self, message: str, **kwargs: Any) -> None:
+        super().__init__(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            message=message,
+            **kwargs,
+        )
+
+
+class ResourceNotFound(ErrorResponse):
+    def __init__(self, message: str):
+        super().__init__(status_code=status.HTTP_404_NOT_FOUND, message=message)
+
+
+class ResourceExists(ErrorResponse):
+    def __init__(self, message: str, **kwargs: Any):
+        super().__init__(
+            status_code=status.HTTP_409_CONFLICT,
+            message=message,
+            **kwargs,
+        )
+
+
+@dataclass
+class RestfulResponse:
+    name: RestfulName
+
+    def _response(self, code: int, data: Any, error: str = "") -> dict[str, Any]:
+        content: dict[str, Any] = {"code": code, "status": "success"}
+
+        if error:
+            content["status"] = "fail"
+            content["error"] = {"message": error}
+
+        match data:
+            case None:
+                content["data"] = {}
+            case list():
+                content["data"] = {self.name.plural: data, "count": len(data)}
+            case _:
+                content["data"] = {self.name.singular: data}
+
+        return content
+
+    def ok(self) -> dict[str, Any]:
+        return self._response(200, data=None)
+
+    def not_found(self, e: DoesNotExistError) -> dict[str, Any]:
+        name = self.name.singular.capitalize()
+
+        return self._response(
+            404,
+            data={"id": str(e.id)},
+            error=f"An item<{name}> with id<{e.id}> does not exist.",
+        )
+
+    def exists(self, e: ExistsError) -> dict[str, Any]:
+        name = self.name.singular.capitalize()
+
+        return self._response(
+            409,
+            data={"id": str(e.id)},
+            error=f"An item<{name}> with the {e} already exists.",
+        )
+
+    def forbidden(self, e: ForbiddenError) -> dict[str, Any]:
+        return self._response(
+            403,
+            data={"id": str(e.id)},
+            error=e.message,
+        )
+
+    def created_one(self, item: Any) -> dict[str, Any]:
+        return self._response(201, item)
+
+    def created_many(self, items: Iterable[Any]) -> dict[str, Any]:
+        return self._response(201, list(items))
+
+    def found_one(self, item: Any) -> dict[str, Any]:
+        return self._response(200, item)
+
+    def found_many(self, items: list[Any]) -> dict[str, Any]:
+        return self._response(200, items)

{apexdevkit-1.5.20 → apexdevkit-1.5.22}/apexdevkit/fastapi/router.py

@@ -1,104 +1,21 @@
-from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
 from functools import cached_property
-from typing import Annotated, Any, Callable, Iterable, Self, TypeVar
+from typing import Annotated, Any, Callable, Self, TypeVar
 
 from fastapi import APIRouter, Depends, Path
 from fastapi.responses import JSONResponse
 
-from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
+from apexdevkit.fastapi.builder import RestfulServiceBuilder
+from apexdevkit.fastapi.resource import RestfulResource
 from apexdevkit.fastapi.schema import RestfulSchema, SchemaFields
 from apexdevkit.fastapi.service import RawCollection, RawItem, RestfulService
 from apexdevkit.testing import RestfulName
 
 _Response = JSONResponse | dict[str, Any]
 
-
-@dataclass
-class RestfulResponse:
-    name: RestfulName
-
-    def _response(self, code: int, data: Any, error: str = "") -> dict[str, Any]:
-        content: dict[str, Any] = {"code": code, "status": "success"}
-
-        if error:
-            content["status"] = "fail"
-            content["error"] = {"message": error}
-
-        match data:
-            case None:
-                content["data"] = {}
-            case list():
-                content["data"] = {self.name.plural: data, "count": len(data)}
-            case _:
-                content["data"] = {self.name.singular: data}
-
-        return content
-
-    def ok(self) -> dict[str, Any]:
-        return self._response(200, data=None)
-
-    def not_found(self, e: DoesNotExistError) -> dict[str, Any]:
-        name = self.name.singular.capitalize()
-
-        return self._response(
-            404,
-            data={"id": str(e.id)},
-            error=f"An item<{name}> with id<{e.id}> does not exist.",
-        )
-
-    def exists(self, e: ExistsError) -> dict[str, Any]:
-        name = self.name.singular.capitalize()
-
-        return self._response(
-            409,
-            data={"id": str(e.id)},
-            error=f"An item<{name}> with the {e} already exists.",
-        )
-
-    def forbidden(self, e: ForbiddenError) -> dict[str, Any]:
-        return self._response(
-            403,
-            data={"id": str(e.id)},
-            error=e.message,
-        )
-
-    def created_one(self, item: Any) -> dict[str, Any]:
-        return self._response(201, item)
-
-    def created_many(self, items: Iterable[Any]) -> dict[str, Any]:
-        return self._response(201, list(items))
-
-    def found_one(self, item: Any) -> dict[str, Any]:
-        return self._response(200, item)
-
-    def found_many(self, items: list[Any]) -> dict[str, Any]:
-        return self._response(200, items)
-
-
 T = TypeVar("T")
 
 
-@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:  # pragma: no cover
-        pass
-
-
 @dataclass
 class PreBuiltRestfulService(RestfulServiceBuilder):  # pragma: no cover
     service: RestfulService
@@ -119,22 +36,23 @@ class RestfulRouter:
 
     name: RestfulName = field(init=False)
     fields: SchemaFields = field(init=False)
-    infra: RestfulServiceBuilder = 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.infra = PreBuiltRestfulService(self.service)
-
-    @cached_property
-    def response(self) -> RestfulResponse:
-        return RestfulResponse(name=self.name)
+            self.with_infra(PreBuiltRestfulService(self.service))
 
     @cached_property
     def schema(self) -> RestfulSchema:
         return RestfulSchema(name=self.name, fields=self.fields)
 
+    @property
+    def resource(self) -> RestfulResource:
+        return RestfulResource(self.name, self.infra, RestfulName(self.parent))
+
     @property
     def id_alias(self) -> str:
         return self.name.singular + "_id"
@@ -174,7 +92,7 @@ class RestfulRouter:
     ) -> Self:
         self.router.add_api_route(
             "",
-            self.create_one(
+            self.resource.create_one(
                 User=Annotated[
                     Any,
                     Depends(extract_user),
@@ -198,26 +116,6 @@ class RestfulRouter:
 
         return self
 
-    def create_one(self, User, ParentId, Item) -> Callable[..., _Response]:  # type: ignore
-        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(RestfulName(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 with_create_many_endpoint(
         self,
         is_documented: bool = True,
@@ -225,7 +123,7 @@ class RestfulRouter:
     ) -> Self:
         self.router.add_api_route(
             "/batch",
-            self.create_many(
+            self.resource.create_many(
                 User=Annotated[
                     Any,
                     Depends(extract_user),
@@ -249,24 +147,6 @@ class RestfulRouter:
 
         return self
 
-    def create_many(self, User, ParentId, Collection) -> Callable[..., _Response]:  # type: ignore
-        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(RestfulName(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 with_read_one_endpoint(
         self,
         is_documented: bool = True,
@@ -274,7 +154,7 @@ class RestfulRouter:
     ) -> Self:
         self.router.add_api_route(
             self.item_path,
-            self.read_one(
+            self.resource.read_one(
                 User=Annotated[
                     Any,
                     Depends(extract_user),
@@ -298,24 +178,6 @@ class RestfulRouter:
 
         return self
 
-    def read_one(self, User, ParentId, ItemId) -> Callable[..., _Response]:  # type: ignore
-        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(RestfulName(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 with_read_all_endpoint(
         self,
         is_documented: bool = True,
@@ -323,7 +185,7 @@ class RestfulRouter:
     ) -> Self:
         self.router.add_api_route(
             "",
-            self.read_all(
+            self.resource.read_all(
                 User=Annotated[
                     Any,
                     Depends(extract_user),
@@ -343,21 +205,6 @@ class RestfulRouter:
 
         return self
 
-    def read_all(self, User, ParentId) -> Callable[..., _Response]:  # type: ignore
-        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(RestfulName(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 with_update_one_endpoint(
         self,
         is_documented: bool = True,
@@ -365,7 +212,7 @@ class RestfulRouter:
     ) -> Self:
         self.router.add_api_route(
             self.item_path,
-            self.update_one(
+            self.resource.update_one(
                 User=Annotated[
                     Any,
                     Depends(extract_user),
@@ -393,30 +240,6 @@ class RestfulRouter:
 
         return self
 
-    def update_one(self, User, ParentId, ItemId, Updates) -> Callable[..., _Response]:  # type: ignore
-        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(RestfulName(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 with_update_many_endpoint(
         self,
         is_documented: bool = True,
@@ -424,7 +247,7 @@ class RestfulRouter:
     ) -> Self:
         self.router.add_api_route(
             "",
-            self.update_many(
+            self.resource.update_many(
                 User=Annotated[
                     Any,
                     Depends(extract_user),
@@ -448,25 +271,6 @@ class RestfulRouter:
 
         return self
 
-    def update_many(self, User, ParentId, Collection) -> Callable[..., _Response]:  # type: ignore
-        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(RestfulName(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 with_replace_one_endpoint(
         self,
         is_documented: bool = True,
@@ -474,7 +278,7 @@ class RestfulRouter:
     ) -> Self:
         self.router.add_api_route(
             "",
-            self.replace_one(
+            self.resource.replace_one(
                 User=Annotated[
                     Any,
                     Depends(extract_user),
@@ -498,25 +302,6 @@ class RestfulRouter:
 
         return self
 
-    def replace_one(self, User, ParentId, Item) -> Callable[..., _Response]:  # type: ignore
-        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(RestfulName(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 with_replace_many_endpoint(
         self,
         is_documented: bool = True,
@@ -524,7 +309,7 @@ class RestfulRouter:
     ) -> Self:
         self.router.add_api_route(
             "/batch",
-            self.replace_many(
+            self.resource.replace_many(
                 User=Annotated[
                     Any,
                     Depends(extract_user),
@@ -548,25 +333,6 @@ class RestfulRouter:
 
         return self
 
-    def replace_many(self, User, ParentId, Collection) -> Callable[..., _Response]:  # type: ignore
-        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(RestfulName(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 with_delete_one_endpoint(
         self,
         is_documented: bool = True,
@@ -574,7 +340,7 @@ class RestfulRouter:
     ) -> Self:
         self.router.add_api_route(
             self.item_path,
-            self.delete_one(
+            self.resource.delete_one(
                 User=Annotated[
                     Any,
                     Depends(extract_user),
@@ -598,26 +364,6 @@ class RestfulRouter:
 
         return self
 
-    def delete_one(self, User, ParentId, ItemId) -> Callable[..., _Response]:  # type: ignore
-        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(RestfulName(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
-
     def with_sub_resource(self, **names: APIRouter) -> Self:
         for name, router in names.items():
             self.router.include_router(router, prefix=f"{self.item_path}/{name}")

{apexdevkit-1.5.20 → apexdevkit-1.5.22}/pyproject.toml

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

apexdevkit-1.5.20/apexdevkit/fastapi/response.py

@@ -1,64 +0,0 @@
-from __future__ import annotations
-
-from typing import Any
-
-from fastapi import status
-from fastapi.responses import JSONResponse
-
-
-class SuccessResponse(dict[str, Any]):
-    def __init__(self, status_code: int, **kwargs: Any):
-        super().__init__(
-            {
-                "status": "success",
-                "code": status_code,
-                "data": {**kwargs},
-            }
-        )
-
-
-class ResourceFound(SuccessResponse):
-    def __init__(self, **kwargs: Any):
-        super().__init__(status_code=status.HTTP_200_OK, **kwargs)
-
-
-class ResourceCreated(SuccessResponse):
-    def __init__(self, **kwargs: Any):
-        super().__init__(status_code=status.HTTP_201_CREATED, **kwargs)
-
-
-class ErrorResponse(JSONResponse):
-    def __init__(self, status_code: int, message: str, **kwargs: Any):
-        content = {
-            "status": "fail",
-            "code": status_code,
-            "error": {"message": message},
-        }
-
-        if kwargs:
-            content["data"] = {**kwargs}
-
-        super().__init__(status_code=status_code, content=content)
-
-
-class BadRequest(ErrorResponse):
-    def __init__(self, message: str, **kwargs: Any) -> None:
-        super().__init__(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            message=message,
-            **kwargs,
-        )
-
-
-class ResourceNotFound(ErrorResponse):
-    def __init__(self, message: str):
-        super().__init__(status_code=status.HTTP_404_NOT_FOUND, message=message)
-
-
-class ResourceExists(ErrorResponse):
-    def __init__(self, message: str, **kwargs: Any):
-        super().__init__(
-            status_code=status.HTTP_409_CONFLICT,
-            message=message,
-            **kwargs,
-        )