python-cqrs 0.0.17__tar.gz → 0.0.18__tar.gz

{python_cqrs-0.0.17/src/python_cqrs.egg-info → python_cqrs-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-cqrs
-Version: 0.0.17
+Version: 0.0.18
 Summary: Python CQRS pattern implementation
 Author: Nikita Kunov
 Author-email: Dmitriy Kutlubaev <kutlubaev00@mail.ru>, Vadim Kozyrevskiy <vadikko2@mail.ru>

{python_cqrs-0.0.17 → python_cqrs-0.0.18}/pyproject.toml

@@ -29,7 +29,7 @@ maintainers = [{name = "Vadim Kozyrevskiy", email = "vadikko2@mail.ru"}]
 name = "python-cqrs"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "0.0.17"
+version = "0.0.18"
 
 [project.optional-dependencies]
 dev = [

{python_cqrs-0.0.17 → python_cqrs-0.0.18}/src/cqrs/dispatcher/dispatcher.py

@@ -13,12 +13,14 @@ from cqrs import (
 
 logger = logging.getLogger("cqrs")
 
+Resp = typing.TypeVar("Resp", res.Response, None, contravariant=True)
+
 
 class RequestHandlerDoesNotExist(Exception): ...
 
 
-class RequestDispatchResult(pydantic.BaseModel):
-    response: res.Response | None = pydantic.Field(default=None)
+class RequestDispatchResult(pydantic.BaseModel, typing.Generic[Resp]):
+    response: Resp = pydantic.Field(default=None)
     events: typing.List[cqrs_events.Event] = pydantic.Field(default_factory=list)
 
 

{python_cqrs-0.0.17 → python_cqrs-0.0.18}/src/cqrs/events/event.py

@@ -15,7 +15,7 @@ class DomainEvent(Event, frozen=True):
     """
 
 
-_P = typing.TypeVar("_P")
+_P = typing.TypeVar("_P", object, None, contravariant=True)
 
 
 class NotificationEvent(Event, frozen=True):
@@ -82,7 +82,7 @@ class ECSTEvent(Event, typing.Generic[_P], frozen=True):
     event_name: typing.Text
     event_type: typing.ClassVar = "ecst_event"
 
-    payload: _P | None = pydantic.Field(default=None)
+    payload: _P = pydantic.Field(default=None)
 
     model_config = pydantic.ConfigDict(from_attributes=True)
 

{python_cqrs-0.0.17 → python_cqrs-0.0.18}/src/cqrs/events/map.py

@@ -3,14 +3,16 @@ import typing
 from cqrs.events import event, event_handler
 
 _KT = typing.TypeVar("_KT", bound=typing.Type[event.Event])
-_VT = typing.List[typing.Type[event_handler.EventHandler[event.Event]]]
+_VT: typing.TypeAlias = typing.List[
+    typing.Type[event_handler.EventHandler[event.Event]]
+]
 
 
 class EventMap(typing.Dict[_KT, _VT]):
     def bind(
         self,
         event_type: _KT,
-        handler_type: typing.Type[event_handler.EventHandler[event.Event]],
+        handler_type: typing.Type[event_handler.EventHandler],
     ) -> None:
         if event_type not in self:
             self[event_type] = [handler_type]

{python_cqrs-0.0.17 → python_cqrs-0.0.18}/src/cqrs/mediator.py

@@ -9,6 +9,8 @@ from cqrs import (
     response,
 )
 
+Resp = typing.TypeVar("Resp", response.Response, None, contravariant=True)
+
 
 class RequestMediator:
     """
@@ -56,7 +58,7 @@ class RequestMediator:
             middleware_chain=middleware_chain,  # type: ignore
         )
 
-    async def send(self, request: requests.Request) -> response.Response | None:
+    async def send(self, request: requests.Request) -> Resp:
         dispatch_result = await self._dispatcher.dispatch(request)
 
         if dispatch_result.events:

{python_cqrs-0.0.17 → python_cqrs-0.0.18}/src/cqrs/middlewares/base.py

@@ -4,7 +4,7 @@ import typing
 from cqrs import requests, response
 
 Req = typing.TypeVar("Req", bound=requests.Request, contravariant=True)
-Res = typing.TypeVar("Res", response.Response, None, covariant=True)
+Res = typing.TypeVar("Res", response.Response, None, contravariant=True)
 HandleType = typing.Callable[[Req], typing.Awaitable[Res]]
 
 

{python_cqrs-0.0.17 → python_cqrs-0.0.18}/src/cqrs/outbox/repository.py

@@ -6,7 +6,7 @@ import uuid
 import cqrs
 from cqrs.events import event as ev
 
-Event: typing.TypeAlias = ev.NotificationEvent | ev.ECSTEvent
+Event = typing.TypeVar("Event", ev.NotificationEvent, ev.ECSTEvent, contravariant=True)
 Session = typing.TypeVar("Session")
 
 
@@ -17,7 +17,11 @@ class EventStatus(enum.StrEnum):
 
 
 class OutboxedEventRepository(abc.ABC, typing.Generic[Session]):
-    def __init__(self, session_factory: typing.Callable[[], Session], compressor: cqrs.Compressor | None = None):
+    def __init__(
+        self,
+        session_factory: typing.Callable[[], Session],
+        compressor: cqrs.Compressor | None = None,
+    ):
         self._session_factory = session_factory
         self._compressor = compressor
 
@@ -38,11 +42,20 @@ class OutboxedEventRepository(abc.ABC, typing.Generic[Session]):
         """Get one event from the repository."""
 
     @abc.abstractmethod
-    async def get_many(self, session: Session, batch_size: int = 100) -> typing.List[Event]:
+    async def get_many(
+        self,
+        session: Session,
+        batch_size: int = 100,
+    ) -> typing.List[Event]:
         """Get many events from the repository."""
 
     @abc.abstractmethod
-    async def update_status(self, session: Session, event_id: uuid.UUID, new_status: EventStatus):
+    async def update_status(
+        self,
+        session: Session,
+        event_id: uuid.UUID,
+        new_status: EventStatus,
+    ):
         """Update the event status"""
 
     @abc.abstractmethod

{python_cqrs-0.0.17 → python_cqrs-0.0.18}/src/cqrs/outbox/sqlalchemy.py

@@ -175,7 +175,10 @@ class SqlAlchemyOutboxedEventRepository(
     repository.OutboxedEventRepository[sql_session.AsyncSession],
 ):
     EVENT_CLASS_MAPPING: typing.ClassVar[
-        typing.Dict[EventType, typing.Type[repository.Event]]
+        typing.Dict[
+            EventType,
+            typing.Type[ev.NotificationEvent] | typing.Type[ev.ECSTEvent],
+        ]
     ] = {
         EventType.NOTIFICATION_EVENT: ev.NotificationEvent,
         EventType.ECST_EVENT: ev.ECSTEvent,
@@ -198,14 +201,15 @@ class SqlAlchemyOutboxedEventRepository(
 
     def _process_events(self, model: OutboxModel) -> repository.Event:
         event_dict = model.row_to_dict()
-        event_dict["payload"] = orjson.loads(
-            self._compressor.decompress(event_dict["payload"])
-            if self._compressor
-            else event_dict["payload"],
-        )
+        if event_dict["payload"] is not None:
+            event_dict["payload"] = orjson.loads(
+                self._compressor.decompress(event_dict["payload"])
+                if self._compressor
+                else event_dict["payload"],
+            )
         return self.EVENT_CLASS_MAPPING[event_dict["event_type"]].model_validate(
             event_dict,
-        )
+        )  # type: ignore
 
     async def get_many(
         self,
@@ -250,7 +254,7 @@ class SqlAlchemyOutboxedEventRepository(
             else event_dict["payload"],
         )
 
-        return self.EVENT_CLASS_MAPPING[event.event_type].model_validate(event_dict)
+        return self._process_events(event)
 
     async def update_status(
         self,

{python_cqrs-0.0.17 → python_cqrs-0.0.18}/src/cqrs/requests/map.py

@@ -1,15 +1,9 @@
 import typing
 
-from cqrs import response
 from cqrs.requests import request, request_handler
 
 _KT = typing.TypeVar("_KT", bound=typing.Type[request.Request])
-_VT = typing.TypeVar(
-    "_VT",
-    bound=typing.Type[
-        request_handler.RequestHandler[request.Request, response.Response]
-    ],
-)
+_VT = typing.TypeVar("_VT", bound=typing.Type[request_handler.RequestHandler])
 
 
 class RequestMap(typing.Dict[_KT, _VT]):

{python_cqrs-0.0.17 → python_cqrs-0.0.18/src/python_cqrs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-cqrs
-Version: 0.0.17
+Version: 0.0.18
 Summary: Python CQRS pattern implementation
 Author: Nikita Kunov
 Author-email: Dmitriy Kutlubaev <kutlubaev00@mail.ru>, Vadim Kozyrevskiy <vadikko2@mail.ru>