apexdevkit 1.1.2__tar.gz → 1.2.1__tar.gz

{apexdevkit-1.1.2 → apexdevkit-1.2.1}/PKG-INFO

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

{apexdevkit-1.1.2 → apexdevkit-1.2.1}/apexdevkit/fastapi/router.py

@@ -6,7 +6,7 @@ from fastapi.responses import JSONResponse
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.fastapi.schema import RestfulSchema
-from apexdevkit.fastapi.service import RestfulService, _RawCollection, _RawItem
+from apexdevkit.fastapi.service import RawCollection, RawItem, RestfulService
 from apexdevkit.testing import RestfulName
 
 _Response = JSONResponse | dict[str, Any]
@@ -115,7 +115,7 @@ class RestfulRouter:
             response_model=self.schema.for_item(),
             include_in_schema=is_documented,
         )
-        def create_one(item: Annotated[_RawItem, Depends(schema)]) -> _Response:
+        def create_one(item: Annotated[RawItem, Depends(schema)]) -> _Response:
             try:
                 item = self.service.create_one(item)
             except ExistsError as e:
@@ -135,7 +135,7 @@ class RestfulRouter:
             response_model=self.schema.for_collection(),
             include_in_schema=is_documented,
         )
-        def create_many(items: Annotated[_RawCollection, Depends(schema)]) -> _Response:
+        def create_many(items: Annotated[RawCollection, Depends(schema)]) -> _Response:
             try:
                 return self.response.created_many(self.service.create_many(items))
             except ExistsError as e:
@@ -188,7 +188,7 @@ class RestfulRouter:
         )
         def update_one(
             item_id: str,
-            updates: Annotated[_RawItem, Depends(schema)],
+            updates: Annotated[RawItem, Depends(schema)],
         ) -> _Response:
             try:
                 self.service.update_one(item_id, **updates)
@@ -209,7 +209,7 @@ class RestfulRouter:
             response_model=self.schema.for_no_data(),
             include_in_schema=is_documented,
         )
-        def update_many(items: Annotated[_RawCollection, Depends(schema)]) -> _Response:
+        def update_many(items: Annotated[RawCollection, Depends(schema)]) -> _Response:
             self.service.update_many(items)
 
             return self.response.ok()

apexdevkit-1.2.1/apexdevkit/fastapi/service.py

@@ -0,0 +1,86 @@
+from abc import ABC
+from dataclasses import asdict, dataclass, replace
+from typing import Any, Iterable
+
+from apexdevkit.repository.interface import Repository
+
+RawItem = dict[str, Any]
+RawCollection = Iterable[RawItem]
+
+
+class RestfulService(ABC):
+    def create_one(self, item: RawItem) -> RawItem:
+        raise NotImplementedError(self.create_one.__name__)
+
+    def create_many(self, items: RawCollection) -> RawCollection:
+        raise NotImplementedError(self.create_many.__name__)
+
+    def read_one(self, item_id: str) -> RawItem:
+        raise NotImplementedError(self.read_one.__name__)
+
+    def read_all(self) -> RawCollection:
+        raise NotImplementedError(self.read_all.__name__)
+
+    def update_one(self, item_id: str, **with_fields: Any) -> RawItem:
+        raise NotImplementedError(self.update_one.__name__)
+
+    def update_many(self, items: RawCollection) -> RawCollection:
+        raise NotImplementedError(self.update_many.__name__)
+
+    def delete_one(self, item_id: str) -> None:
+        raise NotImplementedError(self.delete_one.__name__)
+
+
+def _as_raw_collection(value: Iterable[Any]) -> RawCollection:
+    return [_as_raw_item(item) for item in value]
+
+
+def _as_raw_item(value: Any) -> RawItem:
+    return asdict(value)
+
+
+@dataclass
+class RestfulRepository(RestfulService):
+    resource: type[Any]
+    repository: Repository[Any, Any]
+
+    def create_one(self, item: RawItem) -> RawItem:
+        result = self.resource(**item)
+
+        self.repository.create(result)
+
+        return _as_raw_item(result)
+
+    def create_many(self, items: RawCollection) -> RawCollection:
+        result = [self.resource(**fields) for fields in items]
+
+        self.repository.create_many(result)
+
+        return _as_raw_collection(result)
+
+    def read_one(self, item_id: str) -> RawItem:
+        result = self.repository.read(item_id)
+
+        return _as_raw_item(result)
+
+    def read_all(self) -> RawCollection:
+        result = self.repository
+
+        return _as_raw_collection(result)
+
+    def update_one(self, item_id: str, **with_fields: Any) -> RawItem:
+        result = replace(self.repository.read(item_id), **with_fields)
+
+        self.repository.update(result)
+
+        return _as_raw_item(result)
+
+    def update_many(self, items: RawCollection) -> RawCollection:
+        result = [self.resource(**fields) for fields in items]
+
+        self.repository.update_many(result)
+
+        return _as_raw_collection(result)
+
+    def delete_one(self, item_id: str) -> None:
+        self.repository.delete(item_id)

