python-event-sourcery 0.4.0a15__tar.gz → 0.4.0a17__tar.gz

{python_event_sourcery-0.4.0a15 → python_event_sourcery-0.4.0a17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-event-sourcery
-Version: 0.4.0a15
+Version: 0.4.0a17
 Summary: 
 License: MIT
 Author: Your Name
@@ -13,11 +13,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: django
-Provides-Extra: esdb
+Provides-Extra: kurrentdb
 Provides-Extra: sqlalchemy
 Requires-Dist: SQLAlchemy (>=2.0) ; extra == "sqlalchemy"
 Requires-Dist: django (>=4,<6) ; extra == "django"
-Requires-Dist: esdbclient (>=1.0b3) ; extra == "esdb"
+Requires-Dist: kurrentdbclient (>=1.0.6) ; extra == "kurrentdb"
 Requires-Dist: more-itertools
 Requires-Dist: psycopg2-binary (>2,<3)
 Requires-Dist: pydantic (>=2.0,<3)

python_event_sourcery-0.4.0a17/event_sourcery/event_sourcing/__init__.py

@@ -0,0 +1,7 @@
+__all__ = [
+    "Aggregate",
+    "Repository",
+]
+
+from event_sourcery.event_sourcing.aggregate import Aggregate
+from event_sourcery.event_sourcing.repository import Repository

{python_event_sourcery-0.4.0a15/event_sourcery/aggregate → python_event_sourcery-0.4.0a17/event_sourcery/event_sourcing}/repository.py

@@ -2,7 +2,7 @@ from collections.abc import Iterator
 from contextlib import contextmanager
 from typing import Generic, TypeVar, cast
 
-from event_sourcery.aggregate import Aggregate
+from event_sourcery.event_sourcing import Aggregate
 from event_sourcery.event_store import (
     Event,
     EventStore,

{python_event_sourcery-0.4.0a15 → python_event_sourcery-0.4.0a17}/event_sourcery/event_store/event/_registry.py

@@ -67,7 +67,9 @@ class EventRegistry:
 
     def _register_defined_events(self) -> None:
         for event_type in Event.__subclasses__():
-            event_type not in self._types_to_names and self.add(event_type)
+            not_registered_type = event_type not in self._types_to_names
+            not_registered_name = event_name(event_type) not in self._names_to_types
+            not_registered_type and not_registered_name and self.add(event_type)
 
     def add(self, event: type[TEvent]) -> type[TEvent]:
         """Add event subclass to the registry."""

{python_event_sourcery-0.4.0a15/event_sourcery_esdb → python_event_sourcery-0.4.0a17/event_sourcery_kurrentdb}/__init__.py

@@ -1,13 +1,13 @@
 __all__ = [
     "Config",
-    "ESDBBackendFactory",
-    "ESDBStorageStrategy",
+    "KurrentDBBackendFactory",
+    "KurrentDBStorageStrategy",
 ]
 
 from dataclasses import dataclass, field
 from typing import TypeAlias
 
-from esdbclient import EventStoreDBClient
+from kurrentdbclient import KurrentDBClient
 from pydantic import BaseModel, ConfigDict, PositiveFloat, PositiveInt
 from typing_extensions import Self
 
@@ -27,9 +27,9 @@ from event_sourcery.event_store.interfaces import (
     OutboxStorageStrategy,
 )
 from event_sourcery.event_store.outbox import Outbox
-from event_sourcery_esdb.event_store import ESDBStorageStrategy
-from event_sourcery_esdb.outbox import ESDBOutboxStorageStrategy
-from event_sourcery_esdb.subscription import ESDBSubscriptionStrategy
+from event_sourcery_kurrentdb.event_store import KurrentDBStorageStrategy
+from event_sourcery_kurrentdb.outbox import KurrentDBOutboxStorageStrategy
+from event_sourcery_kurrentdb.subscription import KurrentDBSubscriptionStrategy
 
 Seconds: TypeAlias = PositiveFloat
 
@@ -43,8 +43,8 @@ class Config(BaseModel):
 
 
 @dataclass(repr=False)
-class ESDBBackendFactory(BackendFactory):
-    esdb_client: EventStoreDBClient
+class KurrentDBBackendFactory(BackendFactory):
+    kurrentdb_client: KurrentDBClient
     config: Config = field(default_factory=Config)
     _serde: Serde = field(default_factory=lambda: Serde(EventRegistry()))
     _outbox_strategy: OutboxStorageStrategy = field(
@@ -54,8 +54,8 @@ class ESDBBackendFactory(BackendFactory):
     def build(self) -> Backend:
         backend = Backend()
         backend.event_store = EventStore(
-            storage_strategy=ESDBStorageStrategy(
-                self.esdb_client,
+            storage_strategy=KurrentDBStorageStrategy(
+                self.kurrentdb_client,
                 self.config.timeout,
             ),
             serde=self._serde,
@@ -63,7 +63,7 @@ class ESDBBackendFactory(BackendFactory):
         backend.outbox = Outbox(self._outbox_strategy, self._serde)
         backend.subscriber = es.subscription.SubscriptionBuilder(
             _serde=self._serde,
-            _strategy=ESDBSubscriptionStrategy(self.esdb_client),
+            _strategy=KurrentDBSubscriptionStrategy(self.kurrentdb_client),
         )
         backend.serde = self._serde
         return backend
@@ -73,8 +73,8 @@ class ESDBBackendFactory(BackendFactory):
         return self
 
     def with_outbox(self, filterer: OutboxFiltererStrategy = no_filter) -> Self:
-        strategy = ESDBOutboxStorageStrategy(
-            self.esdb_client,
+        strategy = KurrentDBOutboxStorageStrategy(
+            self.kurrentdb_client,
             filterer,
             self.config.outbox_name,
             self.config.outbox_attempts,

{python_event_sourcery-0.4.0a15/event_sourcery_esdb → python_event_sourcery-0.4.0a17/event_sourcery_kurrentdb}/dto.py

@@ -2,10 +2,10 @@ import json
 from datetime import datetime
 from typing import Any, Literal, cast
 
-from esdbclient import NewEvent, RecordedEvent
+from kurrentdbclient import NewEvent, RecordedEvent
 
 from event_sourcery.event_store import Position, RawEvent, RecordedRaw
-from event_sourcery_esdb import stream
+from event_sourcery_kurrentdb import stream
 
 ES_PREFIX = "$es-"
 

{python_event_sourcery-0.4.0a15/event_sourcery_esdb → python_event_sourcery-0.4.0a17/event_sourcery_kurrentdb}/event_store.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass, replace
 from typing import cast
 
-from esdbclient import EventStoreDBClient, StreamState
-from esdbclient.exceptions import NotFound
+from kurrentdbclient import KurrentDBClient, StreamState
+from kurrentdbclient.exceptions import NotFoundError
 from typing_extensions import Self
 
 from event_sourcery.event_store import (
@@ -16,12 +16,12 @@ from event_sourcery.event_store import (
 from event_sourcery.event_store.exceptions import ConcurrentStreamWriteError
 from event_sourcery.event_store.interfaces import StorageStrategy
 from event_sourcery.event_store.tenant_id import DEFAULT_TENANT
-from event_sourcery_esdb import dto, stream
+from event_sourcery_kurrentdb import dto, stream
 
 
 @dataclass(repr=False)
-class ESDBStorageStrategy(StorageStrategy):
-    _client: EventStoreDBClient
+class KurrentDBStorageStrategy(StorageStrategy):
+    _client: KurrentDBClient
     _timeout: float | None
     _tenant_id: TenantId = DEFAULT_TENANT
 
@@ -48,7 +48,7 @@ class ESDBStorageStrategy(StorageStrategy):
             if snapshot:
                 return [snapshot, *events]
             return events
-        except NotFound:
+        except NotFoundError:
             return []
 
     def _read_snapshot(self, name: stream.Name) -> RawEvent | None:
@@ -61,7 +61,7 @@ class ESDBStorageStrategy(StorageStrategy):
         try:
             last = next(iter(snapshots))
             return dto.snapshot(last)
-        except NotFound:
+        except NotFoundError:
             return None
 
     def insert_events(
@@ -115,7 +115,7 @@ class ESDBStorageStrategy(StorageStrategy):
                 )
             )
             return stream.Position(last.stream_position)
-        except NotFound:
+        except NotFoundError:
             return None
 
     def delete_stream(self, stream_id: StreamId) -> None:
@@ -126,7 +126,7 @@ class ESDBStorageStrategy(StorageStrategy):
                 current_version=StreamState.ANY,
                 timeout=self._timeout,
             )
-        except NotFound:
+        except NotFoundError:
             pass
 
     @property

{python_event_sourcery-0.4.0a15/event_sourcery_esdb → python_event_sourcery-0.4.0a17/event_sourcery_kurrentdb}/outbox.py

@@ -4,23 +4,23 @@ from contextlib import AbstractContextManager, contextmanager
 from dataclasses import dataclass, field
 from itertools import islice
 
-from esdbclient import EventStoreDBClient, RecordedEvent
-from esdbclient.exceptions import DeadlineExceeded, NotFound
-from esdbclient.persistent import AbstractPersistentSubscription
+from kurrentdbclient import KurrentDBClient, RecordedEvent
+from kurrentdbclient.exceptions import DeadlineExceededError, NotFoundError
+from kurrentdbclient.persistent import AbstractPersistentSubscription
 
 from event_sourcery.event_store import RecordedRaw
 from event_sourcery.event_store.interfaces import (
     OutboxFiltererStrategy,
     OutboxStorageStrategy,
 )
-from event_sourcery_esdb import dto
+from event_sourcery_kurrentdb import dto
 
 logger = logging.getLogger(__name__)
 
 
 @dataclass(repr=False)
-class ESDBOutboxStorageStrategy(OutboxStorageStrategy):
-    _client: EventStoreDBClient
+class KurrentDBOutboxStorageStrategy(OutboxStorageStrategy):
+    _client: KurrentDBClient
     _filterer: OutboxFiltererStrategy
     _outbox_name: str
     _max_publish_attempts: int
@@ -30,7 +30,7 @@ class ESDBOutboxStorageStrategy(OutboxStorageStrategy):
     def create_subscription(self) -> None:
         try:
             self._client.get_subscription_info(self._outbox_name, timeout=self._timeout)
-        except NotFound:
+        except NotFoundError:
             self._client.create_subscription_to_all(
                 self._outbox_name,
                 from_end=True,
@@ -70,7 +70,7 @@ class ESDBOutboxStorageStrategy(OutboxStorageStrategy):
                     record = dto.raw_record(entry)
                     if self._filterer(record.entry):
                         yield self._publish_context(entry, record)
-            except DeadlineExceeded:
+            except DeadlineExceededError:
                 pass
 
     @contextmanager

{python_event_sourcery-0.4.0a15/event_sourcery_esdb → python_event_sourcery-0.4.0a17/event_sourcery_kurrentdb}/stream.py

@@ -14,7 +14,7 @@ class Name(UserString):
 
     def __init__(self, tenant_id: TenantId, stream_id: StreamId) -> None:
         if "-" in tenant_id:
-            raise IllegalTenantId("ESDB can't handle tenant id with '-'")
+            raise IllegalTenantId("KurrentDB can't handle tenant id with '-'")
         self.tenant_id = tenant_id
         self.uuid = stream_id
         super().__init__(self._as_string(self.uuid))
@@ -29,7 +29,9 @@ class Name(UserString):
 
     def _as_string(self, stream_id: StreamId) -> str:
         if stream_id.category and "-" in stream_id.category:
-            raise IllegalCategoryName("ESDB storage can't handle category with '-'")
+            raise IllegalCategoryName(
+                "KurrentDB storage can't handle category with '-'"
+            )
         return f"{stream_id.category or ''}-{self.tenant_id}-{stream_id.hex}"
 
     @property

{python_event_sourcery-0.4.0a15/event_sourcery_esdb → python_event_sourcery-0.4.0a17/event_sourcery_kurrentdb}/subscription.py

@@ -4,12 +4,12 @@ from datetime import timedelta
 from functools import partial
 from typing import Protocol
 
-import esdbclient.exceptions
-from esdbclient import EventStoreDBClient, RecordedEvent
+import kurrentdbclient.exceptions
+from kurrentdbclient import KurrentDBClient, RecordedEvent
 
 from event_sourcery.event_store import Position, RecordedRaw
 from event_sourcery.event_store.interfaces import SubscriptionStrategy
-from event_sourcery_esdb import dto
+from event_sourcery_kurrentdb import dto
 
 
 class BuilderCallable(Protocol):
@@ -19,8 +19,8 @@ class BuilderCallable(Protocol):
 
 
 @dataclass(repr=False)
-class ESDBSubscriptionStrategy(SubscriptionStrategy):
-    _client: EventStoreDBClient
+class KurrentDBSubscriptionStrategy(SubscriptionStrategy):
+    _client: KurrentDBClient
 
     @staticmethod
     def _iterator(
@@ -37,7 +37,7 @@ class ESDBSubscriptionStrategy(SubscriptionStrategy):
                 if len(batch) == size:
                     yield batch
                     batch = []
-            except esdbclient.exceptions.DeadlineExceeded:
+            except kurrentdbclient.exceptions.DeadlineExceededError:
                 yield batch
                 batch = []
                 subscription = builder()

{python_event_sourcery-0.4.0a15 → python_event_sourcery-0.4.0a17}/pyproject.toml

@@ -3,14 +3,14 @@ name = "python-event-sourcery"
 requires-python = ">=3.10"
 
 [tool.poetry]
-version = "0.4.0a15"
+version = "0.4.0a17"
 description = ""
 authors = ["Your Name <you@example.com>"]
 license = "MIT"
 packages = [
     { include = "event_sourcery" },
     { include = "event_sourcery_django" },
-    { include = "event_sourcery_esdb" },
+    { include = "event_sourcery_kurrentdb" },
     { include = "event_sourcery_sqlalchemy" },
 ]
 
@@ -19,7 +19,7 @@ python = ">=3.10,<4.0"
 pydantic = ">=2.0,<3"
 more-itertools = "*"
 SQLAlchemy = {version = ">=2.0", optional = true}
-esdbclient = {version = ">=1.0b3", optional = true}
+kurrentdbclient = {version = ">=1.0.6", optional = true}
 django = {version = ">=4,<6", optional = true}
 psycopg2-binary = ">2,<3"
 
@@ -39,7 +39,7 @@ deepdiff = "*"
 
 [tool.poetry.extras]
 sqlalchemy = ["SQLAlchemy"]
-esdb = ["esdbclient"]
+kurrentdb = ["kurrentdbclient"]
 django = ["django"]
 
 [tool.pytest]
@@ -57,7 +57,7 @@ branch = true
 source = [
     "event_sourcery",
     "event_sourcery_django",
-    "event_sourcery_esdb",
+    "event_sourcery_kurrentdb",
     "event_sourcery_sqlalchemy",
 ]
 omit = [

python_event_sourcery-0.4.0a15/event_sourcery/aggregate/__init__.py

@@ -1,7 +0,0 @@
-__all__ = [
-    "Aggregate",
-    "Repository",
-]
-
-from event_sourcery.aggregate.aggregate import Aggregate
-from event_sourcery.aggregate.repository import Repository