apexdevkit 1.12.5__tar.gz → 1.13.1__tar.gz

{apexdevkit-1.12.5 → apexdevkit-1.13.1}/PKG-INFO

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

{apexdevkit-1.12.5 → apexdevkit-1.13.1}/apexdevkit/fastapi/service.py

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

apexdevkit-1.13.1/apexdevkit/repository/alternative/__init__.py

@@ -0,0 +1,7 @@
+from apexdevkit.repository.alternative.base import MemoryPersistence
+from apexdevkit.repository.alternative.formatter_repository import FormatterRepository
+
+__all__ = [
+    "MemoryPersistence",
+    "FormatterRepository",
+]

apexdevkit-1.13.1/apexdevkit/repository/alternative/base.py

@@ -0,0 +1,49 @@
+from dataclasses import dataclass, field
+from typing import Any, Iterator
+
+from apexdevkit.error import DoesNotExistError, ExistsError
+
+_Raw = dict[str, Any]
+
+
+@dataclass
+class MemoryPersistence:  # pragma: no cover
+    items: dict[str, _Raw] = field(init=False, default_factory=dict)
+
+    def create(self, item: _Raw) -> _Raw:
+        self._ensure_does_not_exist(item)
+        self.items[item["id"]] = item
+
+        return item
+
+    def _ensure_does_not_exist(self, new: _Raw) -> None:
+        if new["id"] in self.items.keys():
+            error = ExistsError(self.items[new["id"]])
+            error.with_duplicate(lambda item: f"id<{item['id']}>")
+            error.fire()
+
+    def read(self, item_id: str) -> _Raw:
+        self._ensure_exists(item_id)
+
+        return self.items[item_id]
+
+    def _ensure_exists(self, item_id: str) -> None:
+        if item_id not in self.items.keys():
+            raise DoesNotExistError(item_id)
+
+    def update(self, item: _Raw) -> None:
+        self._ensure_exists(item["id"])
+
+        self.delete(item["id"])
+        self.create(item)
+
+    def delete(self, item_id: str) -> None:
+        self._ensure_exists(item_id)
+
+        self.items.pop(item_id)
+
+    def __iter__(self) -> Iterator[_Raw]:
+        yield from self.items.values()
+
+    def __len__(self) -> int:
+        return len(self.items)

apexdevkit-1.13.1/apexdevkit/repository/alternative/formatter_repository.py

@@ -0,0 +1,50 @@
+from dataclasses import dataclass
+from typing import Any, Generic, Iterator, Self
+
+from apexdevkit.formatter import Formatter
+from apexdevkit.repository.alternative import MemoryPersistence
+from apexdevkit.repository.interface import ItemT
+
+_Raw = dict[str, Any]
+
+
+@dataclass
+class FormatterRepository(Generic[ItemT]):
+    base: MemoryPersistence
+    formatter: Formatter[_Raw, ItemT]
+
+    def create(self, item: ItemT) -> ItemT:
+        return self.formatter.load(self.base.create(self.formatter.dump(item)))
+
+    def create_many(self, items: list[ItemT]) -> list[ItemT]:
+        return [
+            self.formatter.load(
+                self.base.create(
+                    self.formatter.dump(item),
+                ),
+            )
+            for item in items
+        ]
+
+    def read(self, item_id: str) -> ItemT:
+        return self.formatter.load(self.base.read(item_id))
+
+    def update(self, item: ItemT) -> None:
+        self.base.update(self.formatter.dump(item))
+
+    def update_many(self, items: list[ItemT]) -> None:
+        for item in items:
+            self.base.update(self.formatter.dump(item))
+
+    def delete(self, item_id: str) -> None:
+        self.base.delete(item_id)
+
+    def bind(self, **kwargs: Any) -> Self:
+        return self
+
+    def __iter__(self) -> Iterator[ItemT]:
+        for raw in self.base:
+            yield self.formatter.load(raw)
+
+    def __len__(self) -> int:
+        return len(self.base)

