apexdevkit 1.12.4__tar.gz → 1.12.6__tar.gz

{apexdevkit-1.12.4 → apexdevkit-1.12.6}/PKG-INFO

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

{apexdevkit-1.12.4 → apexdevkit-1.12.6}/apexdevkit/formatter.py

@@ -42,7 +42,7 @@ class DataclassFormatter(Generic[_TargetT]):
         raw = deepcopy(raw)
 
         for key, formatter in self.sub_formatters.items():
-            raw[key] = formatter.load(raw.pop(key))
+            raw[key] = formatter.load(raw.pop(key)) if raw[key] else None
 
         return self.resource(**raw)
 

apexdevkit-1.12.6/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.12.6/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.12.6/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.4 → apexdevkit-1.12.6}/apexdevkit/repository/decorator.py

@@ -1,5 +1,5 @@
 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
@@ -27,6 +27,9 @@ class RepositoryDecorator(RepositoryBase[IdT, ItemT]):
     def delete(self, item_id: IdT) -> None:
         self.inner.delete(item_id)
 
+    def bind(self, **kwargs: Any) -> Repository[IdT, ItemT]:
+        return self.inner.bind(**kwargs)
+
     def __iter__(self) -> Iterator[ItemT]:
         return self.inner.__iter__()
 

{apexdevkit-1.12.4 → apexdevkit-1.12.6}/apexdevkit/repository/in_memory.py

@@ -1,4 +1,3 @@
-from copy import deepcopy
 from dataclasses import dataclass, field
 from typing import Any, Callable, Iterable, Iterator, Self
 
@@ -24,19 +23,19 @@ class InMemoryRepository(RepositoryBase[IdT, ItemT]):
     formatter: Formatter[_Raw, ItemT]
     items: dict[str, _Raw] = field(default_factory=dict)
 
-    _key_functions: list[KeyFunction] = field(init=False, default_factory=list)
+    _keys: list[KeyFunction] = field(init=False, default_factory=list)
+
+    def bind(self, **kwargs: Any) -> Self:
+        return self
 
     def with_key(self, function: KeyFunction) -> Self:
-        self._key_functions.append(function)
+        self._keys.append(function)
 
         return self
 
     def with_seeded(self, *items: ItemT) -> Self:
-        for item in items:
-            self.create(item)
-        return self
+        self.create_many(list(items))
 
-    def bind(self, **kwargs: Any) -> Self:
         return self
 
     def create_many(self, items: list[ItemT]) -> list[ItemT]:
@@ -47,7 +46,7 @@ class InMemoryRepository(RepositoryBase[IdT, ItemT]):
 
     def create(self, item: ItemT) -> ItemT:
         self._ensure_does_not_exist(item)
-        self.items[self._key_functions[0](item)] = deepcopy(self.formatter.dump(item))
+        self.items[self._pk(item)] = self.formatter.dump(item)
 
         return item
 
@@ -55,39 +54,41 @@ class InMemoryRepository(RepositoryBase[IdT, ItemT]):
         for existing in self:
             error = ExistsError(existing)
 
-            for key in self._key_functions:
+            for key in self._keys:
                 if key(new) == key(existing):
                     error.with_duplicate(key)
 
             error.fire()
 
-    def read(self, item_id: IdT) -> ItemT:
-        for key in self._key_functions:
-            for item in self:
-                if key(item) == str(item_id):
-                    return item
-
-        raise DoesNotExistError(item_id)
-
-    def update(self, item: ItemT) -> None:
-        try:
-            del self.items[self._key_functions[0](item)]
-        except KeyError:
-            raise DoesNotExistError(self._key_functions[0](item))
-        self.create(item)
+    def _pk(self, item: ItemT) -> Any:
+        return self._keys[0](item)
 
     def update_many(self, items: list[ItemT]) -> None:
         for item in items:
             self.update(item)
 
+    def update(self, item: ItemT) -> None:
+        self.delete(self._pk(item))
+        self.create(item)
+
     def delete(self, item_id: IdT) -> None:
-        for key in self._key_functions:
+        item = self.read(item_id)
+        del self.items[self._pk(item)]
+
+    def read(self, item_id: IdT) -> ItemT:
+        for key in self._keys:
             for item in self:
                 if key(item) == str(item_id):
-                    del self.items[self._key_functions[0](item)]
-                    return
+                    return item
+
         raise DoesNotExistError(item_id)
 
+    def __iter__(self) -> Iterator[ItemT]:
+        yield from [self.formatter.load(raw) for raw in self.items.values()]
+
+    def __len__(self) -> int:
+        return len(self.items)
+
     def search(self, **kwargs: Any) -> Iterable[ItemT]:
         items = []
 
@@ -96,9 +97,3 @@ class InMemoryRepository(RepositoryBase[IdT, ItemT]):
                 items.append(self.formatter.load(item))
 
         return items
-
-    def __iter__(self) -> Iterator[ItemT]:
-        yield from [self.formatter.load(deepcopy(raw)) for raw in self.items.values()]
-
-    def __len__(self) -> int:
-        return len(self.items)

{apexdevkit-1.12.4 → apexdevkit-1.12.6}/pyproject.toml

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