eventsourcing 9.3.2__py3-none-any.whl → 9.3.3__py3-none-any.whl

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/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/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/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/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/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/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/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/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.dist-info → eventsourcing-9.3.3.dist-info}/METADATA

@@ -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.dist-info → eventsourcing-9.3.3.dist-info}/RECORD

@@ -34,22 +34,22 @@ eventsourcing/examples/aggregate6a/application.py,sha256=KK8PjIhlMuxKmV4Gjr6tLSW
 eventsourcing/examples/aggregate6a/domainmodel.py,sha256=LaktSGm8sa4xIDyXQAyRkjH8m_HhVt3GHbQw8vfZkUQ,3627
 eventsourcing/examples/aggregate6a/test_application.py,sha256=s8tyZqGWwLQXpD9FSEe1h5MZT3v5_zJc17Vzw133_lw,1673
 eventsourcing/examples/aggregate7/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eventsourcing/examples/aggregate7/application.py,sha256=cOJ3nYKRTOCO3gA3M-CmlR0Gu-lW8Agmq5epy5uVf90,1395
-eventsourcing/examples/aggregate7/domainmodel.py,sha256=pImr-nOg8uR1SjfF0Ou1R19eLjrsZ9-Xpbhbkci7izk,3261
+eventsourcing/examples/aggregate7/application.py,sha256=vZTXSWH39OoSiwgwcyrE9SHuw-cvbjMEjSrsu9pHiBs,1516
+eventsourcing/examples/aggregate7/domainmodel.py,sha256=WXO3uVEUWp7klxq6__yX48fDJiXMMd8YzJpJsVG1fdI,3311
 eventsourcing/examples/aggregate7/persistence.py,sha256=zb2yJc4iVqkOc9iGLeqLCgo1E-kRRIoBYNvOBhUOfKg,1874
-eventsourcing/examples/aggregate7/test_application.py,sha256=tWRTrRdIL81AlEyO-j2LHTF3l-6yWqXFTOj8Dnk2Nt4,1366
+eventsourcing/examples/aggregate7/test_application.py,sha256=QjbnycufzOelwN5EqUxe-8Q-8rx8Cz5VkuHUYI05fMM,1753
 eventsourcing/examples/aggregate7/test_compression_and_encryption.py,sha256=s9EGEdQ_m4xpt6tyPBhXeGQO9JAx1IpckjHE7vtmBbo,1634
 eventsourcing/examples/aggregate7/test_snapshotting_intervals.py,sha256=_poDWDfHXciTgFfA2IRcR_JVonFedWcV4afaRIto5Ho,2190
 eventsourcing/examples/aggregate7a/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eventsourcing/examples/aggregate7a/application.py,sha256=dRa5XGu29Ka31qbSY8VBfKPekvQnzWELE6_gM2Xht-E,1748
-eventsourcing/examples/aggregate7a/domainmodel.py,sha256=l0mdBGedAOljbSYAxVbh6Po2nbbAKp_vhVGs915MYFA,4016
+eventsourcing/examples/aggregate7a/domainmodel.py,sha256=D56CLAgCEh1hWDSbiALz-7sQpLVQbU2N-6C-dZ4KX74,4066
 eventsourcing/examples/aggregate7a/test_application.py,sha256=06ViRUVfIE74OLEj7N3rYmVhLO7V5sbCCaS8ozLBIH4,1741
 eventsourcing/examples/aggregate7a/test_compression_and_encryption.py,sha256=h3pxOUMHMCUMWx36vN2pqg4Mrwry_KCpJfMYYkA64o8,1636
 eventsourcing/examples/aggregate8/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eventsourcing/examples/aggregate8/application.py,sha256=b4MQb7wFzzk29cHe8ZuVQuwFXn2kskEmLojzqO4EKsw,1357
-eventsourcing/examples/aggregate8/domainmodel.py,sha256=Nnc62RyMy_wukqPLxnRo2vJOqxho2XVAgagWfT-Vuq0,1276
+eventsourcing/examples/aggregate8/domainmodel.py,sha256=t-FmjMcI0tkJUqzS_OvSs7IFbPTj6hcx9I33WudH6Ec,1564
 eventsourcing/examples/aggregate8/persistence.py,sha256=zb2yJc4iVqkOc9iGLeqLCgo1E-kRRIoBYNvOBhUOfKg,1874
-eventsourcing/examples/aggregate8/test_application.py,sha256=tbd77pTSpUopE_CENZAt31vCZOYs8E0Ot3WnFRQrhhw,1268
+eventsourcing/examples/aggregate8/test_application.py,sha256=zhla6hWQuuhLaiukUYUcOsL7-BWFru6zqKOxLODDLsA,1655
 eventsourcing/examples/aggregate8/test_compression_and_encryption.py,sha256=UWGnTSIlRu-FbXWQ0rX1YOQuDkMj9NCCssoQES23i-w,1509
 eventsourcing/examples/aggregate8/test_snapshotting_intervals.py,sha256=w_HAY_RirHqHtSQ1Z-muqqUz75RTYYBLeFGCB8ELhbI,1261
 eventsourcing/examples/bankaccounts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -90,10 +90,10 @@ eventsourcing/examples/test_parking_lot.py,sha256=Tlm8KYlMoZFBi20mX-_BSAPPJfeKDg
 eventsourcing/interface.py,sha256=KzDWLeIkREf-TAFl5AFHtKJwJFA-IthqMKClFkUFqdc,4676
 eventsourcing/persistence.py,sha256=TJseAtsWwdC33XLvcoyHdgwTv6s6KsvQS8XLKIq472s,37672
 eventsourcing/popo.py,sha256=AApSGneHuXa8yHOWdDfsFTMVDI-9ivEpuKTX1BSOXr8,6547
