python-event-sourcery 0.4.0a5__tar.gz → 0.4.0a7__tar.gz

{python_event_sourcery-0.4.0a5 → python_event_sourcery-0.4.0a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-event-sourcery
-Version: 0.4.0a5
+Version: 0.4.0a7
 Summary: 
 License: MIT
 Author: Your Name

{python_event_sourcery-0.4.0a5 → python_event_sourcery-0.4.0a7}/event_sourcery/event_store/event/serde.py

@@ -1,4 +1,4 @@
-from collections.abc import Mapping
+from collections.abc import Mapping, Sequence
 from dataclasses import dataclass
 from typing import cast
 
@@ -28,6 +28,9 @@ class Serde:
             event=event_type(**data),
         )
 
+    def deserialize_many(self, events: Sequence[RawEvent]) -> list[WrappedEvent]:
+        return [self.deserialize(event) for event in events]
+
     def deserialize_record(self, record: RecordedRaw) -> Recorded:
         return Recorded(
             wrapped_event=self.deserialize(record.entry),
@@ -50,3 +53,8 @@ class Serde:
             data=model.model_dump(mode="json"),
             context=event.context.model_dump(mode="json"),
         )
+
+    def serialize_many(
+        self, events: Sequence[WrappedEvent], stream_id: StreamId
+    ) -> list[RawEvent]:
+        return [self.serialize(event, stream_id) for event in events]

{python_event_sourcery-0.4.0a5 → python_event_sourcery-0.4.0a7}/event_sourcery/event_store/event_store.py

@@ -5,7 +5,6 @@ from typing import cast
 from event_sourcery.event_store.event import (
     Event,
     Position,
-    RawEvent,
     Serde,
     WrappedEvent,
 )
@@ -50,7 +49,7 @@ class EventStore:
             A sequence of events or empty list if the stream doesn't exist.
         """
         events = self._storage_strategy.fetch_events(stream_id, start=start, stop=stop)
-        return self._deserialize_events(events)
+        return self._serde.deserialize_many(events)
 
     @singledispatchmethod
     def append(
@@ -136,7 +135,7 @@ class EventStore:
         self._storage_strategy.insert_events(
             stream_id=stream_id,
             versioning=versioning,
-            events=self._serialize_events(events, stream_id),
+            events=self._serde.serialize_many(events, stream_id),
         )
 
     def delete_stream(self, stream_id: StreamId) -> None:
@@ -178,16 +177,6 @@ class EventStore:
         serialized = self._serde.serialize(event=snapshot, stream_id=stream_id)
         self._storage_strategy.save_snapshot(serialized)
 
-    def _deserialize_events(self, events: list[RawEvent]) -> list[WrappedEvent]:
-        return [self._serde.deserialize(e) for e in events]
-
-    def _serialize_events(
-        self,
-        events: Sequence[WrappedEvent],
-        stream_id: StreamId,
-    ) -> list[RawEvent]:
-        return [self._serde.serialize(event=e, stream_id=stream_id) for e in events]
-
     @property
     def position(self) -> Position | None:
         """Returns the current position of the event store.

{python_event_sourcery-0.4.0a5 → python_event_sourcery-0.4.0a7}/event_sourcery/event_store/subscription.py

@@ -110,6 +110,6 @@ class SubscriptionBuilder(PositionPhase, FilterPhase, BuildPhase):
     ) -> Iterator[list[Recorded]]:
         seconds = self._to_timedelta(timelimit)
         subscription = self._build(batch_size=size, timelimit=seconds)
-        return (
+        return (  # pragma: no cover  # apparently, bug in coverage.py
             [self._serde.deserialize_record(e) for e in batch] for batch in subscription
         )

{python_event_sourcery-0.4.0a5 → python_event_sourcery-0.4.0a7}/event_sourcery_esdb/outbox.py

@@ -6,7 +6,7 @@ from itertools import islice
 
 from esdbclient import EventStoreDBClient, RecordedEvent
 from esdbclient.exceptions import DeadlineExceeded, NotFound
-from esdbclient.persistent import PersistentSubscription
+from esdbclient.persistent import AbstractPersistentSubscription
 
 from event_sourcery.event_store import RecordedRaw
 from event_sourcery.event_store.interfaces import (
@@ -25,7 +25,7 @@ class ESDBOutboxStorageStrategy(OutboxStorageStrategy):
     _outbox_name: str
     _max_publish_attempts: int
     _timeout: float | None
-    _active_subscription: PersistentSubscription = field(init=False)
+    _active_subscription: AbstractPersistentSubscription = field(init=False)
 
     def create_subscription(self) -> None:
         try:
@@ -51,7 +51,7 @@ class ESDBOutboxStorageStrategy(OutboxStorageStrategy):
         delattr(self, "_active_subscription")
 
     @property
-    def active_subscription(self) -> PersistentSubscription:
+    def active_subscription(self) -> AbstractPersistentSubscription:
         return self._active_subscription
 
     def outbox_entries(

{python_event_sourcery-0.4.0a5 → python_event_sourcery-0.4.0a7}/event_sourcery_esdb/subscription.py

@@ -1,7 +1,8 @@
-from collections.abc import Callable, Iterator
+from collections.abc import Iterator
 from dataclasses import dataclass
 from datetime import timedelta
 from functools import partial
+from typing import Protocol
 
 import esdbclient.exceptions
 from esdbclient import EventStoreDBClient, RecordedEvent
@@ -11,13 +12,19 @@ from event_sourcery.event_store.interfaces import SubscriptionStrategy
 from event_sourcery_esdb import dto
 
 
+class BuilderCallable(Protocol):
+    def __call__(
+        self, commit_position: Position | None = None
+    ) -> Iterator[RecordedEvent]: ...
+
+
 @dataclass(repr=False)
 class ESDBSubscriptionStrategy(SubscriptionStrategy):
     _client: EventStoreDBClient
 
     @staticmethod
     def _iterator(
-        builder: Callable[[], Iterator[RecordedEvent]],
+        builder: BuilderCallable,
         size: int,
     ) -> Iterator[list[RecordedRaw]]:
         subscription = builder()

{python_event_sourcery-0.4.0a5 → python_event_sourcery-0.4.0a7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-event-sourcery"
-version = "0.4.0a5"
+version = "0.4.0a7"
 description = ""
 authors = ["Your Name <you@example.com>"]
 license = "MIT"