eventsourcing 9.4.0a6__py3-none-any.whl → 9.4.0a7__py3-none-any.whl

eventsourcing/application.py

@@ -19,8 +19,6 @@ from typing import (
 )
 from warnings import warn
 
-from typing_extensions import deprecated
-
 from eventsourcing.domain import (
     Aggregate,
     CanMutateProtocol,
@@ -905,14 +903,7 @@ class Application:
 TApplication = TypeVar("TApplication", bound=Application)
 
 
-@deprecated(
-    "AggregateNotFound is deprecated, use AggregateNotFoundError instead", category=None
-)
-class AggregateNotFound(EventSourcingError):  # noqa: N818
-    pass
-
-
-class AggregateNotFoundError(AggregateNotFound):
+class AggregateNotFoundError(EventSourcingError):
     """
     Raised when an :class:`~eventsourcing.domain.Aggregate`
     object is not found in a :class:`Repository`.

eventsourcing/domain.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+import dataclasses
+import importlib
 import inspect
 import os
-from dataclasses import dataclass
 from datetime import datetime, tzinfo
 from functools import cache
 from types import FunctionType, WrapperDescriptorType
@@ -336,7 +337,7 @@ class MetaDomainEvent(type):
         event_cls = cast(
             type[TDomainEvent], super().__new__(cls, name, bases, cls_dict)
         )
-        event_cls = dataclass(frozen=True)(event_cls)
+        event_cls = dataclasses.dataclass(frozen=True)(event_cls)
         event_cls.__signature__ = inspect.signature(event_cls.__init__)  # type: ignore
         return event_cls
 
@@ -886,6 +887,34 @@ _annotations_mention_id: set[MetaAggregate[Aggregate]] = set()
 _init_mentions_id: set[MetaAggregate[Aggregate]] = set()
 
 
+def _ensure_idempotent_dataclass(module_name: str) -> None:
+    module = importlib.import_module(module_name)
+    if (
+        "dataclass" in module.__dict__
+        and module.__dict__["dataclass"] == dataclasses.dataclass
+        and "__original_dataclass_func__" not in module.__dict__
+    ):
+        module.__dict__["__original_dataclass_func__"] = module.__dict__["dataclass"]
+        module.__dict__["dataclass"] = _idempotent_dataclass
+
+
+def _idempotent_dataclass(cls: type[object] | None = None, /, **kwargs: Any) -> Any:
+
+    def idempotent_wrap(cls: type[object]) -> type[object]:
+        # Avoid processing dataclass twice.
+        if "__dataclass_fields__" in cls.__dict__:
+            return cls
+        return dataclasses.dataclass(**kwargs)(cls)
+
+    # See if we're being called as @dataclass or @dataclass().
+    if cls is None:
+        # We're called with parens.
+        return idempotent_wrap
+
+    # We're called as @dataclass without parens.
+    return idempotent_wrap(cls)
+
+
 class MetaAggregate(type, Generic[TAggregate]):
     """
     Metaclass for aggregate classes.
@@ -924,6 +953,12 @@ class MetaAggregate(type, Generic[TAggregate]):
         """
         Configures aggregate class definition.
         """
+
+        # Avoid processing dataclass twice. This avoids dataclasses.Field(init=False)
+        # attributes being reduced to annotation only and then appearing in __init__
+        # method signature when class is reprocessed, and other similar problems.
+        _ensure_idempotent_dataclass(module_name=args[2]["__module__"])
+
         try:
             class_annotations = args[2]["__annotations__"]
         except KeyError:
@@ -937,8 +972,8 @@ class MetaAggregate(type, Generic[TAggregate]):
             else:
                 annotations_mention_id = True
         aggregate_cls = type.__new__(cls, *args)
-        if class_annotations:
-            aggregate_cls = dataclass(eq=False, repr=False)(aggregate_cls)
+        if class_annotations or any(dataclasses.is_dataclass(base) for base in args[1]):
+            aggregate_cls = dataclasses.dataclass(eq=False, repr=False)(aggregate_cls)
         if annotations_mention_id:
             _annotations_mention_id.add(aggregate_cls)
         return aggregate_cls

{eventsourcing-9.4.0a6.dist-info → eventsourcing-9.4.0a7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eventsourcing
-Version: 9.4.0a6
+Version: 9.4.0a7
 Summary: Event sourcing in Python
 License: BSD 3-Clause
 Keywords: event sourcing,event store,domain driven design,domain-driven design,ddd,cqrs,cqs

{eventsourcing-9.4.0a6.dist-info → eventsourcing-9.4.0a7.dist-info}/RECORD

@@ -1,10 +1,10 @@
 eventsourcing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eventsourcing/application.py,sha256=jnW_D1WpcH_S9tOER36xzy3juYzm9D3f-nGTKAU8RpI,36188
+eventsourcing/application.py,sha256=p8pBAWZ4HfHvHVZ2-enPE_WLokFqJNo6OEa6qU9_Zos,35973
 eventsourcing/cipher.py,sha256=AjgOlOv9FF6xyXiFnHwcK6NX5IJ3nPHFL5GzIyWozyg,3265
 eventsourcing/compressor.py,sha256=IdvrJUB9B2td871oifInv4lGXmHwYL9d69MbHHCr7uI,421
 eventsourcing/cryptography.py,sha256=ZsQFyeyMZysADqKy38ECV71j6EMMSbo3VQO7oRnC1h0,2994
 eventsourcing/dispatch.py,sha256=yYSpT-jqc6l_wTdqEnfPJJfvsZN2Ta8g2anrVPWIcqQ,1412
-eventsourcing/domain.py,sha256=3pg7OtnupNFEJxLH0cur1k6rSFspYX2Ic6wteuEjtxE,58170
+eventsourcing/domain.py,sha256=_yacmQJBimumKbS3T-KLhvziVI0BWbDM7G5Opyh-Mu0,59578
 eventsourcing/interface.py,sha256=kObA7ouzLD4YpJMjhfPVmRUcDzhbK0bbFKXy75EscHU,5138
 eventsourcing/persistence.py,sha256=5fyJ9H7rgQY1M1cO6rfNU9VI2_GLn4KjFLia7lqXLSM,46147
 eventsourcing/popo.py,sha256=wSnpFutz24czC34v-Pd_OjMvv3RCXRjT0pk7ibkClrY,9573
@@ -19,8 +19,8 @@ eventsourcing/tests/domain.py,sha256=lHSlY6jIoSeqlcPSbrrozEPUJGvJ8bgPrznlmzTxn2w
 eventsourcing/tests/persistence.py,sha256=XHoe4rk9VftCJ3Wfi30K1u3wnMLUyOjuYyI7ml9ecIQ,57096
 eventsourcing/tests/postgres_utils.py,sha256=xymcGYasUXeZTBenkHz-ykD8HtrFjVM1Z7-qRrH6OQk,1364
 eventsourcing/utils.py,sha256=1MXOacnjXauYaBhGmmGc1nOMXWcd9NnDC8uPeiop9l4,8184
-eventsourcing-9.4.0a6.dist-info/AUTHORS,sha256=8aHOM4UbNZcKlD-cHpFRcM6RWyCqtwtxRev6DeUgVRs,137
-eventsourcing-9.4.0a6.dist-info/LICENSE,sha256=CQEQzcZO8AWXL5i3hIo4yVKrYjh2FBz6hCM7kpXWpw4,1512
-eventsourcing-9.4.0a6.dist-info/METADATA,sha256=DyLTvR4U5LLER3GR88LJkFHdSB6RlZ7MnsFE30OzAi0,9797
-eventsourcing-9.4.0a6.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-eventsourcing-9.4.0a6.dist-info/RECORD,,
+eventsourcing-9.4.0a7.dist-info/AUTHORS,sha256=8aHOM4UbNZcKlD-cHpFRcM6RWyCqtwtxRev6DeUgVRs,137
+eventsourcing-9.4.0a7.dist-info/LICENSE,sha256=CQEQzcZO8AWXL5i3hIo4yVKrYjh2FBz6hCM7kpXWpw4,1512
+eventsourcing-9.4.0a7.dist-info/METADATA,sha256=lDtJGwMp3HAxuQIFxfmAZfW7vhvBIPrUpZS3EykR9SQ,9797
+eventsourcing-9.4.0a7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+eventsourcing-9.4.0a7.dist-info/RECORD,,