python-event-sourcery 0.4.0a19__tar.gz → 0.4.0a20__tar.gz

{python_event_sourcery-0.4.0a19 → python_event_sourcery-0.4.0a20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-event-sourcery
-Version: 0.4.0a19
+Version: 0.4.0a20
 Summary: 
 License: MIT
 Author: Your Name

{python_event_sourcery-0.4.0a19 → python_event_sourcery-0.4.0a20}/event_sourcery/event_store/backend.py

@@ -1,9 +1,7 @@
-import abc
-from collections import UserDict
-from collections.abc import Iterator
+from collections.abc import Callable, Iterator
 from contextlib import AbstractContextManager
 from functools import wraps
-from typing import NoReturn, Protocol, TypeVar, cast
+from typing import NoReturn, TypeVar, cast
 
 from typing_extensions import Self
 
@@ -46,12 +44,10 @@ class NoOutboxStorageStrategy(OutboxStorageStrategy):
         return iter([])
 
 
-T_co = TypeVar("T_co", covariant=True)
 T = TypeVar("T")
+T_co = TypeVar("T_co", covariant=True)
 
-
-class _Provider(Protocol[T_co]):
-    def __call__(self, container: "_Container") -> T_co: ...
+_Provider = Callable[["_Container"], T]
 
 
 def singleton(provider: _Provider[T]) -> _Provider[T]:
@@ -75,32 +71,39 @@ def not_configured(error_message: str) -> _Provider[T]:
     return _raise
 
 
-class _Container(UserDict[type[T], _Provider[T] | T]):
+class _Container:
+    def __init__(self) -> None:
+        self.providers: dict[type, _Provider] = {}
+
     def __getitem__(self, _type: type[T]) -> T:
-        provider = cast(_Provider[T], self.data[_type])
-        return provider(self)
+        return cast(_Provider[T], self.providers[_type])(self)
 
     def __setitem__(self, _type: type[T], value: T | _Provider[T]) -> None:
-        self.data[_type] = (
-            cast(_Provider[T], lambda _: value) if isinstance(value, _type) else value
+        self.providers[_type] = (
+            cast(_Provider[T], lambda _: value)
+            if isinstance(value, _type)
+            else cast(_Provider[T], value)
         )
 
+    def get(self, _type: type[T], default: T | None = None) -> T | None:
+        if _type not in self.providers:
+            return default
+        return self[_type]
+
     def copy(self) -> Self:
         new: Self = self.__class__()
-        new.data.update(self.data.copy())
+        new.providers.update(self.providers.copy())
         return new
 
 
 class Backend(_Container):
-    tenant_id: TenantId
-
     def __init__(self) -> None:
         super().__init__()
-        self.tenant_id = DEFAULT_TENANT
-        self[EventRegistry] = lambda _: EventRegistry()
-        self[EncryptionStrategy] = lambda _: NoEncryptionStrategy()
+        self[TenantId] = DEFAULT_TENANT
+        self[EventRegistry] = EventRegistry()
+        self[EncryptionStrategy] = NoEncryptionStrategy()
         self[EncryptionKeyStorageStrategy] = (
-            lambda c: NoKeyStorageStrategy().scoped_for_tenant(c.tenant_id)
+            lambda c: NoKeyStorageStrategy().scoped_for_tenant(c[TenantId])
         )
         self[Encryption] = lambda c: Encryption(
             registry=c[EventRegistry],
@@ -133,23 +136,23 @@ class Backend(_Container):
 
     @property
     def event_store(self) -> EventStore:
-        return cast(EventStore, self[EventStore])
+        return self[EventStore]
 
     @property
     def outbox(self) -> Outbox:
-        return cast(Outbox, self[Outbox])
+        return self[Outbox]
 
     @property
     def subscriber(self) -> subscription.PositionPhase:
-        return cast(subscription.PositionPhase, self[subscription.PositionPhase])
+        return self[subscription.PositionPhase]
 
     def in_tenant_mode(self, tenant_id: TenantId) -> Self:
         in_tenant_mode = self.copy()
-        in_tenant_mode.tenant_id = tenant_id
+        in_tenant_mode[TenantId] = tenant_id
         return in_tenant_mode
 
-    @abc.abstractmethod
-    def with_outbox(self, filterer: OutboxFiltererStrategy = no_filter) -> Self: ...
+    def with_outbox(self, filterer: OutboxFiltererStrategy = no_filter) -> Self:
+        raise NotImplementedError()
 
     def with_encryption(
         self,
@@ -158,12 +161,12 @@ class Backend(_Container):
     ) -> Self:
         self[EncryptionStrategy] = strategy
         self[EncryptionKeyStorageStrategy] = lambda c: key_storage.scoped_for_tenant(
-            c.tenant_id
+            c[TenantId],
         )
         return self
 
 
-class TransactionalBackend(Backend, abc.ABC):
+class TransactionalBackend(Backend):
     def __init__(self) -> None:
         super().__init__()
         self[Listeners] = singleton(lambda _: Listeners())

{python_event_sourcery-0.4.0a19 → python_event_sourcery-0.4.0a20}/event_sourcery/event_store/in_memory.py

@@ -310,7 +310,7 @@ class InMemoryBackend(TransactionalBackend):
             c[Storage],
             c[Dispatcher],
             outbox_strategy=c.get(InMemoryOutboxStorageStrategy),
-        ).scoped_for_tenant(c.tenant_id)
+        ).scoped_for_tenant(c[TenantId])
         self[SubscriptionStrategy] = lambda c: InMemorySubscriptionStrategy(c[Storage])
 
     def configure(self, config: Config | None = None) -> Self:
@@ -318,10 +318,10 @@ class InMemoryBackend(TransactionalBackend):
         return self
 
     def with_outbox(self, filterer: OutboxFiltererStrategy = no_filter) -> Self:
-        self[OutboxFiltererStrategy] = filterer
+        self[OutboxFiltererStrategy] = filterer  # type: ignore[type-abstract]
         self[InMemoryOutboxStorageStrategy] = singleton(
             lambda c: InMemoryOutboxStorageStrategy(
-                c[OutboxFiltererStrategy],
+                c[OutboxFiltererStrategy],  # type: ignore[type-abstract]
                 c[Config].outbox_attempts,
             )
         )

{python_event_sourcery-0.4.0a19 → python_event_sourcery-0.4.0a20}/event_sourcery/event_store/interfaces.py

@@ -1,4 +1,3 @@
-import abc
 from collections.abc import Iterator
 from contextlib import AbstractContextManager
 from datetime import timedelta
@@ -17,25 +16,22 @@ class OutboxFiltererStrategy(Protocol):
     def __call__(self, entry: RawEvent) -> bool: ...
 
 
-class OutboxStorageStrategy(abc.ABC):
-    @abc.abstractmethod
+class OutboxStorageStrategy:
     def outbox_entries(
         self, limit: int
     ) -> Iterator[AbstractContextManager[RecordedRaw]]:
-        pass
+        raise NotImplementedError()
 
 
-class SubscriptionStrategy(abc.ABC):
-    @abc.abstractmethod
+class SubscriptionStrategy:
     def subscribe_to_all(
         self,
         start_from: Position,
         batch_size: int,
         timelimit: timedelta,
     ) -> Iterator[list[RecordedRaw]]:
-        pass
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def subscribe_to_category(
         self,
         start_from: Position,
@@ -43,9 +39,8 @@ class SubscriptionStrategy(abc.ABC):
         timelimit: timedelta,
         category: str,
     ) -> Iterator[list[RecordedRaw]]:
-        pass
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def subscribe_to_events(
         self,
         start_from: Position,
@@ -53,66 +48,54 @@ class SubscriptionStrategy(abc.ABC):
         timelimit: timedelta,
         events: list[str],
     ) -> Iterator[list[RecordedRaw]]:
-        pass
+        raise NotImplementedError()
 
 
-class StorageStrategy(abc.ABC):
-    @abc.abstractmethod
+class StorageStrategy:
     def fetch_events(
         self,
         stream_id: StreamId,
         start: int | None = None,
         stop: int | None = None,
     ) -> list[RawEvent]:
-        pass
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def insert_events(
         self, stream_id: StreamId, versioning: Versioning, events: list[RawEvent]
     ) -> None:
-        pass
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def save_snapshot(self, snapshot: RawEvent) -> None:
-        pass
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def delete_stream(self, stream_id: StreamId) -> None:
-        pass
+        raise NotImplementedError()
 
     @property
-    @abc.abstractmethod
     def current_position(self) -> Position | None:
-        pass
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def scoped_for_tenant(self, tenant_id: str) -> Self:
-        pass
+        raise NotImplementedError()
 
 
-class EncryptionKeyStorageStrategy(abc.ABC):
-    @abc.abstractmethod
+class EncryptionKeyStorageStrategy:
     def get(self, subject_id: str) -> bytes | None:
-        pass
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def store(self, subject_id: str, key: bytes) -> None:
-        pass
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def delete(self, subject_id: str) -> None:
-        pass
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def scoped_for_tenant(self, tenant_id: TenantId) -> Self:
-        pass
+        raise NotImplementedError()
 
 
-class EncryptionStrategy(abc.ABC):
-    @abc.abstractmethod
+class EncryptionStrategy:
     def encrypt(self, data: Any, key: bytes) -> str:
-        pass
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def decrypt(self, data: str, key: bytes) -> Any:
-        pass
+        raise NotImplementedError()

{python_event_sourcery-0.4.0a19 → python_event_sourcery-0.4.0a20}/event_sourcery/event_store/subscription.py

@@ -1,4 +1,3 @@
-import abc
 import sys
 from collections.abc import Callable, Iterator
 from dataclasses import dataclass, field
@@ -19,31 +18,29 @@ from event_sourcery.event_store.stream_id import Category
 Seconds: TypeAlias = int | float
 
 
-class BuildPhase(abc.ABC):
-    @abc.abstractmethod
-    def build_iter(
-        self, timelimit: Seconds | timedelta
-    ) -> Iterator[Recorded | None]: ...
+class BuildPhase:
+    def build_iter(self, timelimit: Seconds | timedelta) -> Iterator[Recorded | None]:
+        raise NotImplementedError()
 
-    @abc.abstractmethod
     def build_batch(
         self,
         size: int,
         timelimit: Seconds | timedelta,
-    ) -> Iterator[list[Recorded]]: ...
+    ) -> Iterator[list[Recorded]]:
+        raise NotImplementedError()
 
 
 class FilterPhase(BuildPhase):
