apexdevkit 1.8.9__tar.gz → 1.9.1__tar.gz

{apexdevkit-1.8.9 → apexdevkit-1.9.1}/PKG-INFO

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

{apexdevkit-1.8.9 → apexdevkit-1.9.1}/apexdevkit/fastapi/service.py

@@ -51,10 +51,10 @@ ItemT = TypeVar("ItemT")
 
 @dataclass
 class RestfulRepositoryBuilder(Generic[ItemT]):
-    formatter: Formatter[ItemT] = field(init=False)
+    formatter: Formatter[dict[str, Any], ItemT] = field(init=False)
     repository: Repository[Any, ItemT] = field(init=False)
 
-    def with_formatter(self, formatter: Formatter[ItemT]) -> Self:
+    def with_formatter(self, formatter: Formatter[dict[str, Any], ItemT]) -> Self:
         self.formatter = formatter
 
         return self
@@ -70,7 +70,7 @@ class RestfulRepositoryBuilder(Generic[ItemT]):
 
 @dataclass
 class _RestfulRepository(RestfulService, Generic[ItemT]):
-    formatter: Formatter[ItemT]
+    formatter: Formatter[dict[str, Any], ItemT]
     repository: Repository[Any, ItemT]
 
     def create_one(self, item: RawItem) -> RawItem:

apexdevkit-1.9.1/apexdevkit/formatter.py

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

{apexdevkit-1.8.9 → apexdevkit-1.9.1}/apexdevkit/repository/in_memory.py

@@ -13,12 +13,13 @@ class _Item(Protocol):  # pragma: no cover
 
 
 ItemT = TypeVar("ItemT", bound=_Item)
+_Raw = dict[str, Any]
 
 
 @dataclass
 class InMemoryRepository(Generic[ItemT]):
-    formatter: Formatter[ItemT]
-    items: dict[str, dict[str, Any]] = field(default_factory=dict)
+    formatter: Formatter[_Raw, ItemT]
+    items: dict[str, _Raw] = field(default_factory=dict)
 
     _uniques: list[Criteria] = field(init=False, default_factory=list)
     _search_by: list[str] = field(init=False, default_factory=list)

{apexdevkit-1.8.9 → apexdevkit-1.9.1}/pyproject.toml

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

apexdevkit-1.8.9/apexdevkit/formatter.py

@@ -1,38 +0,0 @@
-from copy import deepcopy
-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:
-        raw = deepcopy(raw)
-
-        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