-eventsourcing/postgres.py,sha256=ZsDw36JJbR9O3_FeYSkA_NVab7N0fg4FrmWkVN4h3Lo,29767
+eventsourcing/postgres.py,sha256=NatfdA-YQQPB1qWsQg23Uhyy6R-hcGNOJHJ1bKmFuKQ,29772
 eventsourcing/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eventsourcing/sqlite.py,sha256=jz7SZk26Gcsjw88KL1xnr4-1tStTW16f1NR6TjMsZnQ,18466
-eventsourcing/system.py,sha256=Fyho27C44MckwC3OD9opw7an1Thz20QsD7PnRymnYik,45501
+eventsourcing/system.py,sha256=il05rAzPtKaxragIktMBOEyWGhz16VK0F7cEBlsl4_Q,45561
 eventsourcing/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eventsourcing/tests/application.py,sha256=wBanhWzAZvL3fYxCFe5cloN-Up7uLw6KcdRQ2dhKVAg,17586
 eventsourcing/tests/application_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,7 +128,7 @@ eventsourcing/tests/persistence_tests/test_infrastructure_factory.py,sha256=xcDd
 eventsourcing/tests/persistence_tests/test_mapper.py,sha256=3GWdhLzFrld8-h7pPfsYdNzIn1YNTa_L6iHb-dCg5zk,3806
 eventsourcing/tests/persistence_tests/test_noninterleaving_notification_ids.py,sha256=O8t9AT1SJ0mwrkh9hyDvQr_bpO-n3RA-PO4S9RVdzhY,2130
 eventsourcing/tests/persistence_tests/test_popo.py,sha256=7KIb72i2VF566N14IyEhM21P7eX3o8UmOLQKkaFAH84,3366
-eventsourcing/tests/persistence_tests/test_postgres.py,sha256=6mxPWJCAFWB0GIgVLEDXVpxY_mPVlm4ZunU22V3VvUA,41185
+eventsourcing/tests/persistence_tests/test_postgres.py,sha256=GnveTnyttrPHNZzFQZVTQfkKHjYsKKEh8Y770VZIRvE,41215
 eventsourcing/tests/persistence_tests/test_sqlite.py,sha256=dABEY6r0AIjGkgbBBk6f7MgfvQz9JkXgpOPEq8xvei0,11744
 eventsourcing/tests/persistence_tests/test_transcoder.py,sha256=IU1phRrGpyB0KzKFxivtDzDBP2Vn609nrwU52yk9YKM,1251
 eventsourcing/tests/postgres_utils.py,sha256=xymcGYasUXeZTBenkHz-ykD8HtrFjVM1Z7-qRrH6OQk,1364
@@ -138,8 +138,8 @@ eventsourcing/tests/system_tests/test_system.py,sha256=IRmLBovJ5Ha4KWNVg8efM-0OV
 eventsourcing/tests/utils_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eventsourcing/tests/utils_tests/test_utils.py,sha256=8HcTk_0_lXyoT307fEmd2utwmOUS_joToUPGFeFnKW8,6486
 eventsourcing/utils.py,sha256=PIWDvoGiKCXsNbR5DirkoJ_svopg80SoH37bqxOcjkU,8247
-eventsourcing-9.3.2.dist-info/AUTHORS,sha256=8aHOM4UbNZcKlD-cHpFRcM6RWyCqtwtxRev6DeUgVRs,137
-eventsourcing-9.3.2.dist-info/LICENSE,sha256=bSE_F-T6cQPmMY5LuJC27km_pGB1XCVuUFx1uY0Nueg,1512
-eventsourcing-9.3.2.dist-info/METADATA,sha256=QFafd2jcyxKW5UCb_N5-8M-iZBJKU8YPdk5fOCJYcsQ,9968
-eventsourcing-9.3.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-eventsourcing-9.3.2.dist-info/RECORD,,
+eventsourcing-9.3.3.dist-info/AUTHORS,sha256=8aHOM4UbNZcKlD-cHpFRcM6RWyCqtwtxRev6DeUgVRs,137
+eventsourcing-9.3.3.dist-info/LICENSE,sha256=bSE_F-T6cQPmMY5LuJC27km_pGB1XCVuUFx1uY0Nueg,1512
+eventsourcing-9.3.3.dist-info/METADATA,sha256=imKTn-0_ySg-VoB4VpJ7a3FNtB2RSsclUbk8m9bArMw,9734
+eventsourcing-9.3.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+eventsourcing-9.3.3.dist-info/RECORD,,