-    @abc.abstractmethod
-    def to_category(self, category: Category) -> BuildPhase: ...
+    def to_category(self, category: Category) -> BuildPhase:
+        raise NotImplementedError()
 
-    @abc.abstractmethod
-    def to_events(self, events: list[type[Event]]) -> BuildPhase: ...
+    def to_events(self, events: list[type[Event]]) -> BuildPhase:
+        raise NotImplementedError()
 
 
-class PositionPhase(abc.ABC):
-    @abc.abstractmethod
-    def start_from(self, position: Position) -> FilterPhase: ...
+class PositionPhase:
+    def start_from(self, position: Position) -> FilterPhase:
+        raise NotImplementedError()
 
 
 @dataclass(repr=False)

{python_event_sourcery-0.4.0a19 → python_event_sourcery-0.4.0a20}/event_sourcery_django/__init__.py

@@ -8,7 +8,7 @@ from datetime import timedelta
 from pydantic import BaseModel, ConfigDict, PositiveInt
 from typing_extensions import Self
 
-from event_sourcery.event_store import Dispatcher
+from event_sourcery.event_store import Dispatcher, TenantId
 from event_sourcery.event_store.backend import (
     TransactionalBackend,
     no_filter,
@@ -40,7 +40,7 @@ class DjangoBackend(TransactionalBackend):
         self[StorageStrategy] = lambda c: DjangoStorageStrategy(
             c[Dispatcher],
             c.get(DjangoOutboxStorageStrategy, None),
-        ).scoped_for_tenant(c.tenant_id)
+        ).scoped_for_tenant(c[TenantId])
         self[SubscriptionStrategy] = lambda c: DjangoSubscriptionStrategy(
             gap_retry_interval=c[Config].gap_retry_interval
         )
