eventsourcing 9.3.2__tar.gz → 9.3.3__tar.gz

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eventsourcing
-Version: 9.3.2
+Version: 9.3.3
 Summary: Event sourcing in Python
 Home-page: https://github.com/pyeventsourcing/eventsourcing
 License: BSD 3-Clause
@@ -25,15 +25,10 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: crypto
-Provides-Extra: docs
 Provides-Extra: postgres
-Requires-Dist: Sphinx ; extra == "docs"
 Requires-Dist: backports.zoneinfo ; python_version < "3.9"
-Requires-Dist: orjson ; extra == "docs"
-Requires-Dist: psycopg[c,pool] (<=3.2.1) ; (python_full_version <= "3.12.999999") and (extra == "postgres")
-Requires-Dist: pycryptodome (>=3.20,<3.21) ; extra == "crypto"
-Requires-Dist: pydantic ; extra == "docs"
-Requires-Dist: sphinx_rtd_theme ; extra == "docs"
+Requires-Dist: psycopg[c,pool] (<=3.2.99999) ; extra == "postgres"
+Requires-Dist: pycryptodome (>=3.21,<3.22) ; extra == "crypto"
 Requires-Dist: typing_extensions
 Project-URL: Repository, https://github.com/pyeventsourcing/eventsourcing
 Description-Content-Type: text/markdown

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/eventsourcing/examples/aggregate7/application.py

@@ -36,7 +36,12 @@ class DogSchool(Application):
 
     def get_dog(self, dog_id: UUID) -> Dict[str, Any]:
         dog = self.repository.get(dog_id, projector_func=project_dog)
