eventsourcing 9.4.0a2__tar.gz → 9.4.0a4__tar.gz

{eventsourcing-9.4.0a2 → eventsourcing-9.4.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eventsourcing
-Version: 9.4.0a2
+Version: 9.4.0a4
 Summary: Event sourcing in Python
 Home-page: https://github.com/pyeventsourcing/eventsourcing
 License: BSD 3-Clause
@@ -35,7 +35,7 @@ Requires-Dist: typing_extensions
 Project-URL: Repository, https://github.com/pyeventsourcing/eventsourcing
 Description-Content-Type: text/markdown
 
-[![Build Status](https://github.com/pyeventsourcing/eventsourcing/actions/workflows/runtests.yaml/badge.svg)](https://github.com/pyeventsourcing/eventsourcing)
+[![Build Status](https://github.com/pyeventsourcing/eventsourcing/actions/workflows/runtests.yaml/badge.svg?branch=9.4)](https://github.com/pyeventsourcing/eventsourcing)
 [![Coverage Status](https://coveralls.io/repos/github/pyeventsourcing/eventsourcing/badge.svg?branch=main)](https://coveralls.io/github/pyeventsourcing/eventsourcing?branch=main)
 [![Documentation Status](https://readthedocs.org/projects/eventsourcing/badge/?version=stable)](https://eventsourcing.readthedocs.io/en/stable/)
 [![Latest Release](https://badge.fury.io/py/eventsourcing.svg)](https://pypi.org/project/eventsourcing/)

{eventsourcing-9.4.0a2 → eventsourcing-9.4.0a4}/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://github.com/pyeventsourcing/eventsourcing/actions/workflows/runtests.yaml/badge.svg)](https://github.com/pyeventsourcing/eventsourcing)
+[![Build Status](https://github.com/pyeventsourcing/eventsourcing/actions/workflows/runtests.yaml/badge.svg?branch=9.4)](https://github.com/pyeventsourcing/eventsourcing)
 [![Coverage Status](https://coveralls.io/repos/github/pyeventsourcing/eventsourcing/badge.svg?branch=main)](https://coveralls.io/github/pyeventsourcing/eventsourcing?branch=main)
 [![Documentation Status](https://readthedocs.org/projects/eventsourcing/badge/?version=stable)](https://eventsourcing.readthedocs.io/en/stable/)
 [![Latest Release](https://badge.fury.io/py/eventsourcing.svg)](https://pypi.org/project/eventsourcing/)

{eventsourcing-9.4.0a2 → eventsourcing-9.4.0a4}/eventsourcing/persistence.py

@@ -486,7 +486,9 @@ class ApplicationRecorder(AggregateRecorder):
         """
 
     @abstractmethod
-    def subscribe(self, gt: int | None = None) -> Subscription[ApplicationRecorder]:
+    def subscribe(
+        self, gt: int | None = None, topics: Sequence[str] = ()
+    ) -> Subscription[ApplicationRecorder]:
         """
         Returns an iterator of Notification objects representing events from an
         application sequence.
@@ -1311,10 +1313,14 @@ TApplicationRecorder_co = TypeVar(
 
 class Subscription(Iterator[Notification], Generic[TApplicationRecorder_co]):
     def __init__(
-        self, recorder: TApplicationRecorder_co, gt: int | None = None
+        self,
+        recorder: TApplicationRecorder_co,
+        gt: int | None = None,
+        topics: Sequence[str] = (),
     ) -> None:
         self._recorder = recorder
         self._last_notification_id = gt
+        self._topics = topics
         self._has_been_entered = False
         self._has_been_stopped = False
 
@@ -1349,9 +1355,12 @@ class Subscription(Iterator[Notification], Generic[TApplicationRecorder_co]):
 
 class ListenNotifySubscription(Subscription[TApplicationRecorder_co]):
     def __init__(
-        self, recorder: TApplicationRecorder_co, gt: int | None = None
+        self,
+        recorder: TApplicationRecorder_co,
+        gt: int | None = None,
+        topics: Sequence[str] = (),
     ) -> None:
-        super().__init__(recorder=recorder, gt=gt)
+        super().__init__(recorder=recorder, gt=gt, topics=topics)
         self._select_limit = 500
         self._notifications: List[Notification] = []
         self._notifications_index: int = 0
@@ -1410,6 +1419,7 @@ class ListenNotifySubscription(Subscription[TApplicationRecorder_co]):
             notifications = self._recorder.select_notifications(
                 start=self._last_notification_id or 0,
                 limit=self._select_limit,
+                topics=self._topics,
                 inclusive_of_start=False,
             )
             if len(notifications) > 0:

{eventsourcing-9.4.0a2 → eventsourcing-9.4.0a4}/eventsourcing/popo.py

@@ -14,6 +14,7 @@ from eventsourcing.persistence import (
     Notification,
     ProcessRecorder,
     StoredEvent,
+    Subscription,
     Tracking,
     TrackingRecorder,
 )
@@ -155,8 +156,10 @@ class POPOApplicationRecorder(POPOAggregateRecorder, ApplicationRecorder):
         with self._database_lock:
             return len(self._stored_events) or None
 
-    def subscribe(self, gt: int | None = None) -> POPOSubscription:
-        return POPOSubscription(self, gt)
+    def subscribe(
+        self, gt: int | None = None, topics: Sequence[str] = ()
+    ) -> Subscription[ApplicationRecorder]:
+        return POPOSubscription(recorder=self, gt=gt, topics=topics)
 
     def listen(self, event: Event) -> None:
         self._listeners.add(event)
@@ -172,10 +175,13 @@ class POPOApplicationRecorder(POPOAggregateRecorder, ApplicationRecorder):
 
 class POPOSubscription(ListenNotifySubscription[POPOApplicationRecorder]):
     def __init__(
-        self, recorder: POPOApplicationRecorder, gt: int | None = None
+        self,
+        recorder: POPOApplicationRecorder,
+        gt: int | None = None,
+        topics: Sequence[str] = (),
     ) -> None:
         assert isinstance(recorder, POPOApplicationRecorder)
-        super().__init__(recorder=recorder, gt=gt)
+        super().__init__(recorder=recorder, gt=gt, topics=topics)
         self._recorder.listen(self._has_been_notified)
 
     def stop(self) -> None:

{eventsourcing-9.4.0a2 → eventsourcing-9.4.0a4}/eventsourcing/postgres.py

@@ -30,6 +30,7 @@ from eventsourcing.persistence import (
     ProcessRecorder,
     ProgrammingError,
     StoredEvent,
+    Subscription,
     Tracking,
     TrackingRecorder,
 )
@@ -524,16 +525,21 @@ class PostgresApplicationRecorder(PostgresAggregateRecorder, ApplicationRecorder
                 raise ProgrammingError(msg)
         return notification_ids
 
-    def subscribe(self, gt: int | None = None) -> PostgresSubscription:
-        return PostgresSubscription(self, gt)
+    def subscribe(
+        self, gt: int | None = None, topics: Sequence[str] = ()
+    ) -> Subscription[ApplicationRecorder]:
+        return PostgresSubscription(recorder=self, gt=gt, topics=topics)
 
 
 class PostgresSubscription(ListenNotifySubscription[PostgresApplicationRecorder]):
     def __init__(
-        self, recorder: PostgresApplicationRecorder, gt: int | None = None
+        self,
+        recorder: PostgresApplicationRecorder,
+        gt: int | None = None,
+        topics: Sequence[str] = (),
     ) -> None:
         assert isinstance(recorder, PostgresApplicationRecorder)
-        super().__init__(recorder=recorder, gt=gt)
+        super().__init__(recorder=recorder, gt=gt, topics=topics)
         self._listen_thread = Thread(target=self._listen)
         self._listen_thread.start()
 

{eventsourcing-9.4.0a2 → eventsourcing-9.4.0a4}/eventsourcing/projection.py

@@ -5,7 +5,17 @@ import weakref
 from abc import ABC, abstractmethod
 from threading import Event, Thread
 from traceback import format_exc
-from typing import TYPE_CHECKING, Any, Dict, Generic, Iterator, Tuple, Type, TypeVar
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Dict,
+    Generic,
+    Iterator,
+    Sequence,
+    Tuple,
+    Type,
+    TypeVar,
+)
 from warnings import warn
 
 from eventsourcing.application import Application
@@ -37,11 +47,12 @@ class ApplicationSubscription(Iterator[Tuple[DomainEventProtocol, Tracking]]):
         self,
         app: Application,
         gt: int | None = None,
+        topics: Sequence[str] = (),
     ):
         self.name = app.name
         self.recorder = app.recorder
         self.mapper = app.mapper
-        self.subscription = self.recorder.subscribe(gt=gt)
+        self.subscription = self.recorder.subscribe(gt=gt, topics=topics)
 
     def __enter__(self) -> Self:
         self.subscription.__enter__()
@@ -68,6 +79,9 @@ class ApplicationSubscription(Iterator[Tuple[DomainEventProtocol, Tracking]]):
 
 class Projection(ABC, Generic[TTrackingRecorder]):
     name: str = ""
+    """Name of projection, used to pick prefixed environment variables."""
+    topics: Sequence[str] = ()
+    """Event topics, used to filter events in database."""
 
     def __init__(
         self,
@@ -112,12 +126,13 @@ class ProjectionRunner(Generic[TApplication, TTrackingRecorder]):
             self.projection_factory.tracking_recorder(tracking_recorder_class)
         )
 
+        self.projection = projection_class(
+            tracking_recorder=self.tracking_recorder,
+        )
         self.subscription = ApplicationSubscription(
             app=self.app,
             gt=self.tracking_recorder.max_tracking_id(self.app.name),
-        )
-        self.projection = projection_class(
-            tracking_recorder=self.tracking_recorder,
+            topics=self.projection.topics,
         )
         self._has_error = Event()
         self.thread_error: BaseException | None = None

{eventsourcing-9.4.0a2 → eventsourcing-9.4.0a4}/eventsourcing/sqlite.py

@@ -471,7 +471,9 @@ class SQLiteApplicationRecorder(
         c.execute(self.select_max_notification_id_statement)
         return c.fetchone()[0]
 
-    def subscribe(self, gt: int | None = None) -> Subscription[ApplicationRecorder]:
+    def subscribe(
+        self, gt: int | None = None, topics: Sequence[str] = ()
+    ) -> Subscription[ApplicationRecorder]:
         msg = f"The {type(self).__qualname__} recorder does not support subscriptions"
         raise NotImplementedError(msg)
 

{eventsourcing-9.4.0a2 → eventsourcing-9.4.0a4}/eventsourcing/tests/persistence.py

@@ -707,6 +707,45 @@ class ApplicationRecorderTestCase(TestCase, ABC):
                 stored_event3.originator_id, notifications[0].originator_id
             )
 
+        # Start a subscription, call stop() during iteration.
+        with recorder.subscribe(gt=None) as subscription:
+
+            # Receive events from the subscription.
+            for i, _ in enumerate(subscription):
+                subscription.stop()
+                # Shouldn't get here twice...
+                self.assertLess(i, 1, "Got here twice")
+
+        # Start a subscription, call stop() before iteration.
+        subscription = recorder.subscribe(gt=None)
+        with subscription:
+            subscription.stop()
+            # Receive events from the subscription.
+            for _ in subscription:
+                # Shouldn't get here...
+                self.fail("Got here")
+
+        # Start a subscription, call stop() before entering context manager.
+        subscription = recorder.subscribe(gt=None)
+        subscription.stop()
+        with subscription:
+            # Receive events from the subscription.
+            for _ in subscription:
+                # Shouldn't get here...
+                self.fail("Got here")
+
+        # Start a subscription with topics.
+        subscription = recorder.subscribe(gt=None, topics=["topic3"])
+        with subscription:
+            for notification in subscription:
+                self.assertEqual(notification.topic, "topic3")
+                if (
+                    notification.originator_id == stored_event3.originator_id
+                    and notification.originator_version
+                    == stored_event3.originator_version
+                ):
+                    break
+
     def close_db_connection(self, *args: Any) -> None:
         """"""
 

{eventsourcing-9.4.0a2 → eventsourcing-9.4.0a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eventsourcing"
-version = "9.4.0a2"
+version = "9.4.0a4"
 
 description = "Event sourcing in Python"
 authors = [