apexdevkit 1.9.9__tar.gz → 1.11.1__tar.gz

{apexdevkit-1.9.9 → apexdevkit-1.11.1}/PKG-INFO

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

{apexdevkit-1.9.9 → apexdevkit-1.11.1}/apexdevkit/repository/in_memory.py

@@ -1,21 +1,13 @@
 from copy import deepcopy
 from dataclasses import dataclass, field
-from typing import Any, Callable, Generic, Iterable, Iterator, Protocol, Self, TypeVar
+from typing import Any, Callable, Iterable, Iterator, Self
 
-from apexdevkit.annotation import deprecated
 from apexdevkit.error import DoesNotExistError, ExistsError
-from apexdevkit.formatter import DataclassFormatter, Formatter
-
-
-class _Item(Protocol):  # pragma: no cover
-    @property
-    def id(self) -> Any:
-        pass
-
+from apexdevkit.formatter import Formatter
+from apexdevkit.repository import RepositoryBase
+from apexdevkit.repository.interface import IdT, ItemT
 
 KeyFunction = Callable[[Any], str]
-
-ItemT = TypeVar("ItemT", bound=_Item)
 _Raw = dict[str, Any]
 
 
@@ -28,37 +20,12 @@ class AttributeKey:
 
 
 @dataclass
-class InMemoryRepository(Generic[ItemT]):
+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)
 
-    @classmethod
-    def for_dataclass(cls, value: type[ItemT]) -> "InMemoryRepository[ItemT]":
-        return cls(DataclassFormatter(value))
-
-    def __post_init__(self) -> None:
-        self._key_functions = [AttributeKey("id")]
-
-    @deprecated(
-        """
-        .with_searchable() is deprecated. Use .with_key() instead.
-        Instead of .with_searchable("code") use .with_key(AttributeKey("code"))
-        """
-    )
-    def with_searchable(self, attribute: str) -> Self:
-        return self.with_key(AttributeKey(attribute))
-
-    @deprecated(
-        """
-        .with_unique() is deprecated. Use .with_key() instead.
-        Instead of .with_unique(criteria) use .with_key(criteria)
-        """
-    )
-    def with_unique(self, criteria: KeyFunction) -> Self:
-        return self.with_key(criteria)
-
     def with_key(self, function: KeyFunction) -> Self:
         self._key_functions.append(function)
 
@@ -77,7 +44,7 @@ class InMemoryRepository(Generic[ItemT]):
 
     def create(self, item: ItemT) -> ItemT:
         self._ensure_does_not_exist(item)
-        self.items[str(item.id)] = deepcopy(self.formatter.dump(item))
+        self.items[self._key_functions[0](item)] = deepcopy(self.formatter.dump(item))
 
         return item
 
@@ -91,27 +58,32 @@ class InMemoryRepository(Generic[ItemT]):
 
             error.fire()
 
-    def read(self, item_id: Any) -> ItemT:
-        for item in self:
-            for key in self._key_functions:
+    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:
-        self.delete(item.id)
+        try:
+            del self.items[self._key_functions[0](item)]
+        except KeyError:
+            raise DoesNotExistError(self._key_functions[0](item))
         self.create(item)
 
     def update_many(self, items: list[ItemT]) -> None:
         for item in items:
             self.update(item)
 
-    def delete(self, item_id: Any) -> None:
-        try:
-            del self.items[str(item_id)]
-        except KeyError:
-            raise DoesNotExistError(item_id)
+    def delete(self, item_id: IdT) -> None:
+        for key in self._key_functions:
+            for item in self:
+                if key(item) == str(item_id):
+                    del self.items[self._key_functions[0](item)]
+                    return
+        raise DoesNotExistError(item_id)
 
     def search(self, **kwargs: Any) -> Iterable[ItemT]:
         items = []

{apexdevkit-1.9.9 → apexdevkit-1.11.1}/pyproject.toml

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