python-event-sourcery 0.4.0a2__tar.gz → 0.4.0a4__tar.gz

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/PKG-INFO

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

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/aggregate/aggregate.py

@@ -1,5 +1,6 @@
+from collections.abc import Iterator
 from contextlib import contextmanager
-from typing import ClassVar, Iterator
+from typing import ClassVar
 
 from event_sourcery.event_store import Event
 

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/aggregate/repository.py

@@ -1,5 +1,6 @@
+from collections.abc import Iterator
 from contextlib import contextmanager
-from typing import Generic, Iterator, TypeVar, cast
+from typing import Generic, TypeVar, cast
 
 from event_sourcery.aggregate import Aggregate
 from event_sourcery.event_store import Event, EventStore, Metadata, StreamId, StreamUUID
@@ -48,7 +49,7 @@ class Repository(Generic[TAggregate]):
             if not events:
                 return
 
-            self._event_store.publish(
+            self._event_store.append(
                 *events,
                 stream_id=stream_id,
                 expected_version=old_version,

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/event_store/dispatcher.py

@@ -1,5 +1,5 @@
 from collections import defaultdict
-from typing import Callable, Type
+from collections.abc import Callable
 
 from event_sourcery.event_store.event import (
     Event,
@@ -15,7 +15,7 @@ Listener = Callable[[Metadata, StreamId, Position | None], None]
 
 class Dispatcher:
     def __init__(self, serde: Serde) -> None:
-        self._listeners: dict[Type[Event], set[Listener]] = defaultdict(set)
+        self._listeners: dict[type[Event], set[Listener]] = defaultdict(set)
         self._serde = serde
 
     def dispatch(self, *raws: RecordedRaw) -> None:
@@ -27,9 +27,9 @@ class Dispatcher:
                 for listener in listeners:
                     listener(record.metadata, record.stream_id, record.position)
 
-    def register(self, listener: Listener, to: Type[Event]) -> None:
+    def register(self, listener: Listener, to: type[Event]) -> None:
         self._listeners[to].add(listener)
 
-    def remove(self, listener: Listener, to: Type[Event]) -> None:
+    def remove(self, listener: Listener, to: type[Event]) -> None:
         if listener in self._listeners[to]:
             self._listeners[to].remove(listener)

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/event_store/event/dto.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, ClassVar, Generic, Optional, TypeAlias, TypeVar
+from typing import Any, ClassVar, Generic, TypeAlias, TypeVar
 from uuid import UUID, uuid4
 
 from pydantic import BaseModel, Field
@@ -27,6 +27,14 @@ class RecordedRaw(BaseModel):
 
 
 class Event(BaseModel, extra="forbid"):
+    """Base class for all events.
+
+    Example usage:
+    ```
+    class OrderCancelled(Event):
+        order_id: OrderId
+    ```
+    """
     __registry__: ClassVar = EventRegistry()
 
     def __init_subclass__(cls, **kwargs: Any) -> None:
@@ -42,8 +50,21 @@ class Context(BaseModel, extra="allow"):
 
 
 class Metadata(BaseModel, Generic[TEvent], extra="forbid"):
+    """Wrapper for events with all relevant metadata.
+
+    Returned from EventStore when loading events from a stream.
+
+    Example usage:
+    ```
+    class OrderCancelled(Event):
+        order_id: OrderId
+
+    event = OrderCancelled(order_id=OrderId("#123"))
+    metadata = Metadata.wrap(event, version=1)
+    ```
+    """
     event: TEvent
-    version: Optional[int]
+    version: int | None
     uuid: UUID = Field(default_factory=uuid4)
     created_at: datetime = Field(default_factory=datetime.utcnow)
     context: Context = Field(default_factory=Context)

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/event_store/event/registry.py

@@ -1,5 +1,5 @@
 import inspect
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from event_sourcery.event_store.exceptions import (
     ClassModuleUnavailable,
@@ -10,7 +10,7 @@ if TYPE_CHECKING:
     from event_sourcery.event_store.event.dto import Event
 
 
-def event_name(cls: Type) -> str:
+def event_name(cls: type) -> str:
     event_module = inspect.getmodule(cls)
     if event_module is None:  # pragma: no cover
         raise ClassModuleUnavailable
@@ -18,11 +18,18 @@ def event_name(cls: Type) -> str:
 
 
 class EventRegistry:
+    """Keeps mappings between event types and their names.
+
+    Normally, there is no need to use it directly. If one needs to have multiple
+    registries or wants more granular control, they can pass an instance
+    of EventRegistry to BackendFactory."""
+
     def __init__(self) -> None:
-        self._types_to_names: dict[Type["Event"], str] = {}
-        self._names_to_types: dict[str, Type["Event"]] = {}
+        self._types_to_names: dict[type[Event], str] = {}
+        self._names_to_types: dict[str, type[Event]] = {}
 
-    def add(self, event: Type["Event"]) -> Type["Event"]:
+    def add(self, event: type["Event"]) -> type["Event"]:
+        """Add event subclass to the registry."""
         if event in self._types_to_names:
             raise DuplicatedEvent(f"Duplicated Event detected! {event}")
 
@@ -34,8 +41,8 @@ class EventRegistry:
         self._names_to_types[name] = event
         return event  # for use as a decorator
 
-    def type_for_name(self, name: str) -> Type["Event"]:
+    def type_for_name(self, name: str) -> type["Event"]:
         return self._names_to_types[name]
 
-    def name_for_type(self, event: Type["Event"]) -> str:
+    def name_for_type(self, event: type["Event"]) -> str:
         return self._types_to_names[event]

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/event_store/event/serde.py

@@ -1,5 +1,6 @@
+from collections.abc import Mapping
 from dataclasses import dataclass
-from typing import Mapping, cast
+from typing import cast
 
 from event_sourcery.event_store.event.dto import (
     Event,

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/event_store/event_store.py

@@ -1,5 +1,6 @@
+from collections.abc import Sequence
 from functools import singledispatchmethod
-from typing import Sequence, cast
+from typing import cast
 
 from event_sourcery.event_store.event import Event, Metadata, Position, RawEvent, Serde
 from event_sourcery.event_store.interfaces import StorageStrategy
@@ -12,6 +13,8 @@ from event_sourcery.event_store.versioning import (
 
 
 class EventStore:
+    """API for working with events."""
+
     def __init__(self, storage_strategy: StorageStrategy, serde: Serde) -> None:
         self._storage_strategy = storage_strategy
         self._serde = serde
@@ -22,6 +25,24 @@ class EventStore:
         start: int | None = None,
         stop: int | None = None,
     ) -> Sequence[Metadata]:
+        """Loads events from a given stream.
+
+        Examples:
+            >>> load_stream(stream_id=StreamId(name="not_existing_stream"))
+            []
+            >>> load_stream(stream_id=StreamId(name="existing_stream"))
+            [Metadata(..., version=1), Metadata(...), Metadata(..., version=3)]
+            >>> load_stream(stream_id=StreamId(name="existing_stream"), start=2, stop=3)
+            [Metadata(..., version=2)]
+
+        Args:
+            stream_id: The stream identifier to load events from.
+            start: The stream version to start loading from (including).
+            stop: The stream version to stop loading at (excluding).
+
+        Returns:
+            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)
 
@@ -33,9 +54,29 @@ class EventStore:
         stream_id: StreamId,
         expected_version: int | Versioning = 0,
     ) -> None:
+        """Appends events to a stream with a given ID.
+
+        Implements optimistic locking to ensure stream wasn't modified since last read.
+        To use it, pass the expected version of the stream.
+
+        Examples:
+            >>> append(Metadata(...), stream_id=StreamId())
+            None
+            >>> append(Metadata(...), stream_id=StreamId(), expected_version=1)
+            None
+
+        Args:
+            first: The first event to append (Metadata or Event).
+            *events: The rest of the events to append (same type as first argument).
+            stream_id: The stream identifier to append events to.
+            expected_version: The expected version of the stream
+
+        Returns:
+            None
+        """
         self._append(
             stream_id=stream_id,
-            events=(first,) + events,
+            events=(first, *events),
             expected_version=expected_version,
         )
 
@@ -70,20 +111,6 @@ class EventStore:
     ) -> Sequence[Metadata]:
         return [Metadata.wrap(event=event, version=None) for event in events]
 
-    @singledispatchmethod
-    def publish(
-        self,
-        first: Metadata,
-        *events: Metadata,
-        stream_id: StreamId,
-        expected_version: int | Versioning = 0,
-    ) -> None:
-        self._append(
-            stream_id=stream_id,
-            events=(first,) + events,
-            expected_version=expected_version,
-        )
-
     def _append(
         self,
         stream_id: StreamId,
@@ -107,9 +134,41 @@ class EventStore:
         )
 
     def delete_stream(self, stream_id: StreamId) -> None:
+        """Deletes a stream with a given ID.
+
+        If a stream does not exist, this method does nothing.
+
+        Examples:
+            >>> delete_stream(StreamId())
+            None
+            >>> delete_stream(StreamId(name="not_existing_stream"))
+            None
+
+        Args:
+            stream_id: The stream identifier to delete.
+
+        Returns:
+            None
+        """
         self._storage_strategy.delete_stream(stream_id)
 
     def save_snapshot(self, stream_id: StreamId, snapshot: Metadata) -> None:
+        """Saves a snapshot of the stream.
+
+        Examples:
+            >>> save_snapshot(StreamId(), Metadata(...))
+            None
+            >>> save_snapshot(StreamId(name="not_existing_stream"), Metadata(...))
+            None
+
+        Args:
+            stream_id: The stream identifier to save the snapshot.
+            snapshot: The snapshot to save.
+
+        Returns:
+            None
+        """
+
         serialized = self._serde.serialize(event=snapshot, stream_id=stream_id)
         self._storage_strategy.save_snapshot(serialized)
 
@@ -125,4 +184,13 @@ class EventStore:
 
     @property
     def position(self) -> Position | None:
+        """Returns the current position of the event store.
+
+        Examples:
+            >>> position
+            None  # nothing was saved yet
+            >>> position
+            Position(15)  # Some events were saved
+
+        """
         return self._storage_strategy.current_position

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/event_store/factory.py

@@ -1,5 +1,6 @@
 import abc
-from typing import ContextManager, Iterator
+from collections.abc import Iterator
+from contextlib import AbstractContextManager
 
 from typing_extensions import Self
 
@@ -19,7 +20,9 @@ def no_filter(entry: RawEvent) -> bool:
 
 
 class NoOutboxStorageStrategy(OutboxStorageStrategy):
-    def outbox_entries(self, limit: int) -> Iterator[ContextManager[RecordedRaw]]:
+    def outbox_entries(
+        self, limit: int
+    ) -> Iterator[AbstractContextManager[RecordedRaw]]:
         return iter([])
 
 
@@ -35,6 +38,8 @@ class TransactionalBackend(Backend):
 
 
 class BackendFactory(abc.ABC):
+    """Abstract base class to configure EventStore."""
+
     @abc.abstractmethod
     def build(self) -> Backend:
         pass

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/event_store/in_memory.py

@@ -1,10 +1,10 @@
 import time
-from contextlib import contextmanager
+from collections.abc import Generator, Iterator
+from contextlib import AbstractContextManager, contextmanager
 from copy import copy
 from dataclasses import dataclass, field
 from datetime import timedelta
 from operator import getitem
-from typing import ContextManager, Dict, Generator, Iterator
 
 from pydantic import BaseModel, ConfigDict, PositiveInt
 from typing_extensions import Self
@@ -148,7 +148,9 @@ class InMemoryOutboxStorageStrategy(OutboxStorageStrategy):
     def put_into_outbox(self, records: list[RecordedRaw]) -> None:
         self._outbox.extend([(e, 0) for e in records if self._filterer(e.entry)])
 
-    def outbox_entries(self, limit: int) -> Iterator[ContextManager[RecordedRaw]]:
+    def outbox_entries(
+        self, limit: int
+    ) -> Iterator[AbstractContextManager[RecordedRaw]]:
         for record in self._outbox[:limit]:
             yield self._publish_context(*record)
 
@@ -224,7 +226,7 @@ class InMemoryStorageStrategy(StorageStrategy):
         dispatcher: Dispatcher,
         outbox_strategy: InMemoryOutboxStorageStrategy | None,
     ) -> None:
-        self._names: Dict[str | None, str] = {}
+        self._names: dict[str | None, str] = {}
         self._storage = storage
         self._dispatcher = dispatcher
         self._outbox = outbox_strategy
@@ -296,9 +298,11 @@ class Config(BaseModel):
 
 @dataclass(repr=False)
 class InMemoryBackendFactory(BackendFactory):
+    """Lightweight in-memory backend factory for testing and development."""
+
     serde = Serde(Event.__registry__)
 
-    _config: Config = Config()
+    _config: Config = field(default_factory=Config)
     _storage: Storage = field(default_factory=Storage)
     _outbox_strategy: InMemoryOutboxStorageStrategy | None = None
     _subscription_strategy: InMemorySubscriptionStrategy = field(init=False)

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/event_store/interfaces.py

@@ -1,6 +1,8 @@
 import abc
+from collections.abc import Iterator
+from contextlib import AbstractContextManager
 from datetime import timedelta
-from typing import ContextManager, Iterator, Protocol
+from typing import Protocol
 
 from event_sourcery.event_store.event import Position, RawEvent, RecordedRaw
 from event_sourcery.event_store.stream_id import StreamId
@@ -8,13 +10,14 @@ from event_sourcery.event_store.versioning import Versioning
 
 
 class OutboxFiltererStrategy(Protocol):
-    def __call__(self, entry: RawEvent) -> bool:
-        ...
+    def __call__(self, entry: RawEvent) -> bool: ...
 
 
 class OutboxStorageStrategy(abc.ABC):
     @abc.abstractmethod
-    def outbox_entries(self, limit: int) -> Iterator[ContextManager[RecordedRaw]]:
+    def outbox_entries(
+        self, limit: int
+    ) -> Iterator[AbstractContextManager[RecordedRaw]]:
         pass
 
 

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/event_store/outbox.py

@@ -1,4 +1,4 @@
-from typing import Callable
+from collections.abc import Callable
 
 from event_sourcery.event_store.event import Recorded, Serde
 from event_sourcery.event_store.interfaces import OutboxStorageStrategy

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/event_store/subscription.py

@@ -1,9 +1,10 @@
 import abc
 import sys
+from collections.abc import Callable, Iterator
 from dataclasses import dataclass, field
 from datetime import timedelta
 from functools import partial
-from typing import Callable, Iterator, Type, TypeAlias
+from typing import TypeAlias
 
 from event_sourcery.event_store.event import (
     Event,
@@ -20,32 +21,29 @@ Seconds: TypeAlias = int | float
 
 class BuildPhase(abc.ABC):
     @abc.abstractmethod
-    def build_iter(self, timelimit: Seconds | timedelta) -> Iterator[Recorded | None]:
-        ...
+    def build_iter(
+        self, timelimit: Seconds | timedelta
+    ) -> Iterator[Recorded | None]: ...
 
     @abc.abstractmethod
     def build_batch(
         self,
         size: int,
         timelimit: Seconds | timedelta,
-    ) -> Iterator[list[Recorded]]:
-        ...
+    ) -> Iterator[list[Recorded]]: ...
 
 
 class FilterPhase(BuildPhase):
     @abc.abstractmethod
-    def to_category(self, category: Category) -> BuildPhase:
-        ...
+    def to_category(self, category: Category) -> BuildPhase: ...
 
     @abc.abstractmethod
-    def to_events(self, events: list[Type[Event]]) -> BuildPhase:
-        ...
+    def to_events(self, events: list[type[Event]]) -> BuildPhase: ...
 
 
 class PositionPhase(abc.ABC):
     @abc.abstractmethod
-    def start_from(self, position: Position) -> FilterPhase:
-        ...
+    def start_from(self, position: Position) -> FilterPhase: ...
 
 
 @dataclass(repr=False)
@@ -71,7 +69,7 @@ class SubscriptionBuilder(PositionPhase, FilterPhase, BuildPhase):
         )
         return self
 
-    def to_events(self, events: list[Type[Event]]) -> BuildPhase:
+    def to_events(self, events: list[type[Event]]) -> BuildPhase:
         self._build = partial(
             self._strategy.subscribe_to_events,
             start_from=self._position,

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery/read_model/projector.py

@@ -1,4 +1,5 @@
-from typing import Callable, TypeAlias
+from collections.abc import Callable
+from typing import TypeAlias
 
 from event_sourcery.event_store import Event, EventStore, Metadata, StreamId
 from event_sourcery.read_model.cursors_dao import CursorsDao

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_esdb/__init__.py

@@ -45,8 +45,10 @@ class Config(BaseModel):
 class ESDBBackendFactory(BackendFactory):
     esdb_client: EventStoreDBClient
     config: Config = field(default_factory=Config)
-    _serde: Serde = Serde(Event.__registry__)
-    _outbox_strategy: OutboxStorageStrategy = NoOutboxStorageStrategy()
+    _serde: Serde = field(default_factory=lambda: Serde(Event.__registry__))
+    _outbox_strategy: OutboxStorageStrategy = field(
+        default_factory=NoOutboxStorageStrategy
+    )
 
     def build(self) -> Backend:
         backend = Backend()

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_esdb/event_store.py

@@ -42,7 +42,7 @@ class ESDBStorageStrategy(StorageStrategy):
         try:
             events = [dto.raw_event(entry) for entry in entries]
             if snapshot:
-                return [snapshot] + events
+                return [snapshot, *events]
             return events
         except NotFound:
             return []
@@ -63,14 +63,13 @@ class ESDBStorageStrategy(StorageStrategy):
     def insert_events(
         self, stream_id: StreamId, versioning: Versioning, events: list[RawEvent]
     ) -> None:
-        self._ensure_stream(stream_id=stream_id, versioning=versioning)
-        for stream_id in {e.stream_id for e in events}:
-            stream_name = stream.Name(stream_id)
-            stream_events = [e for e in events if e.stream_id == stream_id]
+        for sid in {e.stream_id for e in events}:
+            self._ensure_stream(stream_id=sid, versioning=versioning)
+            stream_name = stream.Name(sid)
+            stream_events = [e for e in events if e.stream_id == sid]
             self._append_events(stream_name, events=stream_events)
 
     def _append_events(self, name: stream.Name, events: list[RawEvent]) -> int:
-        assert all(e.stream_id == name.uuid for e in events)
         return self._client.append_events(
             str(name),
             current_version=StreamState.ANY,

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_esdb/outbox.py

@@ -1,8 +1,8 @@
 import logging
-from contextlib import contextmanager
-from dataclasses import dataclass
+from collections.abc import Generator, Iterator
+from contextlib import AbstractContextManager, contextmanager
+from dataclasses import dataclass, field
 from itertools import islice
-from typing import ContextManager, Generator, Iterator
 
 from esdbclient import EventStoreDBClient, RecordedEvent
 from esdbclient.exceptions import DeadlineExceeded, NotFound
@@ -25,7 +25,7 @@ class ESDBOutboxStorageStrategy(OutboxStorageStrategy):
     _outbox_name: str
     _max_publish_attempts: int
     _timeout: float | None
-    _active_subscription: PersistentSubscription | None = None
+    _active_subscription: PersistentSubscription = field(init=False)
 
     def create_subscription(self) -> None:
         try:
@@ -48,14 +48,15 @@ class ESDBOutboxStorageStrategy(OutboxStorageStrategy):
         )
         yield islice(self._active_subscription, limit or 100)
         self._active_subscription.stop()
-        self._active_subscription = None
+        delattr(self, "_active_subscription")
 
     @property
     def active_subscription(self) -> PersistentSubscription:
-        assert self._active_subscription is not None
         return self._active_subscription
 
-    def outbox_entries(self, limit: int) -> Iterator[ContextManager[RecordedRaw]]:
+    def outbox_entries(
+        self, limit: int
+    ) -> Iterator[AbstractContextManager[RecordedRaw]]:
         info = self._client.get_subscription_info(
             self._outbox_name,
             timeout=self._timeout,

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_esdb/stream.py

@@ -1,6 +1,6 @@
 import sys
 from collections import UserString
-from typing import Tuple, cast
+from typing import cast
 
 from event_sourcery.event_store import StreamId
 from event_sourcery.event_store.exceptions import IllegalCategoryName
@@ -57,7 +57,7 @@ MAX_POSITION = Position(sys.maxsize)
 def scope(
     start_version: int | None,
     stop_version: int | None,
-) -> Tuple[Position | None, int]:
+) -> tuple[Position | None, int]:
     start = cast(
         Position | None, start_version and Position.from_version(start_version)
     )

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_esdb/subscription.py

@@ -1,7 +1,7 @@
+from collections.abc import Callable, Iterator
 from dataclasses import dataclass
 from datetime import timedelta
 from functools import partial
-from typing import Callable, Iterator
 
 import esdbclient.exceptions
 from esdbclient import EventStoreDBClient, RecordedEvent

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_sqlalchemy/__init__.py

@@ -6,7 +6,7 @@ __all__ = [
     "SQLAlchemyBackendFactory",
 ]
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from datetime import timedelta
 
 from pydantic import BaseModel, ConfigDict, PositiveInt
@@ -43,8 +43,8 @@ class Config(BaseModel):
 @dataclass(repr=False)
 class SQLAlchemyBackendFactory(BackendFactory):
     _session: Session
-    _config: Config = Config()
-    _serde: Serde = Serde(Event.__registry__)
+    _config: Config = field(default_factory=Config)
+    _serde: Serde = field(default_factory=lambda: Serde(Event.__registry__))
     _outbox_strategy: SqlAlchemyOutboxStorageStrategy | None = None
 
     def build(self) -> TransactionalBackend:

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_sqlalchemy/event_store.py

@@ -1,5 +1,6 @@
+from collections.abc import Sequence
 from dataclasses import dataclass
-from typing import Sequence, Union, cast
+from typing import cast
 
 from more_itertools import first_true
 from sqlalchemy import delete, func, select, update
@@ -51,7 +52,7 @@ class SqlAlchemyStorageStrategy(StorageStrategy):
         if stop is not None:
             events_stmt = events_stmt.filter(EventModel.version < stop)
 
-        events: Sequence[Union[EventModel, SnapshotModel]]
+        events: Sequence[EventModel | SnapshotModel]
         try:
             snapshot_stmt = (
                 select(SnapshotModel)
@@ -74,7 +75,7 @@ class SqlAlchemyStorageStrategy(StorageStrategy):
                 EventModel.version > latest_snapshot.version
             )
             newer_events = list(self._session.execute(events_stmt).scalars().all())
-            events = [latest_snapshot] + newer_events  # type: ignore
+            events = [latest_snapshot, *newer_events]
 
         if not events:
             return []
@@ -185,7 +186,8 @@ class SqlAlchemyStorageStrategy(StorageStrategy):
         stream.events.extend(entries)
         self._session.flush()
         records = [
-            RecordedRaw(entry=raw, position=db.id) for raw, db in zip(events, entries)
+            RecordedRaw(entry=raw, position=db.id)
+            for raw, db in zip(events, entries, strict=False)
         ]
         if self._outbox:
             self._outbox.put_into_outbox(records)

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_sqlalchemy/guid.py

@@ -1,5 +1,5 @@
 import uuid
-from typing import Any, Optional
+from typing import Any
 
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.types import CHAR, TypeDecorator
@@ -24,17 +24,16 @@ class GUID(TypeDecorator):
         else:
             return dialect.type_descriptor(CHAR(32))
 
-    def process_bind_param(self, value: Any, dialect: Any) -> Optional[str]:
+    def process_bind_param(self, value: Any, dialect: Any) -> str | None:
         if dialect.name == "postgresql":
             return str(value)
+        elif not isinstance(value, uuid.UUID):  # pragma: no cover
+            return uuid.UUID(value).hex
         else:
-            if not isinstance(value, uuid.UUID):  # pragma: no cover
-                return "%.32x" % uuid.UUID(value).int
-            else:
-                # hexstring
-                return "%.32x" % value.int
+            # hexstring
+            return value.hex
 
-    def process_result_value(self, value: Any, dialect: Any) -> Optional[uuid.UUID]:
+    def process_result_value(self, value: Any, dialect: Any) -> uuid.UUID | None:
         if isinstance(value, uuid.UUID):
             return value
         else:

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_sqlalchemy/jsonb.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, Optional
+from typing import Any
 
 from sqlalchemy.dialects.postgresql import JSONB as POSTGRES_JSONB
 from sqlalchemy.types import Text, TypeDecorator
@@ -14,13 +14,13 @@ class JSONB(TypeDecorator):
         else:
             return dialect.type_descriptor(Text())
 
-    def process_bind_param(self, value: Any, dialect: Any) -> Optional[Any]:
+    def process_bind_param(self, value: Any, dialect: Any) -> Any | None:
         if dialect.name == "postgresql":
             return value
         else:
             return json.dumps(value)
 
-    def process_result_value(self, value: Any, dialect: Any) -> Optional[Any]:
+    def process_result_value(self, value: Any, dialect: Any) -> Any | None:
         if dialect.name == "postgresql":
             return value
         else:

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_sqlalchemy/models.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Type, cast
+from typing import Any, cast
 from uuid import UUID
 
 from sqlalchemy import (
@@ -30,7 +30,7 @@ from event_sourcery_sqlalchemy.guid import GUID
 from event_sourcery_sqlalchemy.jsonb import JSONB
 
 
-def configure_models(base: Type) -> None:
+def configure_models(base: type[Any]) -> None:
     for model_cls in (Stream, Event, Snapshot, OutboxEntry, ProjectorCursor):
         registry(metadata=base.metadata, class_registry={}).map_declaratively(model_cls)
 

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_sqlalchemy/outbox.py

@@ -1,8 +1,9 @@
 import logging
-from contextlib import contextmanager
+from collections.abc import Generator, Iterator
+from contextlib import AbstractContextManager, contextmanager
 from dataclasses import dataclass
 from datetime import datetime
-from typing import ContextManager, Generator, Iterator, cast
+from typing import cast
 from uuid import UUID
 
 from sqlalchemy import insert, select
@@ -50,7 +51,9 @@ class SqlAlchemyOutboxStorageStrategy(OutboxStorageStrategy):
 
         self._session.execute(insert(OutboxEntry), rows)
 
-    def outbox_entries(self, limit: int) -> Iterator[ContextManager[RecordedRaw]]:
+    def outbox_entries(
+        self, limit: int
+    ) -> Iterator[AbstractContextManager[RecordedRaw]]:
         stmt = (
             select(OutboxEntry)
             .filter(OutboxEntry.tries_left > 0)

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/event_sourcery_sqlalchemy/subscription.py

@@ -1,7 +1,8 @@
 import time
+from collections.abc import Iterator
 from dataclasses import dataclass
 from datetime import timedelta
-from typing import Iterator, Protocol, cast
+from typing import Protocol, cast
 
 from sqlalchemy import select
 from sqlalchemy.orm import Session
@@ -62,8 +63,7 @@ class SqlAlchemySubscriptionStrategy(SubscriptionStrategy):
 
 
 class GetBatch(Protocol):
-    def __call__(self, position: Position) -> list[models.Event]:
-        ...
+    def __call__(self, position: Position) -> list[models.Event]: ...
 
 
 class GetBatchToAll(GetBatch):

{python_event_sourcery-0.4.0a2 → python_event_sourcery-0.4.0a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-event-sourcery"
-version = "0.4.0a2"
+version = "0.4.0a4"
 description = ""
 authors = ["Your Name <you@example.com>"]
 license = "MIT"
@@ -19,17 +19,14 @@ esdbclient = {version = ">=1.0b3", optional = true}
 django = {version = ">=4,<6", optional = true}
 
 [tool.poetry.group.dev.dependencies]
-black = "*"
-isort = "*"
-flake8 = "*"
-bandit = "*"
+ruff = "*"
 mypy = "*"
 pytest = "*"
 pytest-cov = "*"
+pytest-django = {version = "*"}
 mkdocs-material = "^8.3.9"
 psycopg2-binary = "^2.9.3"
-pytest-django = {version = "*"}
-flake8-pyproject = "*"
+mkdocstrings = {version = "*", extras = ["python"]}
 
 [tool.poetry.extras]
 sqlalchemy = ["SQLAlchemy"]
@@ -82,11 +79,44 @@ warn_return_any = true
 warn_unused_ignores = true
 show_error_codes = true
 
-[tool.flake8]
-max-line-length = 88
+[tool.ruff]
+line-length = 88
+target-version = "py310"
+show-fixes = true
+exclude = ["**/migrations"]
+
+[tool.ruff.lint]
+select = [
+    "A",  # flake8-builtins
+    "B",  # flake8-bugbear
+    "C",  # Convention
+    "E",  # Error
+    "F",  # Pyflakes
+    "G",  # flake8-logging-format
+    "I",  # isort
+    "N",  # pep8-naming
+    "Q",  # flake8-quotes
+    "S",  # flake8-bandit
+    "W",  # Warning
+    "PL",  # Pylint
+    "UP",  # pyupgrade
+    "RUF",  # Ruff-specific rules
+]
+ignore = [
+    "N818",  # error-suffix-on-exception-name
+    "PLR2004",  # magic-value-comparison
+]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = [
+    "S101",  # Use of assert detected
+]
+"event_sourcery_django/models.py" = [
+    "RUF012",  # Mutable class attributes should be annotated with typing.ClassVar
+]
 
-[tool.isort]
-profile = "black"
+[tool.ruff.lint.pylint]
+max-args = 10
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]