@@ -52,9 +52,9 @@ class DjangoBackend(TransactionalBackend):
     def with_outbox(self, filterer: OutboxFiltererStrategy = no_filter) -> Self:
         from event_sourcery_django.outbox import DjangoOutboxStorageStrategy
 
-        self[OutboxFiltererStrategy] = filterer
+        self[OutboxFiltererStrategy] = filterer  # type: ignore[type-abstract]
         self[DjangoOutboxStorageStrategy] = lambda c: DjangoOutboxStorageStrategy(
-            c[OutboxFiltererStrategy],
+            c[OutboxFiltererStrategy],  # type: ignore[type-abstract]
             c[Config].outbox_attempts,
         )
         self[OutboxStorageStrategy] = lambda c: c[DjangoOutboxStorageStrategy]

{python_event_sourcery-0.4.0a19 → python_event_sourcery-0.4.0a20}/event_sourcery_kurrentdb/__init__.py

@@ -10,7 +10,7 @@ from kurrentdbclient import KurrentDBClient
 from pydantic import BaseModel, ConfigDict, PositiveFloat, PositiveInt
 from typing_extensions import Self
 
-from event_sourcery.event_store import Backend
+from event_sourcery.event_store import Backend, TenantId
 from event_sourcery.event_store.backend import no_filter, not_configured
 from event_sourcery.event_store.interfaces import (
     OutboxFiltererStrategy,
@@ -45,7 +45,7 @@ class KurrentDBBackend(Backend):
         self[StorageStrategy] = lambda c: KurrentDBStorageStrategy(
             c[KurrentDBClient],
             c[Config].timeout,
-        ).scoped_for_tenant(c.tenant_id)
+        ).scoped_for_tenant(c[TenantId])
         self[SubscriptionStrategy] = lambda c: KurrentDBSubscriptionStrategy(
             c[KurrentDBClient],
         )