-        return {"name": dog.name, "tricks": tuple([t.name for t in dog.tricks])}
+        return {
+            "name": dog.name,
+            "tricks": tuple([t.name for t in dog.tricks]),
+            "created_on": dog.created_on,
+            "modified_on": dog.modified_on,
+        }
 
     def construct_mapper(self) -> Mapper:
         return self.factory.mapper(

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/eventsourcing/examples/aggregate7/domainmodel.py

@@ -5,33 +5,31 @@ from functools import singledispatch
 from typing import Any, Callable, Dict, Iterable, Optional, Tuple, TypeVar
 from uuid import UUID, uuid4
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 from eventsourcing.utils import get_topic
 
 
 class DomainEvent(BaseModel):
+    model_config = ConfigDict(frozen=True, extra="forbid")
+
     originator_id: UUID
     originator_version: int
     timestamp: datetime
 
-    class Config:
-        frozen = True
-
 
 def create_timestamp() -> datetime:
     return datetime.now(tz=timezone.utc)
 
 
 class Aggregate(BaseModel):
+    model_config = ConfigDict(frozen=True, extra="forbid")
+
     id: UUID
     version: int
     created_on: datetime
     modified_on: datetime
 
-    class Config:
-        frozen = True
-
 
 class Snapshot(DomainEvent):
     topic: str

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/eventsourcing/examples/aggregate7/test_application.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from datetime import datetime
 from unittest import TestCase
 
 from eventsourcing.examples.aggregate7.application import DogSchool
@@ -20,6 +21,8 @@ class TestDogSchool(TestCase):
         dog = school.get_dog(dog_id)
         self.assertEqual(dog["name"], "Fido")
         self.assertEqual(dog["tricks"], ("roll over", "play dead"))
+        self.assertIsInstance(dog["created_on"], datetime)
+        self.assertIsInstance(dog["modified_on"], datetime)
 
         # Select notifications.
         notifications = school.notification_log.select(start=1, limit=10)
@@ -30,9 +33,13 @@ class TestDogSchool(TestCase):
         dog = school.get_dog(dog_id)
         self.assertEqual(dog["name"], "Fido")
         self.assertEqual(dog["tricks"], ("roll over", "play dead"))
+        self.assertIsInstance(dog["created_on"], datetime)
+        self.assertIsInstance(dog["modified_on"], datetime)
 
         # Continue with snapshotted aggregate.
         school.add_trick(dog_id, "fetch ball")
         dog = school.get_dog(dog_id)
         self.assertEqual(dog["name"], "Fido")
         self.assertEqual(dog["tricks"], ("roll over", "play dead", "fetch ball"))
+        self.assertIsInstance(dog["created_on"], datetime)
+        self.assertIsInstance(dog["modified_on"], datetime)

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/eventsourcing/examples/aggregate7a/domainmodel.py

@@ -7,33 +7,31 @@ from functools import singledispatch
 from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, TypeVar
 from uuid import UUID, uuid4
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 from eventsourcing.utils import get_topic
 
 
 class DomainEvent(BaseModel):
+    model_config = ConfigDict(frozen=True, extra="forbid")
+
     originator_id: UUID
     originator_version: int
     timestamp: datetime
 
-    class Config:
-        frozen = True
-
 
 def create_timestamp() -> datetime:
     return datetime.now(tz=timezone.utc)
 
 
 class Aggregate(BaseModel):
+    model_config = ConfigDict(frozen=True, extra="forbid")
+
     id: UUID
     version: int
     created_on: datetime
     modified_on: datetime
 
-    class Config:
-        frozen = True
-
     def hold_event(self, event: DomainEvent) -> None:
         all_pending_events[id(self)].append(event)
 

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/eventsourcing/examples/aggregate8/domainmodel.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from datetime import datetime  # noqa: TCH003
-from typing import List
-from uuid import UUID  # noqa: TCH003
+from datetime import datetime
+from typing import Any, List
+from uuid import UUID
 
-from pydantic import BaseModel, Extra
+from pydantic import BaseModel, ConfigDict, TypeAdapter
 
 from eventsourcing.domain import (
     Aggregate as BaseAggregate,
@@ -16,25 +16,23 @@ from eventsourcing.domain import (
 
 
 class DomainEvent(BaseModel):
+    model_config = ConfigDict(frozen=True, extra="forbid")
+
     originator_id: UUID
     originator_version: int
     timestamp: datetime
 
-    class Config:
-        frozen = True
 
-
-class Aggregate(BaseAggregate):
-    class Event(DomainEvent, CanMutateAggregate):
-        pass
-
-    class Created(Event, CanInitAggregate):
-        originator_topic: str
+datetime_adapter = TypeAdapter(datetime)
 
 
 class SnapshotState(BaseModel):
-    class Config:
-        extra = Extra.allow
+    model_config = ConfigDict(frozen=True, extra="allow")
+
+    def __init__(self, **kwargs: Any) -> None:
+        for key in ["_created_on", "_modified_on"]:
+            kwargs[key] = datetime_adapter.validate_python(kwargs[key])
+        super().__init__(**kwargs)
 
 
 class AggregateSnapshot(DomainEvent, CanSnapshotAggregate):
@@ -42,18 +40,26 @@ class AggregateSnapshot(DomainEvent, CanSnapshotAggregate):
     state: SnapshotState
 
 
+class Aggregate(BaseAggregate):
+    class Event(DomainEvent, CanMutateAggregate):
+        pass
+
+    class Created(Event, CanInitAggregate):
+        originator_topic: str
+
+
 class Trick(BaseModel):
     name: str
 
 
-class DogState(SnapshotState):
+class DogSnapshotState(SnapshotState):
     name: str
     tricks: List[Trick]
 
 
 class Dog(Aggregate):
     class Snapshot(AggregateSnapshot):
-        state: DogState
+        state: DogSnapshotState
 
     @event("Registered")
     def __init__(self, name: str) -> None:

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/eventsourcing/examples/aggregate8/test_application.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from datetime import datetime
 from unittest import TestCase
 
 from eventsourcing.examples.aggregate8.application import DogSchool
@@ -19,6 +20,8 @@ class TestDogSchool(TestCase):
         dog = school.get_dog(dog_id)
         self.assertEqual(dog["name"], "Fido")
         self.assertEqual(dog["tricks"], ("roll over", "play dead"))
+        self.assertIsInstance(dog["created_on"], datetime)
+        self.assertIsInstance(dog["modified_on"], datetime)
 
         # Select notifications.
         notifications = school.notification_log.select(start=1, limit=10)
@@ -29,9 +32,13 @@ class TestDogSchool(TestCase):
         dog = school.get_dog(dog_id)
         self.assertEqual(dog["name"], "Fido")
         self.assertEqual(dog["tricks"], ("roll over", "play dead"))
+        self.assertIsInstance(dog["created_on"], datetime)
+        self.assertIsInstance(dog["modified_on"], datetime)
 
         # Continue with snapshotted aggregate.
         school.add_trick(dog_id, "fetch ball")
         dog = school.get_dog(dog_id)
         self.assertEqual(dog["name"], "Fido")
         self.assertEqual(dog["tricks"], ("roll over", "play dead", "fetch ball"))
+        self.assertIsInstance(dog["created_on"], datetime)
+        self.assertIsInstance(dog["modified_on"], datetime)

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/eventsourcing/postgres.py

@@ -9,7 +9,6 @@ import psycopg.errors
 import psycopg_pool
 from psycopg import Connection, Cursor
 from psycopg.rows import DictRow, dict_row
-from typing_extensions import Self
 
 from eventsourcing.persistence import (
     AggregateRecorder,
@@ -34,6 +33,8 @@ from eventsourcing.utils import Environment, resolve_topic, retry, strtobool
 if TYPE_CHECKING:  # pragma: nocover
     from uuid import UUID
 
+    from typing_extensions import Self
+
 logging.getLogger("psycopg.pool").setLevel(logging.CRITICAL)
 logging.getLogger("psycopg").setLevel(logging.CRITICAL)
 

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/eventsourcing/system.py

@@ -8,6 +8,7 @@ from queue import Full, Queue
 from threading import Event, Lock, RLock, Thread
 from types import FrameType, ModuleType
 from typing import (
+    TYPE_CHECKING,
     Any,
     ClassVar,
     Dict,
@@ -22,7 +23,8 @@ from typing import (
     cast,
 )
 
-from typing_extensions import Self
+if TYPE_CHECKING:  # pragma: nocover
+    from typing_extensions import Self
 
 from eventsourcing.application import (
     Application,

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/eventsourcing/tests/persistence_tests/test_postgres.py

@@ -232,6 +232,7 @@ class TestPostgresDatastore(TestCase):
             user="eventsourcing",
             password="wrong",  # noqa: S106
             pool_size=1,
+            connect_timeout=3,
         ) as datastore:
 
             conn: Connection
@@ -261,7 +262,7 @@ class TestPostgresDatastore(TestCase):
             password="",
             pool_size=1,
             get_password_func=get_password_func,
-            connect_timeout=10,
+            connect_timeout=3,
         ) as datastore, datastore.get_connection() as conn, conn.cursor() as curs:
             # Create a connection, and check it works (this test depends on psycopg
             # retrying attempt to connect, should call "get password" twice).

{eventsourcing-9.3.2 → eventsourcing-9.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eventsourcing"
-version = "9.3.2"
+version = "9.3.3"
 
 description = "Event sourcing in Python"
 authors = [
@@ -48,48 +48,27 @@ keywords=[
 python = ">=3.8,<4.0"
 typing_extensions = "*"
 "backports.zoneinfo" = { version = "*", python =  "<3.9" }
-pycryptodome = { version = "~3.20", optional = true }
-
-psycopg = { version = "<=3.2.1", optional = true, extras = ["c", "pool"], python = "<=3.12.999999" }
-
-Sphinx = { version = "*", optional = true }
-sphinx_rtd_theme = { version = "*", optional = true }
-pydantic = { version = "*", optional = true }
-orjson = { version = "*", optional = true }
+pycryptodome = { version = "~3.21", optional = true }
+psycopg = { version = "<=3.2.99999", optional = true, extras=["c,pool"]}
 
 [tool.poetry.extras]
 crypto = ["pycryptodome"]
 postgres = ["psycopg"]
-docs = ["Sphinx", "sphinx_rtd_theme", "pydantic", "orjson"]
 
 [tool.poetry.group.dev.dependencies]
 black = { version = "*", allow-prereleases = true }
 coverage = "^7.2.7"
-flake8 = "*"
-flake8-broken-line = "*"
-flake8-bugbear = "*"
-flake8-coding = "*"
-flake8-isort = "*"
-flake8-tidy-imports = "*"
 isort = "*"
 mypy = "*"
-python-coveralls = "*"
-psycopg = [
-    { version = "<=3.2.1", python = "<=3.12.999999" },
-    { git = "https://github.com/psycopg/psycopg", branch="master", subdirectory = "psycopg", python = ">3.12.999999" }
-]
-psycopg-binary = [
-    { version = "<=3.2.1", python = "<=3.12.999999" },
-]
-psycopg-c = [
-    { git = "https://github.com/psycopg/psycopg", branch="master", subdirectory = "psycopg_c", python = ">3.12.999999" }
-]
-psycopg-pool = [
-    { version = "<=3.2.2", python = "<=3.12.999999" },
-    { git = "https://github.com/psycopg/psycopg", branch="master", subdirectory = "psycopg_pool", python = ">3.12.999999" }
-]
+psycopg = { version = "<=3.2.99999", extras = ["binary", "pool"] }
 ruff = "^0.1.14"
 
+[tool.poetry.group.docs.dependencies]
+Sphinx = { version = "*"}
+sphinx_rtd_theme = { version = "*"}
+pydantic = { version = "~2.9"}
+orjson = { version = "~3.10.11"}
+
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
@@ -218,6 +197,9 @@ unfixable = []
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
+[tool.ruff.lint.flake8-type-checking]
+runtime-evaluated-base-classes = ["pydantic.BaseModel"]
+
 [tool.ruff.format]
 # Like Black, use double quotes for strings.
 quote-style = "double"