python-event-sourcery 0.5.0__tar.gz → 0.5.1__tar.gz

{python_event_sourcery-0.5.0 → python_event_sourcery-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-event-sourcery
-Version: 0.5.0
+Version: 0.5.1
 Summary: A library for event-based systems in Python.
 License: MIT
 Author: Sebastian Buczyński

{python_event_sourcery-0.5.0 → python_event_sourcery-0.5.1}/event_sourcery/_event_store/event/dto.py

@@ -73,6 +73,7 @@ class Event(BaseModel, extra="forbid"):
 
 
 TEvent = TypeVar("TEvent", bound=Event)
+TContext = TypeVar("TContext", bound=BaseModel)
 
 
 class Context(BaseModel, extra="allow"):
@@ -127,8 +128,18 @@ class WrappedEvent(Generic[TEvent]):
     context: Context = dataclasses.field(default_factory=Context)
 
     @classmethod
-    def wrap(cls, event: TEvent, version: int | None) -> "WrappedEvent[TEvent]":
-        return WrappedEvent[TEvent](event=event, version=version)
+    def wrap(
+        cls,
+        event: TEvent,
+        version: int | None,
+        context: Context | None = None,
+    ) -> "WrappedEvent[TEvent]":
+        return WrappedEvent[TEvent](
+            event=event, version=version, context=context or Context()
+        )
+
+    def get_context(self, context_type: type[TContext]) -> TContext:
+        return context_type.model_validate(self.context.model_dump())
 
 
 @dataclasses.dataclass(frozen=True)

{python_event_sourcery-0.5.0 → python_event_sourcery-0.5.1}/event_sourcery/_event_store/subscription/in_transaction.py

@@ -9,6 +9,7 @@ Used for in-transaction (in-process) event processing.
 
 __all__ = ["Dispatcher", "Listener", "Listeners"]
 
+from collections import defaultdict
 from collections.abc import Iterator
 from itertools import chain
 from typing import Protocol
@@ -20,7 +21,7 @@ from event_sourcery._event_store.event.dto import (
     WrappedEvent,
 )
 from event_sourcery._event_store.event.serde import Serde
-from event_sourcery._event_store.stream_id import StreamId
+from event_sourcery._event_store.stream_id import StreamCategory, StreamId
 from event_sourcery._event_store.tenant_id import TenantId
 
 
@@ -58,9 +59,13 @@ class Listeners:
     """
 
     def __init__(self) -> None:
-        self._listeners: dict[type[Event], set[Listener]] = {}
+        self._to_event_types: dict[type[Event], set[Listener]] = {}
+        self._to_categories: dict[StreamCategory, set[Listener]] = defaultdict(set)
 
-    def __getitem__(self, event_type: type[Event]) -> Iterator[Listener]:
+    def __getitem__(
+        self,
+        subscribed_to: type[Event] | StreamCategory,
+    ) -> Iterator[Listener]:
         """
         Returns an iterator over all listeners registered for the given event type or
         its base types.
@@ -71,27 +76,35 @@ class Listeners:
         Returns:
             Iterator[Listener]: An iterator over matching listeners.
         """
-        return chain(
-            *(
-                listeners
-                for registered_to, listeners in self._listeners.items()
-                if issubclass(event_type, registered_to)
-            )
-        )
-
-    def register(self, listener: Listener, to: type[Event]) -> None:
+        match subscribed_to:
+            case StreamCategory() as category:
+                return chain(self._to_categories[category])
+            case _ as event_type:
+                return chain(
+                    *(
+                        listeners
+                        for registered_to, listeners in self._to_event_types.items()
+                        if issubclass(event_type, registered_to)
+                    )
+                )
+
+    def register(self, listener: Listener, to: type[Event] | StreamCategory) -> None:
         """
         Registers a listener for a specific event type.
 
         Args:
             listener (Listener): The listener to register.
-            to (type[Event]): The event type to register the listener for.
+            to (type[Event] | StreamCategory): The event type or stream category.
         """
-        if to not in self._listeners:
-            self._listeners[to] = set()
-        self._listeners[to].add(listener)
-
-    def remove(self, listener: Listener, to: type[Event]) -> None:
+        match to:
+            case StreamCategory() as category:
+                self._to_categories[category].add(listener)
+            case _ as event_type:
+                if event_type not in self._to_event_types:
+                    self._to_event_types[event_type] = set()
+                self._to_event_types[event_type].add(listener)
+
+    def remove(self, listener: Listener, to: type[Event] | StreamCategory) -> None:
         """
         Removes a listener from a specific event type.
 
@@ -99,8 +112,12 @@ class Listeners:
             listener (Listener): The listener to remove.
             to (type[Event]): The event type to remove the listener from.
         """
-        if to in self._listeners and listener in self._listeners[to]:
-            self._listeners[to].remove(listener)
+        match to:
+            case StreamCategory() as category:
+                self._to_categories[category].remove(listener)
+            case _:
+                if to in self._to_event_types and listener in self._to_event_types[to]:
+                    self._to_event_types[to].remove(listener)
 
 
 class Dispatcher:
@@ -122,8 +139,10 @@ class Dispatcher:
         """
         for raw in raws:
             record = self._serde.deserialize_record(raw)
-            event_type = record.wrapped_event.event.__class__
-            for listener in self._listeners[event_type]:
+            event = record.wrapped_event.event.__class__
+            category = record.stream_id.category or ""
+            listeners = set(self._listeners[event]) | set(self._listeners[category])
+            for listener in listeners:
                 listener(
                     record.wrapped_event,
                     record.stream_id,

{python_event_sourcery-0.5.0 → python_event_sourcery-0.5.1}/event_sourcery/event_sourcing/aggregate.py

@@ -2,6 +2,7 @@ from collections.abc import Iterator
 from contextlib import contextmanager
 from typing import ClassVar
 
+from event_sourcery import StreamCategory
 from event_sourcery.event import Event
 
 
@@ -17,11 +18,11 @@ class Aggregate:
     for applying events in a consistent way.
 
     Attributes:
-        category (ClassVar[str]): StreamCategory for the aggregate type (group streams).
+        category (ClassVar[StreamCategory]): StreamCategory for the aggregate type (group streams).
         _changes (list[Event]): List of yet not persisted events.
     """
 
-    category: ClassVar[str]
+    category: ClassVar[StreamCategory]
     _changes: list[Event]
 
     @contextmanager

{python_event_sourcery-0.5.0 → python_event_sourcery-0.5.1}/event_sourcery/event_sourcing/repository.py

@@ -3,7 +3,7 @@ from contextlib import contextmanager
 from typing import Generic, TypeVar, cast
 
 from event_sourcery import EventStore, StreamId, StreamUUID
-from event_sourcery.event import Event, WrappedEvent
+from event_sourcery.event import Context, Event, WrappedEvent
 from event_sourcery.event_sourcing import Aggregate
 
 TAggregate = TypeVar("TAggregate", bound=Aggregate)
@@ -27,6 +27,7 @@ class Repository(Generic[TAggregate]):
         self,
         uuid: StreamUUID,
         aggregate: TAggregate,
+        context: Context | None = None,
     ) -> Iterator[TAggregate]:
         """
         Context manager for loading an aggregate instance.
@@ -38,6 +39,7 @@ class Repository(Generic[TAggregate]):
         Args:
             uuid (StreamUUID): The unique identifier of the aggregate's stream.
             aggregate (TAggregate): The aggregate initial instance to load state into.
+            context (Context | None): Optional context to attach to all emitted events.
 
         Yields:
             TAggregate: The loaded and ready-to-use aggregate instance.
@@ -45,7 +47,7 @@ class Repository(Generic[TAggregate]):
         stream_id = StreamId(uuid=uuid, name=uuid.name, category=aggregate.category)
         old_version = self._load(stream_id, aggregate)
         yield aggregate
-        self._save(aggregate, old_version, stream_id)
+        self._save(aggregate, old_version, stream_id, context)
 
     def _load(self, stream_id: StreamId, aggregate: TAggregate) -> int:
         stream = self._event_store.load_stream(stream_id)
@@ -61,11 +63,12 @@ class Repository(Generic[TAggregate]):
         aggregate: TAggregate,
         old_version: int,
         stream_id: StreamId,
+        context: Context | None = None,
     ) -> None:
         with aggregate.__persisting_changes__() as pending:
             start_from = old_version + 1
             events = [
-                WrappedEvent.wrap(event, version)
+                WrappedEvent.wrap(event, version, context=context)
                 for version, event in enumerate(pending, start=start_from)
             ]
 

{python_event_sourcery-0.5.0 → python_event_sourcery-0.5.1}/event_sourcery_sqlalchemy/models/__init__.py

@@ -1,7 +1,7 @@
 from typing import Protocol
 
 from sqlalchemy import MetaData
-from sqlalchemy.orm import registry
+from sqlalchemy.orm import DeclarativeBase, registry
 from sqlalchemy.orm.clsregistry import ClsRegistryToken
 
 from event_sourcery_sqlalchemy.models.base import (
@@ -28,7 +28,7 @@ _class_registry: dict[str, type | ClsRegistryToken] = {}
 
 
 def configure_models(
-    base: type[BaseProto],
+    base: type[BaseProto | DeclarativeBase],
     event_model: type[BaseEvent] = DefaultEvent,
     stream_model: type[BaseStream] = DefaultStream,
     snapshot_model: type[BaseSnapshot] = DefaultSnapshot,

{python_event_sourcery-0.5.0 → python_event_sourcery-0.5.1}/pyproject.toml

@@ -3,7 +3,7 @@ name = "python-event-sourcery"
 requires-python = ">=3.10"
 
 [tool.poetry]
-version = "0.5.0"
+version = "0.5.1"
 description = "A library for event-based systems in Python."
 readme = "README.md"
 authors = [