python-cqrs 2.6.1__tar.gz → 3.0.1__tar.gz

{python_cqrs-2.6.1 → python_cqrs-3.0.1}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: python-cqrs
-Version: 2.6.1
+Version: 3.0.1
 Summary: Python CQRS pattern implementation
 Author-email: Vadim Kozyrevskiy <vadikko2@mail.ru>, Dmitry Kutlubaev <kutlubaev00@mail.ru>
 Maintainer-email: Vadim Kozyrevskiy <vadikko2@mail.ru>
+Project-URL: Documentation, https://vadikko2.github.io/python-cqrs-mkdocs/
 Project-URL: Issues, https://github.com/vadikko2/python-cqrs/issues
 Project-URL: Repository, https://github.com/vadikko2/python-cqrs
 Classifier: Development Status :: 4 - Beta
@@ -23,6 +24,7 @@ Requires-Dist: sqlalchemy[asyncio]==2.0.*
 Requires-Dist: retry-async==0.1.4
 Requires-Dist: python-dotenv==1.0.1
 Provides-Extra: dev
+Requires-Dist: pycln==2.5.0; extra == "dev"
 Requires-Dist: pre-commit==3.8.0; extra == "dev"
 Requires-Dist: pyright==1.1.377; extra == "dev"
 Requires-Dist: ruff==0.6.2; extra == "dev"
@@ -234,7 +236,7 @@ from cqrs.message_brokers import kafka as kafka_broker
 
 
 producer = kafka_adapter.kafka_producer_factory(
-    dsn="localhost:9094",
+    dsn="localhost:9092",
     topics=["test.topic1", "test.topic2"],
 )
 broker = kafka_broker.KafkaMessageBroker(producer)
@@ -312,22 +314,34 @@ It can be utilized in conjunction with the KafkaMessageBroker.
 ```python
 import asyncio
 import cqrs
-from cqrs.message_brokers import kafka as kafka_broker
+from cqrs.message_brokers import kafka
+from cqrs.adapters import kafka as kafka_adapters
+from cqrs.compressors import zlib
 
 session_factory = async_sessionmaker(
-    create_async_engine(
-        f"mysql+asyncmy://{USER}:{PASSWORD}@{HOSTNAME}:{PORT}/{DATABASE}",
-        isolation_level="REPEATABLE READ",
-    )
+   create_async_engine(
+      f"mysql+asyncmy://{USER}:{PASSWORD}@{HOSTNAME}:{PORT}/{DATABASE}",
+      isolation_level="REPEATABLE READ",
+   )
 )
 
 broker = kafka.KafkaMessageBroker(
-  producer=kafka_adapters.kafka_producer_factory(dsn="localhost:9092"),
+   producer=kafka_adapters.kafka_producer_factory(dsn="localhost:9092"),
 )
 
-producer = cqrs.EventProducer(cqrs.SqlAlchemyOutboxedEventRepository(session_factory, zlib.ZlibCompressor()), broker)
+producer = cqrs.EventProducer(broker, cqrs.SqlAlchemyOutboxedEventRepository(session_factory, zlib.ZlibCompressor()))
+
+
+async def periodically_task():
+   async for messages in producer.event_batch_generator():
+      for message in messages:
+         await producer.send_message(message)
+      await producer.repository.commit()
+      await asyncio.sleep(10)
+
+
 loop = asyncio.get_event_loop()
-loop.run_until_complete(app.periodically_task())
+loop.run_until_complete(periodically_task())
 ```
 
 A complete example can be found in

{python_cqrs-2.6.1 → python_cqrs-3.0.1}/README.md

@@ -189,7 +189,7 @@ from cqrs.message_brokers import kafka as kafka_broker
 
 
 producer = kafka_adapter.kafka_producer_factory(
-    dsn="localhost:9094",
+    dsn="localhost:9092",
     topics=["test.topic1", "test.topic2"],
 )
 broker = kafka_broker.KafkaMessageBroker(producer)
