python-cqrs 0.1.4__tar.gz → 0.2.0__tar.gz

{python_cqrs-0.1.4/src/python_cqrs.egg-info → python_cqrs-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-cqrs
-Version: 0.1.4
+Version: 0.2.0
 Summary: Python CQRS pattern implementation
 Author-email: Vadim Kozyrevskiy <vadikko2@mail.ru>
 Maintainer-email: Vadim Kozyrevskiy <vadikko2@mail.ru>

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/pyproject.toml

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

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/src/cqrs/__init__.py

@@ -1,17 +1,17 @@
 from cqrs.compressors.protocol import Compressor
 from cqrs.compressors.zlib import ZlibCompressor
-from cqrs.events.event import DomainEvent, ECSTEvent, NotificationEvent
+from cqrs.container.di import DIContainer
+from cqrs.container.protocol import Container
+from cqrs.events.event import DomainEvent, ECSTEvent, Event, NotificationEvent
 from cqrs.events.event_emitter import EventEmitter
-from cqrs.events.event_handler import EventHandler
+from cqrs.events.event_handler import EventHandler, SyncEventHandler
 from cqrs.mediator import EventMediator, RequestMediator
 from cqrs.outbox.producer import EventProducer
 from cqrs.outbox.repository import OutboxedEventRepository
 from cqrs.outbox.sqlalchemy import SqlAlchemyOutboxedEventRepository
 from cqrs.requests.request import Request
-from cqrs.requests.request_handler import RequestHandler
+from cqrs.requests.request_handler import RequestHandler, SyncRequestHandler
 from cqrs.response import Response
-from cqrs.container.protocol import Container
-from cqrs.container.di import DIContainer
 
 __all__ = (
     "RequestMediator",
@@ -19,10 +19,13 @@ __all__ = (
     "DomainEvent",
     "NotificationEvent",
     "ECSTEvent",
+    "Event",
     "EventEmitter",
     "EventHandler",
+    "SyncEventHandler",
     "Request",
     "RequestHandler",
+    "SyncRequestHandler",
     "Response",
     "OutboxedEventRepository",
     "SqlAlchemyOutboxedEventRepository",

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/src/cqrs/adapters/kafka.py

@@ -25,8 +25,19 @@ _retry = functools.partial(
     is_async=True,
 )
 
-SecurityProtocol: typing.TypeAlias = typing.Literal["PLAINTEXT", "SSL", "SASL_PLAINTEXT", "SASL_SSL"]
-SaslMechanism: typing.TypeAlias = typing.Literal["PLAIN", "GSSAPI", "SCRAM-SHA-256", "SCRAM-SHA-512", "OAUTHBEARER"]
+SecurityProtocol: typing.TypeAlias = typing.Literal[
+    "PLAINTEXT",
+    "SSL",
+    "SASL_PLAINTEXT",
+    "SASL_SSL",
+]
+SaslMechanism: typing.TypeAlias = typing.Literal[
+    "PLAIN",
+    "GSSAPI",
+    "SCRAM-SHA-256",
+    "SCRAM-SHA-512",
+    "OAUTHBEARER",
+]
 
 logger = logging.getLogger("cqrs")
 logger.setLevel(logging.DEBUG)
@@ -74,7 +85,9 @@ class KafkaProducer(metaclass=_Singleton):
         Produces event to kafka broker.
         Tries to reconnect if connect has been lost or has not been opened.
         """
-        await _retry(tries=self._retry_count, delay=self._retry_delay)(self._produce)(message)
+        await _retry(tries=self._retry_count, delay=self._retry_delay)(self._produce)(
+            message,
+        )
 
 
 def kafka_producer_factory(
@@ -99,4 +112,9 @@ def kafka_producer_factory(
         sasl_plain_password=password,
         loop=loop,
     )
-    return KafkaProducer(producer=producer, topics=topics, retry_count=retry_count, retry_delay=retry_delay)
+    return KafkaProducer(
+        producer=producer,
+        topics=topics,
+        retry_count=retry_count,
+        retry_delay=retry_delay,
+    )

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/src/cqrs/dispatcher/dispatcher.py

@@ -27,7 +27,8 @@ _EventHandler: typing.TypeAlias = (
 )
 
 
-class RequestHandlerDoesNotExist(Exception): ...
+class RequestHandlerDoesNotExist(Exception):
+    pass
 
 
 class RequestDispatchResult(pydantic.BaseModel, typing.Generic[_Resp]):

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/src/cqrs/events/event_emitter.py

@@ -30,7 +30,8 @@ class EventEmitter:
         self._message_broker = message_broker
 
     @functools.singledispatchmethod
-    async def emit(self, event: event_model.Event) -> None: ...
+    async def emit(self, event: event_model.Event) -> None:
+        pass
 
     @emit.register
     async def _(self, event: event_model.DomainEvent) -> None:

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/src/cqrs/events/map.py

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

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/src/cqrs/message_brokers/protocol.py

@@ -19,4 +19,4 @@ class MessageBroker(typing.Protocol):
     """
 
     async def send_message(self, message: Message) -> None:
-        ...
+        raise NotImplementedError

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/src/cqrs/middlewares/base.py

@@ -9,7 +9,8 @@ HandleType = typing.Callable[[_Req], typing.Awaitable[_Res] | _Res]
 
 
 class Middleware(typing.Protocol[_Req, _Res]):
-    async def __call__(self, request: _Req, handle: HandleType) -> _Res: ...
+    async def __call__(self, request: _Req, handle: HandleType) -> _Res:
+        raise NotImplementedError
 
 
 class MiddlewareChain:

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/src/cqrs/outbox/repository.py

@@ -34,7 +34,12 @@ class OutboxedEventRepository(abc.ABC, typing.Generic[Session]):
         """end transaction"""
 
     @abc.abstractmethod
-    def add(self, session: Session, event: Event) -> None:
+    def add(
+        self,
+        session: Session,
+        event: Event,
+        topic: typing.Text | None = None,
+    ) -> None:
         """Add an event to the repository."""
 
     @abc.abstractmethod
@@ -46,6 +51,7 @@ class OutboxedEventRepository(abc.ABC, typing.Generic[Session]):
         self,
         session: Session,
         batch_size: int = 100,
+        topic: typing.Text | None = None,
     ) -> typing.List[Event]:
         """Get many events from the repository."""
 

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/src/cqrs/outbox/sqlalchemy.py

@@ -78,7 +78,12 @@ class OutboxModel(Base):
         nullable=False,
         comment="Event name",
     )
-
+    topic = sqlalchemy.Column(
+        sqlalchemy.String(255),
+        nullable=False,
+        comment="Event topic",
+        default="",
+    )
     created_at = sqlalchemy.Column(
         sqlalchemy.DateTime,
         nullable=False,
@@ -98,7 +103,11 @@ class OutboxModel(Base):
         }
 
     @classmethod
-    def get_batch_query(cls, size: int) -> sqlalchemy.Select:
+    def get_batch_query(
+        cls,
+        size: int,
+        topic: typing.Text | None = None,
+    ) -> sqlalchemy.Select:
         return (
             sqlalchemy.select(cls)
             .select_from(cls)
@@ -111,6 +120,7 @@ class OutboxModel(Base):
                         ],
                     ),
                     cls.flush_counter < MAX_FLUSH_COUNTER_VALUE,