@@ -56,10 +56,10 @@ class KurrentDBBackend(Backend):
         return self
 
     def with_outbox(self, filterer: OutboxFiltererStrategy = no_filter) -> Self:
-        self[OutboxFiltererStrategy] = filterer
+        self[OutboxFiltererStrategy] = filterer  # type: ignore[type-abstract]
         self[KurrentDBOutboxStorageStrategy] = lambda c: KurrentDBOutboxStorageStrategy(
             c[KurrentDBClient],
-            c[OutboxFiltererStrategy],
+            c[OutboxFiltererStrategy],  # type: ignore[type-abstract]
             c[Config].outbox_name,
             c[Config].outbox_attempts,
             c[Config].timeout,

{python_event_sourcery-0.4.0a19 → python_event_sourcery-0.4.0a20}/event_sourcery_sqlalchemy/__init__.py

@@ -19,7 +19,7 @@ from pydantic import BaseModel, ConfigDict, PositiveInt
 from sqlalchemy.orm import Session
 from typing_extensions import Self
 
-from event_sourcery.event_store import Dispatcher, TransactionalBackend
+from event_sourcery.event_store import Dispatcher, TenantId, TransactionalBackend
 from event_sourcery.event_store.backend import no_filter, not_configured
 from event_sourcery.event_store.interfaces import (
     OutboxFiltererStrategy,
@@ -67,25 +67,22 @@ class SQLAlchemyBackend(TransactionalBackend):
 
     def __init__(self) -> None:
         super().__init__()
-        self[BaseEvent] = not_configured(self.UNCONFIGURED_MESSAGE)
-        self[BaseStream] = not_configured(self.UNCONFIGURED_MESSAGE)
-        self[BaseSnapshot] = not_configured(self.UNCONFIGURED_MESSAGE)
-        self[BaseOutboxEntry] = not_configured(self.UNCONFIGURED_MESSAGE)
+        self[Models] = not_configured(self.UNCONFIGURED_MESSAGE)
         self[Session] = not_configured(self.UNCONFIGURED_MESSAGE)
         self[Config] = not_configured(self.UNCONFIGURED_MESSAGE)
         self[StorageStrategy] = lambda c: SqlAlchemyStorageStrategy(
             c[Session],
             c[Dispatcher],
             c.get(SqlAlchemyOutboxStorageStrategy, None),
-            c[BaseEvent],
-            c[BaseSnapshot],
-            c[BaseStream],
-        ).scoped_for_tenant(c.tenant_id)
+            c[Models].event_model,
+            c[Models].snapshot_model,
+            c[Models].stream_model,
+        ).scoped_for_tenant(c[TenantId])
         self[SubscriptionStrategy] = lambda c: SqlAlchemySubscriptionStrategy(
             c[Session],
             c[Config].gap_retry_interval,
-            c[BaseEvent],
-            c[BaseStream],
+            c[Models].event_model,
+            c[Models].stream_model,
         )
 
     def configure(
@@ -104,20 +101,17 @@ class SQLAlchemyBackend(TransactionalBackend):
 
         self[Session] = session
         self[Config] = config or Config()
-        self[BaseEvent] = lambda _: custom_models.event_model
-        self[BaseStream] = lambda _: custom_models.stream_model
-        self[BaseSnapshot] = lambda _: custom_models.snapshot_model
-        self[BaseOutboxEntry] = lambda _: custom_models.outbox_entry_model
+        self[Models] = custom_models
         return self
 
     def with_outbox(self, filterer: OutboxFiltererStrategy = no_filter) -> Self:
-        self[OutboxFiltererStrategy] = filterer
+        self[OutboxFiltererStrategy] = filterer  # type: ignore[type-abstract]
         self[SqlAlchemyOutboxStorageStrategy] = (
             lambda c: SqlAlchemyOutboxStorageStrategy(
                 c[Session],
-                c[OutboxFiltererStrategy],
+                c[OutboxFiltererStrategy],  # type: ignore[type-abstract]
                 c[Config].outbox_attempts,
-                c[BaseOutboxEntry],
+                c[Models].outbox_entry_model,
             )
         )
         self[OutboxStorageStrategy] = lambda c: c[SqlAlchemyOutboxStorageStrategy]

{python_event_sourcery-0.4.0a19 → python_event_sourcery-0.4.0a20}/event_sourcery_sqlalchemy/event_store.py

@@ -32,7 +32,7 @@ from event_sourcery_sqlalchemy.outbox import SqlAlchemyOutboxStorageStrategy
 class SqlAlchemyStorageStrategy(StorageStrategy):
     _session: Session
     _dispatcher: Dispatcher
-    _outbox: SqlAlchemyOutboxStorageStrategy
+    _outbox: SqlAlchemyOutboxStorageStrategy | None
     _event_model: type[BaseEvent]
     _snapshot_model: type[BaseSnapshot]
     _stream_model: type[BaseStream]

{python_event_sourcery-0.4.0a19 → python_event_sourcery-0.4.0a20}/pyproject.toml

@@ -3,7 +3,7 @@ name = "python-event-sourcery"
 requires-python = ">=3.10"
 
 [tool.poetry]
-version = "0.4.0a19"
+version = "0.4.0a20"
 description = ""
 authors = ["Your Name <you@example.com>"]
 license = "MIT"