@@ -267,22 +267,34 @@ It can be utilized in conjunction with the KafkaMessageBroker.
 ```python
 import asyncio
 import cqrs
-from cqrs.message_brokers import kafka as kafka_broker
+from cqrs.message_brokers import kafka
+from cqrs.adapters import kafka as kafka_adapters
+from cqrs.compressors import zlib
 
 session_factory = async_sessionmaker(
-    create_async_engine(
-        f"mysql+asyncmy://{USER}:{PASSWORD}@{HOSTNAME}:{PORT}/{DATABASE}",
-        isolation_level="REPEATABLE READ",
-    )
+   create_async_engine(
+      f"mysql+asyncmy://{USER}:{PASSWORD}@{HOSTNAME}:{PORT}/{DATABASE}",
+      isolation_level="REPEATABLE READ",
+   )
 )
 
 broker = kafka.KafkaMessageBroker(
-  producer=kafka_adapters.kafka_producer_factory(dsn="localhost:9092"),
+   producer=kafka_adapters.kafka_producer_factory(dsn="localhost:9092"),
 )
 
-producer = cqrs.EventProducer(cqrs.SqlAlchemyOutboxedEventRepository(session_factory, zlib.ZlibCompressor()), broker)
+producer = cqrs.EventProducer(broker, cqrs.SqlAlchemyOutboxedEventRepository(session_factory, zlib.ZlibCompressor()))
+
+
+async def periodically_task():
+   async for messages in producer.event_batch_generator():
+      for message in messages:
+         await producer.send_message(message)
+      await producer.repository.commit()
+      await asyncio.sleep(10)
+
+
 loop = asyncio.get_event_loop()
-loop.run_until_complete(app.periodically_task())
+loop.run_until_complete(periodically_task())
 ```
 
 A complete example can be found in

{python_cqrs-2.6.1 → python_cqrs-3.0.1}/pyproject.toml

@@ -29,11 +29,12 @@ maintainers = [{name = "Vadim Kozyrevskiy", email = "vadikko2@mail.ru"}]
 name = "python-cqrs"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "2.6.1"
+version = "3.0.1"
 
 [project.optional-dependencies]
 dev = [
   # Develope tools
+  "pycln==2.5.0",
   "pre-commit==3.8.0",
   "pyright==1.1.377",
   "ruff==0.6.2",
@@ -60,6 +61,7 @@ protobuf = [
 ]
 
 [project.urls]
+Documentation = "https://vadikko2.github.io/python-cqrs-mkdocs/"
 Issues = "https://github.com/vadikko2/python-cqrs/issues"
 Repository = "https://github.com/vadikko2/python-cqrs"
 

{python_cqrs-2.6.1 → python_cqrs-3.0.1}/src/cqrs/events/event.py

@@ -8,16 +8,7 @@ import dotenv
 import pydantic
 
 logger = logging.getLogger("cqrs")
-
-try:
-    from google.protobuf.message import Message  # noqa
-except ImportError:
-    logger.warning(
-        "Please install protobuf dependencies with: `pip install python-cqrs[protobuf]`",
-    )
-
 dotenv.load_dotenv()
-
 DEFAULT_OUTPUT_TOPIC = os.getenv("DEFAULT_OUTPUT_TOPIC", "output_topic")
 
 
@@ -52,7 +43,7 @@ class NotificationEvent(Event, typing.Generic[_P], frozen=True):
 
     model_config = pydantic.ConfigDict(from_attributes=True)
 
-    def proto(self) -> "Message":
+    def proto(self):
         raise NotImplementedError("Method not implemented")
 
     def __hash__(self):

{python_cqrs-2.6.1 → python_cqrs-3.0.1}/src/cqrs/producer.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 import typing
 
@@ -17,20 +16,18 @@ class EventProducer:
     def __init__(
         self,
         message_broker: broker_protocol.MessageBroker,
-        repository: repository_protocol.OutboxedEventRepository | None = None,
+        repository: repository_protocol.OutboxedEventRepository,
     ):
         self.message_broker = message_broker
         self.repository = repository
 
-    async def periodically_task(
+    async def event_batch_generator(
         self,
         batch_size: int = 100,
-        wait_ms: int = 500,
-    ) -> None:
-        """Calls produce periodically with specified delay"""
+    ) -> typing.AsyncIterator[typing.List[repository_protocol.OutboxedEvent]]:
+        """Return messages for produce"""
         while True:
-            await asyncio.sleep(float(wait_ms) / 1000.0)
-            await self.produce_batch(batch_size)
+            yield await self.repository.get_many(batch_size)
 
     async def send_message(self, event: repository_protocol.OutboxedEvent):
         try:
@@ -60,17 +57,3 @@ class EventProducer:
                 event.id,
                 repository_protocol.EventStatus.PRODUCED,
             )
