python-event-sourcery 0.4.0a10__tar.gz → 0.4.0a13__tar.gz

{python_event_sourcery-0.4.0a10 → python_event_sourcery-0.4.0a13}/PKG-INFO

@@ -1,16 +1,17 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: python-event-sourcery
-Version: 0.4.0a10
+Version: 0.4.0a13
 Summary: 
 License: MIT
 Author: Your Name
 Author-email: you@example.com
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.10
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 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: sqlalchemy

{python_event_sourcery-0.4.0a10 → python_event_sourcery-0.4.0a13}/event_sourcery/event_store/__init__.py

@@ -4,6 +4,7 @@ __all__ = [
     "Dispatcher",
     "Entry",
     "Event",
+    "Context",
     "EventRegistry",
     "EventStore",
     "ExplicitVersioning",
@@ -29,6 +30,7 @@ __all__ = [
 from event_sourcery.event_store import exceptions, factory, interfaces, subscription
 from event_sourcery.event_store.dispatcher import Dispatcher, Listener
 from event_sourcery.event_store.event import (
+    Context,
     Entry,
     Event,
     EventRegistry,

{python_event_sourcery-0.4.0a10 → python_event_sourcery-0.4.0a13}/event_sourcery/event_store/event/dto.py

@@ -1,27 +1,30 @@
-from datetime import datetime
+import dataclasses
+from datetime import datetime, timezone
 from typing import Any, ClassVar, Generic, TypeAlias, TypeVar
 from uuid import UUID, uuid4
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 
 from event_sourcery.event_store.event.registry import EventRegistry
 from event_sourcery.event_store.stream_id import StreamId
 from event_sourcery.event_store.tenant_id import DEFAULT_TENANT, TenantId
 
 
+@dataclasses.dataclass(frozen=True)
 class RawEvent(BaseModel):
     uuid: UUID
     stream_id: StreamId
     created_at: datetime
-    version: int | None = None
     name: str
     data: dict
     context: dict
+    version: int | None = None
 
 
 Position: TypeAlias = int
 
 
+@dataclasses.dataclass(frozen=True)
 class RecordedRaw(BaseModel):
     entry: RawEvent
     position: Position
@@ -52,7 +55,8 @@ class Context(BaseModel, extra="allow"):
     causation_id: UUID | None = None
 
 
-class WrappedEvent(BaseModel, Generic[TEvent], extra="forbid"):
+@dataclasses.dataclass()
+class WrappedEvent(Generic[TEvent]):
     """Wrapper for events with all relevant metadata.
 
     Returned from EventStore when loading events from a stream.
@@ -69,20 +73,24 @@ class WrappedEvent(BaseModel, Generic[TEvent], extra="forbid"):
 
     event: TEvent
     version: int | None
-    uuid: UUID = Field(default_factory=uuid4)
-    created_at: datetime = Field(default_factory=datetime.utcnow)
-    context: Context = Field(default_factory=Context)
+    uuid: UUID = dataclasses.field(default_factory=uuid4)
+    created_at: datetime = dataclasses.field(
+        default_factory=lambda: datetime.now(timezone.utc).replace(tzinfo=None)
+    )
+    context: Context = dataclasses.field(default_factory=Context)
 
     @classmethod
     def wrap(cls, event: TEvent, version: int | None) -> "WrappedEvent[TEvent]":
         return WrappedEvent[TEvent](event=event, version=version)
 
 
-class Entry(BaseModel):
+@dataclasses.dataclass(frozen=True)
+class Entry:
     wrapped_event: WrappedEvent
     stream_id: StreamId
 
 
+@dataclasses.dataclass(frozen=True)
 class Recorded(Entry):
     position: Position
     tenant_id: TenantId = DEFAULT_TENANT

{python_event_sourcery-0.4.0a10 → python_event_sourcery-0.4.0a13}/event_sourcery/event_store/event/serde.py

@@ -1,8 +1,10 @@
+import dataclasses
 from collections.abc import Mapping, Sequence
 from dataclasses import dataclass
 from typing import cast
 
 from event_sourcery.event_store.event.dto import (
+    Context,
     Event,
     RawEvent,
     Recorded,
@@ -18,12 +20,14 @@ class Serde:
     registry: EventRegistry
 
     def deserialize(self, event: RawEvent) -> WrappedEvent:
-        event_as_dict = dict(event)
+        event_as_dict = dataclasses.asdict(event)
         del event_as_dict["stream_id"]
         del event_as_dict["name"]
         data = cast(Mapping, event_as_dict.pop("data"))
+        context = event_as_dict.pop("context", {})
+        event_as_dict["context"] = Context(**context)
         event_type = self.registry.type_for_name(event.name)
-        return WrappedEvent[event_type](  # type: ignore
+        return WrappedEvent[event_type](  # type: ignore[valid-type]
             **event_as_dict,
             event=event_type(**data),
         )

{python_event_sourcery-0.4.0a10 → python_event_sourcery-0.4.0a13}/event_sourcery_esdb/dto.py

@@ -1,6 +1,6 @@
 import json
 from datetime import datetime
-from typing import Any
+from typing import Any, Literal, cast
 
 from esdbclient import NewEvent, RecordedEvent
 
@@ -10,15 +10,22 @@ from event_sourcery_esdb import stream
 ES_PREFIX = "$es-"
 
 
-def raw_event(from_entry: RecordedEvent) -> RawEvent:
+def raw_event(
+    from_entry: RecordedEvent, version: int | Literal["undefined"] = "undefined"
+) -> RawEvent:
     metadata = json.loads(from_entry.metadata.decode("utf-8"))
     created_at = datetime.fromisoformat(metadata.pop("created_at"))
     position = stream.Position(from_entry.stream_position)
+    if version == "undefined":
+        version = position.as_version()
+
+    version = cast(int, version)
+
     return RawEvent(
         uuid=from_entry.id,
         stream_id=stream.Name.from_stream_name(from_entry.stream_name).uuid,
         created_at=created_at,
-        version=position.as_version(),
+        version=version,
         name=from_entry.type,
         data=json.loads(from_entry.data.decode("utf-8")),
         context={k: v for k, v in metadata.items() if not k.startswith(ES_PREFIX)},
@@ -28,9 +35,7 @@ def raw_event(from_entry: RecordedEvent) -> RawEvent:
 def snapshot(from_entry: RecordedEvent) -> RawEvent:
     metadata = json.loads(from_entry.metadata.decode("utf-8"))
     position = metadata[f"{ES_PREFIX}stream_position"]
-    event = raw_event(from_entry)
-    event.version = stream.Position(position).as_version()
-    return event
+    return raw_event(from_entry, version=stream.Position(position).as_version())
 
 
 def new_entry(from_raw: RawEvent, **metadata: Any) -> NewEvent:

{python_event_sourcery-0.4.0a10 → python_event_sourcery-0.4.0a13}/event_sourcery_sqlalchemy/outbox.py

@@ -1,8 +1,9 @@
+import dataclasses
 import logging
 from collections.abc import Generator, Iterator
 from contextlib import AbstractContextManager, contextmanager
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import cast
 from uuid import UUID
 
@@ -31,15 +32,17 @@ class SqlAlchemyOutboxStorageStrategy(OutboxStorageStrategy):
             if not self._filterer(record.entry):
                 continue
 
-            as_dict = dict(record.entry)
+            stream_id = record.entry.stream_id
+            as_dict = dataclasses.asdict(record.entry)
+            as_dict.pop("stream_id")
             created_at = cast(datetime, as_dict["created_at"])
             as_dict["created_at"] = created_at.isoformat()
             as_dict["uuid"] = str(as_dict["uuid"])
-            as_dict["stream_id"] = str(as_dict["stream_id"])
+            as_dict["stream_id"] = str(stream_id)
             as_dict["tenant_id"] = str(record.tenant_id)
             rows.append(
                 {
-                    "created_at": datetime.utcnow(),
+                    "created_at": datetime.now(timezone.utc).replace(tzinfo=None),
                     "data": as_dict,
                     "stream_name": record.entry.stream_id.name,
                     "position": record.position,

{python_event_sourcery-0.4.0a10 → python_event_sourcery-0.4.0a13}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
+name = "python-event-sourcery"
 requires-python = ">=3.10"
 
 [tool.poetry]
-name = "python-event-sourcery"
-version = "0.4.0a10"
+version = "0.4.0a13"
 description = ""
 authors = ["Your Name <you@example.com>"]
 license = "MIT"