{apexdevkit-1.12.5 → apexdevkit-1.13.1}/apexdevkit/repository/base.py

@@ -1,16 +1,16 @@
 from typing import Any, Generic, Iterator
 
-from apexdevkit.repository.interface import IdT, ItemT, Repository
+from apexdevkit.repository.interface import ItemT, Repository
 
 
-class RepositoryBase(Generic[IdT, ItemT]):  # pragma: no cover
+class RepositoryBase(Generic[ItemT]):  # pragma: no cover
     def create(self, item: ItemT) -> ItemT:
         raise NotImplementedError
 
     def create_many(self, items: list[ItemT]) -> list[ItemT]:
         raise NotImplementedError
 
-    def read(self, item_id: IdT) -> ItemT:
+    def read(self, item_id: str) -> ItemT:
         raise NotImplementedError
 
     def update(self, item: ItemT) -> None:
@@ -19,10 +19,10 @@ class RepositoryBase(Generic[IdT, ItemT]):  # pragma: no cover
     def update_many(self, items: list[ItemT]) -> None:
         raise NotImplementedError
 
-    def delete(self, item_id: IdT) -> None:
+    def delete(self, item_id: str) -> None:
         raise NotImplementedError
 
-    def bind(self, **kwargs: Any) -> Repository[IdT, ItemT]:
+    def bind(self, **kwargs: Any) -> Repository[ItemT]:
         raise NotImplementedError
 
     def __iter__(self) -> Iterator[ItemT]:

{apexdevkit-1.12.5 → apexdevkit-1.13.1}/apexdevkit/repository/decorator.py

@@ -1,13 +1,13 @@
 from dataclasses import dataclass
-from typing import Iterator
+from typing import Any, Iterator
 
 from apexdevkit.repository.base import RepositoryBase
-from apexdevkit.repository.interface import IdT, ItemT, Repository
+from apexdevkit.repository.interface import ItemT, Repository
 
 
 @dataclass
-class RepositoryDecorator(RepositoryBase[IdT, ItemT]):
-    inner: Repository[IdT, ItemT]
+class RepositoryDecorator(RepositoryBase[ItemT]):
+    inner: Repository[ItemT]
 
     def create(self, item: ItemT) -> ItemT:
         return self.inner.create(item)
@@ -15,7 +15,7 @@ class RepositoryDecorator(RepositoryBase[IdT, ItemT]):
     def create_many(self, items: list[ItemT]) -> list[ItemT]:
         return self.inner.create_many(items)
 
-    def read(self, item_id: IdT) -> ItemT:
+    def read(self, item_id: str) -> ItemT:
         return self.inner.read(item_id)
 
     def update(self, item: ItemT) -> None:
@@ -24,9 +24,12 @@ class RepositoryDecorator(RepositoryBase[IdT, ItemT]):
     def update_many(self, items: list[ItemT]) -> None:
         self.inner.update_many(items)
 
-    def delete(self, item_id: IdT) -> None:
+    def delete(self, item_id: str) -> None:
         self.inner.delete(item_id)
 
+    def bind(self, **kwargs: Any) -> Repository[ItemT]:
+        return self.inner.bind(**kwargs)
+
     def __iter__(self) -> Iterator[ItemT]:
         return self.inner.__iter__()
 

{apexdevkit-1.12.5 → apexdevkit-1.13.1}/apexdevkit/repository/in_memory.py

@@ -4,7 +4,7 @@ from typing import Any, Callable, Iterable, Iterator, Self
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.formatter import Formatter
 from apexdevkit.repository import RepositoryBase
-from apexdevkit.repository.interface import IdT, ItemT
+from apexdevkit.repository.interface import ItemT
 
 KeyFunction = Callable[[Any], str]
 _Raw = dict[str, Any]
@@ -19,7 +19,7 @@ class AttributeKey:
 
 
 @dataclass