-
-    async def produce_batch(self, batch_size: int = 100) -> None:
-        if not self.repository:
-            logger.debug("Repository not found")
-            return
-        outboxed_events: typing.List[
-            repository_protocol.OutboxedEvent
-        ] = await self.repository.get_many(
-            batch_size,
-        )
-        logger.debug(f"Got {len(outboxed_events)} new events")
-        for event in outboxed_events:
-            await self.send_message(event)
-        await self.repository.commit()

{python_cqrs-2.6.1 → python_cqrs-3.0.1}/src/python_cqrs.egg-info/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: python-cqrs
-Version: 2.6.1
+Version: 3.0.1
 Summary: Python CQRS pattern implementation
 Author-email: Vadim Kozyrevskiy <vadikko2@mail.ru>, Dmitry Kutlubaev <kutlubaev00@mail.ru>
 Maintainer-email: Vadim Kozyrevskiy <vadikko2@mail.ru>
+Project-URL: Documentation, https://vadikko2.github.io/python-cqrs-mkdocs/
 Project-URL: Issues, https://github.com/vadikko2/python-cqrs/issues
 Project-URL: Repository, https://github.com/vadikko2/python-cqrs
 Classifier: Development Status :: 4 - Beta
@@ -23,6 +24,7 @@ Requires-Dist: sqlalchemy[asyncio]==2.0.*
 Requires-Dist: retry-async==0.1.4
 Requires-Dist: python-dotenv==1.0.1
 Provides-Extra: dev
+Requires-Dist: pycln==2.5.0; extra == "dev"
 Requires-Dist: pre-commit==3.8.0; extra == "dev"
 Requires-Dist: pyright==1.1.377; extra == "dev"
 Requires-Dist: ruff==0.6.2; extra == "dev"
@@ -234,7 +236,7 @@ from cqrs.message_brokers import kafka as kafka_broker
 
 
 producer = kafka_adapter.kafka_producer_factory(
-    dsn="localhost:9094",
+    dsn="localhost:9092",
     topics=["test.topic1", "test.topic2"],
 )
 broker = kafka_broker.KafkaMessageBroker(producer)
@@ -312,22 +314,34 @@ It can be utilized in conjunction with the KafkaMessageBroker.
 ```python
 import asyncio
 import cqrs
-from cqrs.message_brokers import kafka as kafka_broker
+from cqrs.message_brokers import kafka
+from cqrs.adapters import kafka as kafka_adapters
+from cqrs.compressors import zlib
 
 session_factory = async_sessionmaker(
-    create_async_engine(
-        f"mysql+asyncmy://{USER}:{PASSWORD}@{HOSTNAME}:{PORT}/{DATABASE}",
-        isolation_level="REPEATABLE READ",
-    )
+   create_async_engine(
+      f"mysql+asyncmy://{USER}:{PASSWORD}@{HOSTNAME}:{PORT}/{DATABASE}",
+      isolation_level="REPEATABLE READ",
+   )
 )
 
 broker = kafka.KafkaMessageBroker(
-  producer=kafka_adapters.kafka_producer_factory(dsn="localhost:9092"),
+   producer=kafka_adapters.kafka_producer_factory(dsn="localhost:9092"),
 )
 
-producer = cqrs.EventProducer(cqrs.SqlAlchemyOutboxedEventRepository(session_factory, zlib.ZlibCompressor()), broker)
+producer = cqrs.EventProducer(broker, cqrs.SqlAlchemyOutboxedEventRepository(session_factory, zlib.ZlibCompressor()))
+
+
+async def periodically_task():
+   async for messages in producer.event_batch_generator():
+      for message in messages:
+         await producer.send_message(message)
+      await producer.repository.commit()
+      await asyncio.sleep(10)
+
+
 loop = asyncio.get_event_loop()
-loop.run_until_complete(app.periodically_task())
+loop.run_until_complete(periodically_task())
 ```
 
 A complete example can be found in

{python_cqrs-2.6.1 → python_cqrs-3.0.1}/src/python_cqrs.egg-info/requires.txt

@@ -7,6 +7,7 @@ retry-async==0.1.4
 python-dotenv==1.0.1
 
 [dev]
+pycln==2.5.0
 pre-commit==3.8.0
 pyright==1.1.377
 ruff==0.6.2