apexdevkit 1.29.2__tar.gz → 1.29.4__tar.gz

{apexdevkit-1.29.2 → apexdevkit-1.29.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apexdevkit
-Version: 1.29.2
+Version: 1.29.4
 Summary: Apex Development Tools for python.
 License-File: LICENSE
 Author: Apex Dev

{apexdevkit-1.29.2 → apexdevkit-1.29.4}/apexdevkit/fastapi/service.py

@@ -67,7 +67,7 @@ class RestfulRepository(RestfulService, Generic[ItemT]):
 
     @cached_property
     def _batch(self) -> BruteForceBatch[ItemT]:
-        return BruteForceBatch(self.repository)
+        return BruteForceBatch(inner=self.repository)
 
     def create_one(self, item: RawItem) -> RawItem:
         return self.formatter.dump(self.repository.create(self.formatter.load(item)))
@@ -75,7 +75,7 @@ class RestfulRepository(RestfulService, Generic[ItemT]):
     def create_many(self, items: RawCollection) -> RawCollection:
         return [
             self.formatter.dump(item)
-            for item in self._batch.create_many(
+            for item in self._batch.load(
                 [self.formatter.load(fields) for fields in items]
             )
         ]
@@ -102,9 +102,7 @@ class RestfulRepository(RestfulService, Generic[ItemT]):
 
             updates.append(self.formatter.load(data))
 
-        self._batch.update_many(updates)
-
-        return [self.formatter.dump(item) for item in updates]
+        return [self.formatter.dump(item) for item in self._batch.renew(updates)]
 
     def replace_one(self, item: RawItem) -> RawItem:
         self.repository.update(self.formatter.load(item))
@@ -112,9 +110,9 @@ class RestfulRepository(RestfulService, Generic[ItemT]):
         return item
 
     def replace_many(self, items: RawCollection) -> RawCollection:
-        self._batch.update_many([self.formatter.load(item) for item in items])
+        updated = self._batch.renew([self.formatter.load(item) for item in items])
 
-        return items
+        return [self.formatter.dump(item) for item in updated]
 
     def delete_one(self, item_id: str) -> None:
         self.repository.delete(item_id)

{apexdevkit-1.29.2 → apexdevkit-1.29.4}/apexdevkit/repository/__init__.py

@@ -5,8 +5,8 @@ from .core import (
     Cursor,
     Database,
     DatabaseCommand,
+    NoRepository,
     Repository,
-    RepositoryBase,
     RepositoryDecorator,
 )
 from .core.interface import Entity
@@ -27,8 +27,8 @@ __all__ = [
     "Cursor",
     "Database",
     "DatabaseCommand",
+    "NoRepository",
     "Repository",
-    "RepositoryBase",
     "RepositoryDecorator",
     # In-memory
     "CacheMixin",

{apexdevkit-1.29.2 → apexdevkit-1.29.4}/apexdevkit/repository/core/__init__.py

@@ -6,8 +6,9 @@ from .database import (
     Database,
     DatabaseCommand,
 )
-from .decorator import BruteForceBatch, RepositoryDecorator
-from .interface import ItemT, Repository, RepositoryBase
+from .decorator import BruteForceBatch, NoRepository, RepositoryDecorator
+from .interface import Entity, ItemT, KeyFn, Repository
+from .mixin import ContainsMixin
 
 __all__ = [
     # Database
@@ -21,7 +22,11 @@ __all__ = [
     "RepositoryDecorator",
     "BruteForceBatch",
     # Interface
+    "Entity",
     "ItemT",
+    "KeyFn",
     "Repository",
-    "RepositoryBase",
+    "NoRepository",
+    # Mixin
+    "ContainsMixin",
 ]

apexdevkit-1.29.4/apexdevkit/repository/core/decorator.py

@@ -0,0 +1,77 @@
+from collections.abc import Container, Iterable, Iterator
+from contextlib import suppress
+from dataclasses import dataclass, field
+
+from apexdevkit.error import DoesNotExistError, ExistsError
+
+from .interface import ItemT, Repository
+
+
+class NoRepository(Repository[ItemT]):  # pragma: no cover
+    def create(self, item: ItemT) -> ItemT:
+        raise NotImplementedError
+
+    def read(self, item_id: str) -> ItemT:
+        raise NotImplementedError
+
+    def update(self, item: ItemT) -> None:
+        raise NotImplementedError
+
+    def delete(self, item_id: str) -> None:
+        raise NotImplementedError
+
+    def __iter__(self) -> Iterator[ItemT]:
+        raise NotImplementedError
+
+    def __len__(self) -> int:
+        raise NotImplementedError
+
+    def __contains__(self, item: object) -> bool:
+        raise NotImplementedError
+
+
+@dataclass(frozen=True, kw_only=True)
+class RepositoryDecorator(Repository[ItemT]):  # pragma: no cover
+    inner: Repository[ItemT] = field(default_factory=NoRepository)
+
+    def create(self, item: ItemT) -> ItemT:
+        return self.inner.create(item)
+
+    def read(self, item_id: str) -> ItemT:
+        return self.inner.read(item_id)
+
+    def update(self, item: ItemT) -> None:
+        self.inner.update(item)
+
+    def delete(self, item_id: str) -> None:
+        self.inner.delete(item_id)
+
+    def __iter__(self) -> Iterator[ItemT]:
+        return iter(self.inner)
+
+    def __len__(self) -> int:
+        return len(self.inner)
+
+    def __contains__(self, item: object) -> bool:
+        return item in self.inner
+
+
+@dataclass(frozen=True, kw_only=True)
+class BruteForceBatch(RepositoryDecorator[ItemT]):
+    def load(self, source: Iterable[ItemT]) -> Iterable[ItemT]:
+        for item in list(source):
+            with suppress(ExistsError):
+                yield self.inner.create(item)
+
+    def prune(self, source: Container[ItemT]) -> Iterable[ItemT]:
+        for item in list(self.inner):
+            if item not in source:
+                with suppress(DoesNotExistError):
+                    self.inner.delete(item.id)
+                    yield item
+
+    def renew(self, source: Iterable[ItemT]) -> Iterable[ItemT]:
+        for item in list(source):
+            with suppress(DoesNotExistError):
+                self.inner.update(item)
+                yield item

apexdevkit-1.29.4/apexdevkit/repository/core/interface.py

@@ -0,0 +1,45 @@
+from __future__ import annotations
+
+from collections.abc import Callable, Collection, Container, Iterable
+from dataclasses import dataclass, field
+from typing import Protocol, TypeVar
+from uuid import uuid4
+
+
+def _uuid() -> str:
+    return str(uuid4())
+
+
+@dataclass(frozen=True, kw_only=True)
+class Entity:
+    id: str = field(default_factory=_uuid)
+    idempotency_id: str | None = field(default=None)
+
+
+ItemT = TypeVar("ItemT", bound=Entity)
+KeyFn = Callable[[ItemT], str]
+
+
+class Repository(Collection[ItemT], Protocol[ItemT]):  # pragma: no cover
+    def create(self, item: ItemT) -> ItemT:
+        pass
+
+    def read(self, item_id: str) -> ItemT:
+        pass
+
+    def update(self, item: ItemT) -> None:
+        pass
+
+    def delete(self, item_id: str) -> None:
+        pass
+
+
+class BatchRepository(Repository[ItemT], Protocol[ItemT]):  # pragma: no cover
+    def load(self, source: Iterable[ItemT]) -> Iterable[ItemT]:
+        pass
+
+    def prune(self, source: Container[ItemT]) -> Iterable[ItemT]:
+        pass
+
+    def renew(self, source: Iterable[ItemT]) -> Iterable[ItemT]:
+        pass

apexdevkit-1.29.4/apexdevkit/repository/core/mixin.py

@@ -0,0 +1,24 @@
+from typing import Generic
+
+from apexdevkit.error import DoesNotExistError
+from apexdevkit.repository.core import Entity, ItemT
+
+
+class ContainsMixin(Generic[ItemT]):
+    def __contains__(self, item: object) -> bool:
+        match item:
+            case Entity():
+                return self.contains_id(item.id)
+            case _:
+                return False
+
+    def contains_id(self, value: str) -> bool:
+        try:
+            self.read(value)
+        except DoesNotExistError:
+            return False
+
+        return True
+
+    def read(self, item_id: str) -> ItemT:
+        raise NotImplementedError

{apexdevkit-1.29.2 → apexdevkit-1.29.4}/apexdevkit/repository/core/multi.py

@@ -7,7 +7,8 @@ from typing import Generic
 from apexdevkit.error import DoesNotExistError
 from apexdevkit.formatter import Formatter
 
-from .interface import ItemT, Repository, RepositoryBase
+from . import ContainsMixin
+from .interface import ItemT, Repository
 
 
 @dataclass(frozen=True)
@@ -20,7 +21,7 @@ class NoFormatter(Generic[ItemT]):
 
 
 @dataclass(frozen=True)
-class MultipleRepository(RepositoryBase[ItemT]):
+class MultipleRepository(ContainsMixin[ItemT], Repository[ItemT]):
     repositories: list[_InnerRepository[ItemT]]
 
     def create(self, item: ItemT) -> ItemT:

{apexdevkit-1.29.2 → apexdevkit-1.29.4}/apexdevkit/repository/in_memory/repository.py

@@ -6,14 +6,13 @@ from dataclasses import dataclass, field
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.key_fn import AttributeKey
-from apexdevkit.repository.core import ItemT, RepositoryBase
-from apexdevkit.repository.core.interface import KeyFn
+from apexdevkit.repository.core import ContainsMixin, ItemT, KeyFn, Repository
 
 from .store import InMemoryByteStore, KeyValueStore
 
 
 @dataclass(frozen=True)
-class InMemoryRepository(RepositoryBase[ItemT]):
+class InMemoryRepository(ContainsMixin[ItemT], Repository[ItemT]):
     store: KeyValueStore[ItemT] = field(default_factory=InMemoryByteStore)
     keys: list[KeyFn[ItemT]] = field(default_factory=lambda: [AttributeKey("id")])
 

{apexdevkit-1.29.2 → apexdevkit-1.29.4}/apexdevkit/repository/sql/mssql.py

@@ -8,12 +8,19 @@ from pymssql.exceptions import DatabaseError, OperationalError
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.formatter import Formatter
-from apexdevkit.repository.core import Database, DatabaseCommand, ItemT, RepositoryBase
-from apexdevkit.repository.sql.field import NotNone, SqlFieldManager, _SqlField
+from apexdevkit.repository.core import (
+    ContainsMixin,
+    Database,
+    DatabaseCommand,
+    ItemT,
+    Repository,
+)
+
+from .field import NotNone, SqlFieldManager, _SqlField
 
 
 @dataclass
-class MsSqlRepository(RepositoryBase[ItemT]):
+class MsSqlRepository(ContainsMixin[ItemT], Repository[ItemT]):
     db: Database
     table: SqlTable[ItemT]
 

{apexdevkit-1.29.2 → apexdevkit-1.29.4}/apexdevkit/repository/sql/sqlite.py

@@ -7,13 +7,19 @@ from typing import Any, Generic
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.formatter import Formatter
-from apexdevkit.repository import Database, DatabaseCommand, RepositoryBase
-from apexdevkit.repository.core.interface import ItemT
-from apexdevkit.repository.sql.field import NotNone, SqlFieldManager, _SqlField
+from apexdevkit.repository.core import (
+    ContainsMixin,
+    Database,
+    DatabaseCommand,
+    ItemT,
+    Repository,
+)
+
+from .field import NotNone, SqlFieldManager, _SqlField
 
 
 @dataclass(frozen=True)
-class SqliteRepository(RepositoryBase[ItemT]):
+class SqliteRepository(ContainsMixin[ItemT], Repository[ItemT]):
     db: Database
     table: SqlTable[ItemT]
 

{apexdevkit-1.29.2 → apexdevkit-1.29.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apexdevkit"
-version = "1.29.2"
+version = "1.29.4"
 description = "Apex Development Tools for python."
 readme = "README.md"
 authors = [

apexdevkit-1.29.2/apexdevkit/repository/core/decorator.py

@@ -1,37 +0,0 @@
-from collections.abc import Iterable, Iterator
-from dataclasses import dataclass
-from typing import Generic
-
-from .interface import ItemT, Repository
-
-
-@dataclass
-class RepositoryDecorator(Generic[ItemT]):  # pragma: no cover
-    inner: Repository[ItemT]
-
-    def create(self, item: ItemT) -> ItemT:
-        return self.inner.create(item)
-
-    def read(self, item_id: str) -> ItemT:
-        return self.inner.read(item_id)
-
-    def update(self, item: ItemT) -> None:
-        self.inner.update(item)
-
-    def delete(self, item_id: str) -> None:
-        self.inner.delete(item_id)
-
-    def __iter__(self) -> Iterator[ItemT]:
-        return self.inner.__iter__()
-
-    def __len__(self) -> int:
-        return self.inner.__len__()
-
-
-class BruteForceBatch(RepositoryDecorator[ItemT]):
-    def create_many(self, items: Iterable[ItemT]) -> Iterable[ItemT]:
-        return [self.inner.create(item) for item in items]
-
-    def update_many(self, items: Iterable[ItemT]) -> None:
-        for item in items:
-            self.inner.update(item)

apexdevkit-1.29.2/apexdevkit/repository/core/interface.py

@@ -1,68 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Callable, Iterable, Iterator
-from dataclasses import dataclass, field
-from typing import Generic, Protocol, TypeVar
-from uuid import uuid4
-
-
-def _uuid() -> str:
-    return str(uuid4())
-
-
-@dataclass(frozen=True, kw_only=True)
-class Entity:
-    id: str = field(default_factory=_uuid)
-    idempotency_id: str | None = field(default=None)
-
-
-ItemT = TypeVar("ItemT", bound=Entity)
-KeyFn = Callable[[ItemT], str]
-
-
-class Repository(Protocol[ItemT]):  # pragma: no cover
-    def create(self, item: ItemT) -> ItemT:
-        pass
-
-    def read(self, item_id: str) -> ItemT:
-        pass
-
-    def update(self, item: ItemT) -> None:
-        pass
-
-    def delete(self, item_id: str) -> None:
-        pass
-
-    def __iter__(self) -> Iterator[ItemT]:
-        pass
-
-    def __len__(self) -> int:
-        pass
-
-
-class BatchRepository(Repository[ItemT], Protocol[ItemT]):  # pragma: no cover
-    def create_many(self, items: Iterable[ItemT]) -> Iterable[ItemT]:
-        pass
-
-    def update_many(self, items: Iterable[ItemT]) -> None:
-        pass
-
-
-class RepositoryBase(Generic[ItemT]):  # pragma: no cover
-    def create(self, item: ItemT) -> ItemT:
-        raise NotImplementedError
-
-    def read(self, item_id: str) -> ItemT:
-        raise NotImplementedError
-
-    def update(self, item: ItemT) -> None:
-        raise NotImplementedError
-
-    def delete(self, item_id: str) -> None:
-        raise NotImplementedError
-
-    def __iter__(self) -> Iterator[ItemT]:
-        raise NotImplementedError
-
-    def __len__(self) -> int:
-        raise NotImplementedError