apexdevkit 1.6.3__tar.gz → 1.6.5__tar.gz

{apexdevkit-1.6.3 → apexdevkit-1.6.5}/PKG-INFO

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

{apexdevkit-1.6.3 → apexdevkit-1.6.5}/apexdevkit/error.py

@@ -48,3 +48,9 @@ class ForbiddenError(Exception):
     @property
     def id(self) -> Any:
         return self.item.id
+
+
+@dataclass
+class ApiError(Exception):
+    code: int
+    data: dict[str, Any]

{apexdevkit-1.6.3 → apexdevkit-1.6.5}/apexdevkit/fastapi/builder.py

@@ -3,7 +3,9 @@ from dataclasses import dataclass, field
 from typing import Any, Self
 
 from fastapi import APIRouter, FastAPI
+from starlette.responses import JSONResponse
 
+from apexdevkit.error import ApiError
 from apexdevkit.fastapi.service import RestfulService
 
 
@@ -12,6 +14,10 @@ class FastApiBuilder:
     app: FastAPI = field(default_factory=FastAPI)
 
     def build(self) -> FastAPI:
+        self.app.add_exception_handler(
+            ApiError,
+            lambda request, exc: JSONResponse(content=exc.data, status_code=exc.code),
+        )
         return self.app
 
     def with_title(self, value: str) -> Self:

{apexdevkit-1.6.3 → apexdevkit-1.6.5}/apexdevkit/fastapi/dependable.py

@@ -4,7 +4,9 @@ from typing import Annotated, Any, Callable, Protocol, Self
 from fastapi import Depends, Path
 from fastapi.requests import Request
 
+from apexdevkit.error import ApiError, DoesNotExistError
 from apexdevkit.fastapi import RestfulServiceBuilder
+from apexdevkit.fastapi.response import RestfulResponse
 from apexdevkit.fastapi.service import RestfulService
 from apexdevkit.testing import RestfulName
 
@@ -41,10 +43,15 @@ class ParentDependency:
 
     def as_dependable(self) -> type[RestfulServiceBuilder]:
         Builder = self.dependency.as_dependable()
-        ParentId = Annotated[str, Path(alias=self.parent.singular + "_id")]
+        ParentId = Annotated[
+            str, Path(alias=self.parent.singular.replace("-", "_") + "_id")
+        ]
 
         def _(builder: Builder, parent_id: ParentId) -> RestfulServiceBuilder:
-            return builder.with_parent(parent_id)
+            try:
+                return builder.with_parent(parent_id)
+            except DoesNotExistError as e:
+                raise ApiError(404, RestfulResponse(self.parent).not_found(e))
 
         return Annotated[RestfulServiceBuilder, Depends(_)]
 

{apexdevkit-1.6.3 → apexdevkit-1.6.5}/apexdevkit/fastapi/router.py

@@ -46,7 +46,7 @@ class RestfulRouter:
 
     @property
     def id_alias(self) -> str:
-        return self.name.singular + "_id"
+        return self.name.singular.replace("-", "_") + "_id"
 
     @property
     def item_path(self) -> str:
@@ -264,6 +264,7 @@ class RestfulRouter:
 
     def with_sub_resource(self, **names: APIRouter) -> Self:
         for name, router in names.items():
+            print(self.item_path)
             self.router.include_router(router, prefix=f"{self.item_path}/{name}")
 
         return self

{apexdevkit-1.6.3 → apexdevkit-1.6.5}/pyproject.toml

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