apexdevkit 1.5.5__tar.gz → 1.5.7__tar.gz

{apexdevkit-1.5.5 → apexdevkit-1.5.7}/PKG-INFO

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

{apexdevkit-1.5.5 → apexdevkit-1.5.7}/apexdevkit/error.py

@@ -43,6 +43,7 @@ class DoesNotExistError(Exception):
 @dataclass
 class ForbiddenError(Exception):
     item: Any = field(default_factory=UnknownItem)
+    message: str = "Forbidden"
 
     @property
     def id(self) -> Any:

{apexdevkit-1.5.5 → apexdevkit-1.5.7}/apexdevkit/fastapi/router.py

@@ -60,7 +60,7 @@ class RestfulResponse:
         return self._response(
             403,
             data={"id": str(e.id)},
-            error="Forbidden",
+            error=e.message,
         )
 
     def created_one(self, item: Any) -> dict[str, Any]:

apexdevkit-1.5.7/apexdevkit/formatter.py

@@ -0,0 +1,35 @@
+from dataclasses import asdict, dataclass, field
+from typing import Any, Generic, Protocol, Self, TypeVar
+
+ItemT = TypeVar("ItemT")
+
+
+class Formatter(Protocol[ItemT]):  # pragma: no cover
+    def load(self, raw: dict[str, Any]) -> ItemT:
+        pass
+
+    def dump(self, item: ItemT) -> dict[str, Any]:
+        pass
+
+
+@dataclass
+class DataclassFormatter(Generic[ItemT]):
+    resource: type[ItemT]
+    sub_formatters: dict[str, Formatter[Any]] = field(default_factory=dict)
+
+    def and_nested(self, **formatters: Formatter[Any]) -> Self:
+        return self.with_nested(**formatters)
+
+    def with_nested(self, **formatters: Formatter[Any]) -> Self:
+        self.sub_formatters.update(formatters)
+
+        return self
+
+    def load(self, raw: dict[str, Any]) -> ItemT:
+        for key, formatter in self.sub_formatters.items():
+            raw[key] = formatter.load(raw.pop(key))
+
+        return self.resource(**raw)
+
+    def dump(self, item: ItemT) -> dict[str, Any]:
+        return asdict(item)  # type: ignore

{apexdevkit-1.5.5 → apexdevkit-1.5.7}/pyproject.toml

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

apexdevkit-1.5.5/apexdevkit/formatter.py

@@ -1,23 +0,0 @@
-from dataclasses import asdict, dataclass
-from typing import Any, Generic, Protocol, TypeVar
-
-ItemT = TypeVar("ItemT")
-
-
-class Formatter(Protocol[ItemT]):
-    def load(self, raw: dict[str, Any]) -> ItemT:
-        pass
-
-    def dump(self, item: ItemT) -> dict[str, Any]:
-        pass
-
-
-@dataclass
-class DataclassFormatter(Generic[ItemT]):
-    resource: type[ItemT]
-
-    def load(self, raw: dict[str, Any]) -> ItemT:
-        return self.resource(**raw)
-
-    def dump(self, item: ItemT) -> dict[str, Any]:
-        return asdict(item)  # type: ignore