+                    (cls.topic == topic) if topic is not None else sqlalchemy.true(),
                 ),
             )
             .order_by(cls.status_sorting_case().asc())
@@ -184,7 +194,12 @@ class SqlAlchemyOutboxedEventRepository(
         EventType.ECST_EVENT: ev.ECSTEvent,
     }
 
-    def add(self, session: sql_session.AsyncSession, event: repository.Event) -> None:
+    def add(
+        self,
+        session: sql_session.AsyncSession,
+        event,
+        topic: typing.Text | None = None,
+    ) -> None:
         bytes_payload = orjson.dumps(event.payload)
         if self._compressor:
             bytes_payload = self._compressor.compress(bytes_payload)
@@ -196,6 +211,7 @@ class SqlAlchemyOutboxedEventRepository(
                 event_name=event.event_name,
                 created_at=event.event_timestamp,
                 payload=bytes_payload,
+                topic=topic or "",
             ),
         )
 
@@ -215,9 +231,10 @@ class SqlAlchemyOutboxedEventRepository(
         self,
         session: sql_session.AsyncSession,
         batch_size: int = 100,
+        topic: typing.Text | None = None,
     ) -> typing.List[repository.Event]:
         events: typing.Sequence[OutboxModel] = (
-            (await session.execute(OutboxModel.get_batch_query(batch_size)))
+            (await session.execute(OutboxModel.get_batch_query(batch_size, topic)))
             .scalars()
             .all()
         )
@@ -234,7 +251,7 @@ class SqlAlchemyOutboxedEventRepository(
     async def get_one(
         self,
         session: sql_session.AsyncSession,
-        event_id: uuid.UUID,
+        event_id,
     ) -> repository.Event | None:
         event: OutboxModel | None = (
             await session.execute(OutboxModel.get_event_query(event_id))

{python_cqrs-0.1.4 → python_cqrs-0.2.0}/src/cqrs/requests/map.py

@@ -3,7 +3,12 @@ import typing
 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])
+_VT = typing.TypeVar(
+    "_VT",
+    bound=typing.Type[
+        request_handler.RequestHandler | request_handler.SyncRequestHandler
+    ],
+)
 
 
 class RequestMap(typing.Dict[_KT, _VT]):

{python_cqrs-0.1.4 → python_cqrs-0.2.0/src/python_cqrs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-cqrs
-Version: 0.1.4
+Version: 0.2.0
 Summary: Python CQRS pattern implementation
 Author-email: Vadim Kozyrevskiy <vadikko2@mail.ru>
 Maintainer-email: Vadim Kozyrevskiy <vadikko2@mail.ru>