-class InMemoryRepository(RepositoryBase[IdT, ItemT]):
+class InMemoryRepository(RepositoryBase[ItemT]):
     formatter: Formatter[_Raw, ItemT]
     items: dict[str, _Raw] = field(default_factory=dict)
 
@@ -71,11 +71,11 @@ class InMemoryRepository(RepositoryBase[IdT, ItemT]):
         self.delete(self._pk(item))
         self.create(item)
 
-    def delete(self, item_id: IdT) -> None:
+    def delete(self, item_id: str) -> None:
         item = self.read(item_id)
         del self.items[self._pk(item)]
 
-    def read(self, item_id: IdT) -> ItemT:
+    def read(self, item_id: str) -> ItemT:
         for key in self._keys:
             for item in self:
                 if key(item) == str(item_id):

{apexdevkit-1.12.5 → apexdevkit-1.13.1}/apexdevkit/repository/interface.py

@@ -3,17 +3,16 @@ from __future__ import annotations
 from typing import Any, Iterator, Protocol, TypeVar
 
 ItemT = TypeVar("ItemT")
-IdT = TypeVar("IdT", contravariant=True)
 
 
-class Repository(Protocol[IdT, ItemT]):  # pragma: no cover
+class Repository(Protocol[ItemT]):  # pragma: no cover
     def create(self, item: ItemT) -> ItemT:
         pass
 
     def create_many(self, items: list[ItemT]) -> list[ItemT]:
         pass
 
-    def read(self, item_id: IdT) -> ItemT:
+    def read(self, item_id: str) -> ItemT:
         pass
 
     def update(self, item: ItemT) -> None:
@@ -22,10 +21,10 @@ class Repository(Protocol[IdT, ItemT]):  # pragma: no cover
     def update_many(self, items: list[ItemT]) -> None:
         pass
 
-    def delete(self, item_id: IdT) -> None:
+    def delete(self, item_id: str) -> None:
         pass
 
-    def bind(self, **kwargs: Any) -> Repository[IdT, ItemT]:
+    def bind(self, **kwargs: Any) -> Repository[ItemT]:
         pass
 
     def __iter__(self) -> Iterator[ItemT]:

{apexdevkit-1.12.5 → apexdevkit-1.13.1}/apexdevkit/repository/sqlite.py

@@ -6,15 +6,15 @@ from typing import Any, Generic, Iterator
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.repository import Database, DatabaseCommand, RepositoryBase
-from apexdevkit.repository.interface import IdT, ItemT
+from apexdevkit.repository.interface import ItemT
 
 
 @dataclass
-class SqliteRepository(RepositoryBase[IdT, ItemT]):
+class SqliteRepository(RepositoryBase[ItemT]):
     db: Database
     table: SqlTable[ItemT]
 
-    def bind(self, **kwargs: Any) -> SqliteRepository[IdT, ItemT]:
+    def bind(self, **kwargs: Any) -> SqliteRepository[ItemT]:
         return SqliteRepository(self.db, self.table.bind(**kwargs))
 
     def __iter__(self) -> Iterator[ItemT]:
@@ -42,7 +42,7 @@ class SqliteRepository(RepositoryBase[IdT, ItemT]):
     def create_many(self, items: list[ItemT]) -> list[ItemT]:
         return [self.create(item) for item in items]
 
-    def read(self, item_id: IdT) -> ItemT:
+    def read(self, item_id: str) -> ItemT:
         raw = self.db.execute(self.table.select(str(item_id))).fetch_one()
 
         if not raw:
@@ -57,7 +57,7 @@ class SqliteRepository(RepositoryBase[IdT, ItemT]):
         for item in items:
             self.update(item)
 
-    def delete(self, item_id: IdT) -> None:
+    def delete(self, item_id: str) -> None:
         self.db.execute(self.table.delete(str(item_id))).fetch_none()
 
     def delete_all(self) -> None:

{apexdevkit-1.12.5 → apexdevkit-1.13.1}/pyproject.toml

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