eventsourcing 9.4.0a7__py3-none-any.whl → 9.4.0b1__py3-none-any.whl

eventsourcing/interface.py

@@ -141,7 +141,7 @@ class NotificationLogJSONClient(NotificationLog):
         self,
         start: int | None,
         limit: int,
-        _: int | None = None,
+        stop: int | None = None,
         topics: Sequence[str] = (),
         *,
         inclusive_of_start: bool = True,

eventsourcing/persistence.py

@@ -12,9 +12,10 @@ from queue import Queue
 from threading import Condition, Event, Lock, Semaphore, Thread, Timer
 from time import monotonic, sleep, time
 from types import GenericAlias, ModuleType
-from typing import TYPE_CHECKING, Any, Generic, TypeVar, Union, cast
+from typing import TYPE_CHECKING, Any, Generic, Union, cast
 from uuid import UUID
-from warnings import warn
+
+from typing_extensions import TypeVar
 
 from eventsourcing.domain import DomainEventProtocol, EventSourcingError
 from eventsourcing.utils import (
@@ -284,15 +285,6 @@ class Mapper:
             state=stored_state,
         )
 
-    def from_domain_event(self, domain_event: DomainEventProtocol) -> StoredEvent:
-        warn(
-            "'from_domain_event()' is deprecated, use 'to_stored_event()' instead",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-        return self.to_stored_event(domain_event)
-
     def to_domain_event(self, stored_event: StoredEvent) -> DomainEventProtocol:
         """
         Converts the given :class:`StoredEvent` to a domain event object.
@@ -508,24 +500,27 @@ class TrackingRecorder(Recorder, ABC):
         """
 
     @abstractmethod
-    def has_tracking_id(self, application_name: str, notification_id: int) -> bool:
+    def has_tracking_id(
+        self, application_name: str, notification_id: int | None
+    ) -> bool:
         """
         Returns True if a tracking object with the given application name
-        and notification ID has been recorded, otherwise returns False.
+        and notification ID has been recorded, and True if given notification_id is
+        None, otherwise returns False.
         """
 
     def wait(
         self,
         application_name: str,
-        notification_id: int,
+        notification_id: int | None,
         timeout: float = 1.0,
         interrupt: Event | None = None,
     ) -> None:
         """
-        Block until a tracking object with the given application name and
-        notification ID has been recorded.
+        Block until a tracking object with the given application name and a
+        notification ID greater than equal to the given value has been recorded.
 
-        Polls has_tracking_id() with exponential backoff until the timeout
+        Polls max_tracking_id() with exponential backoff until the timeout
         is reached, or until the optional interrupt event is set.
 
         The timeout argument should be a floating point number specifying a
@@ -539,7 +534,10 @@ class TrackingRecorder(Recorder, ABC):
         deadline = monotonic() + timeout
         delay_ms = 1.0
         while True:
-            if self.has_tracking_id(application_name, notification_id):
+            max_tracking_id = self.max_tracking_id(application_name)
+            if notification_id is None or (
+                max_tracking_id is not None and max_tracking_id >= notification_id
+            ):
                 break
             if interrupt:
                 if interrupt.wait(timeout=delay_ms / 1000):
@@ -634,12 +632,10 @@ class EventStore:
         )
 
 
-TInfrastructureFactory = TypeVar(
-    "TInfrastructureFactory", bound="InfrastructureFactory[Any]"
+TTrackingRecorder = TypeVar(
+    "TTrackingRecorder", bound=TrackingRecorder, default=TrackingRecorder
 )
 
-TTrackingRecorder = TypeVar("TTrackingRecorder", bound=TrackingRecorder)
-
 
 class InfrastructureFactory(ABC, Generic[TTrackingRecorder]):
     """
@@ -658,14 +654,15 @@ class InfrastructureFactory(ABC, Generic[TTrackingRecorder]):
 
     @classmethod
     def construct(
-        cls: type[TInfrastructureFactory], env: Environment | None = None
-    ) -> TInfrastructureFactory:
+        cls: type[InfrastructureFactory[TTrackingRecorder]],
+        env: Environment | None = None,
+    ) -> InfrastructureFactory[TTrackingRecorder]:
         """
         Constructs concrete infrastructure factory for given
         named application. Reads and resolves persistence
         topic from environment variable 'PERSISTENCE_MODULE'.
         """
-        factory_cls: type[InfrastructureFactory[TrackingRecorder]]
+        factory_cls: type[InfrastructureFactory[TTrackingRecorder]]
         if env is None:
             env = Environment()
         topic = (
@@ -684,7 +681,7 @@ class InfrastructureFactory(ABC, Generic[TTrackingRecorder]):
             or "eventsourcing.popo"
         )
         try:
-            obj: type[InfrastructureFactory[TrackingRecorder]] | ModuleType = (
+            obj: type[InfrastructureFactory[TTrackingRecorder]] | ModuleType = (
                 resolve_topic(topic)
             )
         except TopicError as e:
@@ -697,7 +694,7 @@ class InfrastructureFactory(ABC, Generic[TTrackingRecorder]):
 
         if isinstance(obj, ModuleType):
             # Find the factory in the module.
-            factory_classes: list[type[InfrastructureFactory[TrackingRecorder]]] = []
+            factory_classes: list[type[InfrastructureFactory[TTrackingRecorder]]] = []
             for member in obj.__dict__.values():
                 if (
                     member is not InfrastructureFactory
@@ -724,7 +721,7 @@ class InfrastructureFactory(ABC, Generic[TTrackingRecorder]):
         else:
             msg = f"Not an infrastructure factory class or module: {topic}"
             raise AssertionError(msg)
-        return cast(TInfrastructureFactory, factory_cls(env=env))
+        return factory_cls(env=env)
 
     def __init__(self, env: Environment):
         """
@@ -757,6 +754,7 @@ class InfrastructureFactory(ABC, Generic[TTrackingRecorder]):
             mapper_topic = self.env.get(self.MAPPER_TOPIC)
             mapper_class = resolve_topic(mapper_topic) if mapper_topic else Mapper
 
+        assert isinstance(mapper_class, type) and issubclass(mapper_class, Mapper)
         return mapper_class(
             transcoder=transcoder or self.transcoder(),
             cipher=self.cipher(),

eventsourcing/popo.py

@@ -219,7 +219,11 @@ class POPOTrackingRecorder(POPORecorder, TrackingRecorder):
         with self._database_lock:
             return self._max_tracking_ids[application_name]
 
-    def has_tracking_id(self, application_name: str, notification_id: int) -> bool:
+    def has_tracking_id(
+        self, application_name: str, notification_id: int | None
+    ) -> bool:
+        if notification_id is None:
+            return True
         with self._database_lock:
             return notification_id in self._tracking_table[application_name]