{apexdevkit-1.1.2 → apexdevkit-1.2.1}/apexdevkit/repository/in_memory.py

@@ -1,5 +1,5 @@
 from copy import deepcopy
-from dataclasses import dataclass, field
+from dataclasses import asdict, dataclass, field
 from typing import Any, Generic, Iterable, Iterator, Protocol, Self, TypeVar
 
 from apexdevkit.error import Criteria, DoesNotExistError, ExistsError
@@ -22,6 +22,17 @@ class _Formatter(Protocol[ItemT]):
         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
+
+
 @dataclass
 class InMemoryRepository(Generic[ItemT]):
     formatter: _Formatter[ItemT]
@@ -30,6 +41,10 @@ class InMemoryRepository(Generic[ItemT]):
     _uniques: list[Criteria] = field(init=False, default_factory=list)
     _search_by: list[str] = field(init=False, default_factory=list)
 
+    @classmethod
+    def for_dataclass(cls, value: type[ItemT]) -> "InMemoryRepository[ItemT]":
+        return cls(DataclassFormatter(value))
+
     def __post_init__(self) -> None:
         self._search_by = ["id", *self._search_by]
 

apexdevkit-1.2.1/apexdevkit/repository/interface.py

@@ -0,0 +1,30 @@
+from typing import Iterator, Protocol, TypeVar
+
+ItemT = TypeVar("ItemT")
+IdT = TypeVar("IdT", contravariant=True)
+
+
+class Repository(Protocol[IdT, ItemT]):
+    def create(self, item: ItemT) -> None:
+        pass
+
+    def create_many(self, items: list[ItemT]) -> None:
+        pass
+
+    def read(self, item_id: IdT) -> ItemT:
+        pass
+
+    def update(self, item: ItemT) -> None:
+        pass
+
+    def update_many(self, items: list[ItemT]) -> None:
+        pass
+
+    def delete(self, item_id: IdT) -> None:
+        pass
+
+    def __iter__(self) -> Iterator[ItemT]:
+        pass
+
+    def __len__(self) -> int:
+        pass

{apexdevkit-1.1.2 → apexdevkit-1.2.1}/pyproject.toml

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

apexdevkit-1.1.2/apexdevkit/fastapi/service.py

@@ -1,85 +0,0 @@
-from dataclasses import asdict, dataclass, replace
-from typing import Any, Iterable, Protocol
-
-from apexdevkit.repository import InMemoryRepository
-
-_RawItem = dict[str, Any]
-_RawCollection = Iterable[_RawItem]
-
-
-class RestfulService(Protocol):
-    def create_one(self, item: _RawItem) -> _RawItem:
-        pass
-
-    def create_many(self, items: _RawCollection) -> _RawCollection:
-        pass
-
-    def read_one(self, item_id: str) -> _RawItem:
-        pass
-
-    def read_all(self) -> _RawCollection:
-        pass
-
-    def update_one(self, item_id: str, **with_fields: Any) -> _RawItem:
-        pass
-
-    def update_many(self, items: _RawCollection) -> _RawCollection:
-        pass
-
-    def delete_one(self, item_id: str) -> None:
-        pass
-
-
-def _as_raw_collection(value: Iterable[Any]) -> _RawCollection:
-    return [_as_raw_item(item) for item in value]
-
-
-def _as_raw_item(value: Any) -> _RawItem:
-    return asdict(value)
-
-
-@dataclass
-class InMemoryRestfulService:
-    resource: type[Any]
-    repository: InMemoryRepository[Any]
-
-    def create_one(self, item: _RawItem) -> _RawItem:
-        result = self.resource(**item)
-
-        self.repository.create(result)
-
-        return _as_raw_item(result)
-
-    def create_many(self, items: _RawCollection) -> _RawCollection:
-        result = [self.resource(**fields) for fields in items]
-
-        self.repository.create_many(result)
-
-        return _as_raw_collection(result)
-
-    def read_one(self, item_id: str) -> _RawItem:
-        result = self.repository.read(item_id)
-
-        return _as_raw_item(result)
-
-    def read_all(self) -> _RawCollection:
-        result = self.repository
-
-        return _as_raw_collection(result)
-
-    def update_one(self, item_id: str, **with_fields: Any) -> _RawItem:
-        result = replace(self.repository.read(item_id), **with_fields)
-
-        self.repository.update(result)
-
-        return _as_raw_item(result)
-
-    def update_many(self, items: _RawCollection) -> _RawCollection:
-        result = [self.resource(**fields) for fields in items]
-
-        self.repository.update_many(result)
-
-        return _as_raw_collection(result)
-
-    def delete_one(self, item_id: str) -> None:
-        self.repository.delete(item_id)