buz 2.15.3__tar.gz → 2.15.5__tar.gz

{buz-2.15.3 → buz-2.15.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buz
-Version: 2.15.3
+Version: 2.15.5
 Summary: Buz is a set of light, simple and extensible implementations of event, command and query buses.
 License: MIT
 Author: Luis Pintado Lozano
@@ -25,7 +25,6 @@ Provides-Extra: pypendency
 Requires-Dist: aiohttp (>=3.11.13,<4.0.0)
 Requires-Dist: aiokafka[lz4] (==0.12.0) ; extra == "aiokafka"
 Requires-Dist: asgiref (>=3.8.1,<4.0.0) ; extra == "aiokafka"
-Requires-Dist: asyncio (>=3.4.3,<4.0.0) ; extra == "aiokafka"
 Requires-Dist: cachetools (>=5.5.0,<6.0.0)
 Requires-Dist: dacite (>=1.8.1,<2.0.0)
 Requires-Dist: kafka-python-ng (==2.2.3)

{buz-2.15.3 → buz-2.15.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "buz"
-version = "2.15.3"
+version = "2.15.5"
 description = "Buz is a set of light, simple and extensible implementations of event, command and query buses."
 readme = "README.md"
 authors = ["Luis Pintado Lozano <luis.pintado.lozano@gmail.com>", "Gerardo Parra <gprauxiliar@gmail.com>"]
@@ -27,7 +27,6 @@ pympler = {version = "== 1.0.1"}
 kafka-python-ng= "2.2.3"
 uuid-utils = "^0.9.0"
 dacite = "^1.8.1"
-asyncio = { version ="^3.4.3", optional = true }
 aiokafka = {version = "==0.12.0", extras = ["lz4"], optional = true}
 asgiref = {version = "^3.8.1", optional = true}
 cachetools = "^5.5.0"
@@ -44,7 +43,7 @@ types-cachetools = "^5.5.0.20240820"
 [tool.poetry.extras]
 pypendency = ["pypendency"]
 kombu = ["kombu"]
-aiokafka = ["asyncio", "asgiref", "aiokafka"]
+aiokafka = ["asgiref", "aiokafka"]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

buz-2.15.5/src/buz/event/infrastructure/buz_kafka/exceptions/max_consumer_retry_exception.py

@@ -0,0 +1,8 @@
+class MaxConsumerRetryException(Exception):
+    def __init__(
+        self,
+        *,
+        event_id: str,
+        subscriber_fqn: str,
+    ) -> None:
+        super().__init__(f"Max retries reached, discarding event {event_id} for subscriber {subscriber_fqn}")

{buz-2.15.3 → buz-2.15.5}/src/buz/event/infrastructure/buz_kafka/kafka_event_async_subscriber_executor.py

@@ -5,6 +5,7 @@ from typing import Optional, Sequence, cast
 from buz.event import Event
 from buz.event.async_subscriber import AsyncSubscriber
 from buz.event.infrastructure.buz_kafka.consume_strategy.kafka_on_fail_strategy import KafkaOnFailStrategy
+from buz.event.infrastructure.buz_kafka.exceptions.max_consumer_retry_exception import MaxConsumerRetryException
 from buz.event.infrastructure.buz_kafka.exceptions.retry_exception import ConsumerRetryException
 from buz.event.infrastructure.buz_kafka.kafka_event_subscriber_executor import KafkaEventSubscriberExecutor
 from buz.event.middleware.async_consume_middleware import AsyncConsumeMiddleware
@@ -78,8 +79,30 @@ class KafkaEventAsyncSubscriberExecutor(KafkaEventSubscriberExecutor):
         )
 
     async def __perform_consume(self, event: Event, subscriber: AsyncSubscriber) -> None:
-        should_retry = True
         number_of_executions = 0
+        should_retry = True
+
+        if self.__consume_retrier is not None:
+            should_retry = self.__consume_retrier.should_retry(event, [subscriber])
+
+        if should_retry is False:
+            max_retry_exception = MaxConsumerRetryException(
+                event_id=event.id,
+                subscriber_fqn=subscriber.fqn(),
+            )
+
+            if self.__on_fail_strategy == KafkaOnFailStrategy.STOP_ON_FAIL:
+                raise max_retry_exception
+
+            self.__logger.warning(
+                f"The event {event.id} with the subscriber {subscriber.fqn()} has reach the max number of retries, it will be consumed but not processed"
+            )
+
+            if self.__reject_callback is not None:
+                self.__reject_callback.on_reject(event=event, subscribers=[subscriber], exception=max_retry_exception)
+
+            return
+
         while should_retry is True:
             try:
                 self.__register_retry(event, subscriber)
@@ -102,7 +125,7 @@ class KafkaEventAsyncSubscriberExecutor(KafkaEventSubscriberExecutor):
 
                 self.__logger.exception(exception)
 
-                if self.__reject_callback:
+                if self.__reject_callback is not None:
                     self.__reject_callback.on_reject(event=event, subscribers=[subscriber], exception=exception)
 
                 if self.__on_fail_strategy == KafkaOnFailStrategy.STOP_ON_FAIL:

{buz-2.15.3 → buz-2.15.5}/src/buz/event/infrastructure/buz_kafka/kafka_event_sync_subscriber_executor.py

@@ -4,6 +4,7 @@ import time
 from typing import Optional, Sequence, cast
 from buz.event import Event
 from buz.event.infrastructure.buz_kafka.consume_strategy.kafka_on_fail_strategy import KafkaOnFailStrategy
+from buz.event.infrastructure.buz_kafka.exceptions.max_consumer_retry_exception import MaxConsumerRetryException
 from buz.event.infrastructure.buz_kafka.exceptions.retry_exception import ConsumerRetryException
 from buz.event.infrastructure.buz_kafka.kafka_event_subscriber_executor import KafkaEventSubscriberExecutor
 from buz.event.middleware.consume_middleware import ConsumeMiddleware
@@ -82,12 +83,34 @@ class KafkaEventSyncSubscriberExecutor(KafkaEventSubscriberExecutor):
         )
 
     def __perform_consume(self, event: Event, subscriber: Subscriber) -> None:
+        number_of_executions = 0
         should_retry = True
-        execution_number = 0
+
+        if self.__consume_retrier is not None:
+            should_retry = self.__consume_retrier.should_retry(event, [subscriber])
+
+        if should_retry is False:
+            max_retry_exception = MaxConsumerRetryException(
+                event_id=event.id,
+                subscriber_fqn=subscriber.fqn(),
+            )
+
+            if self.__on_fail_strategy == KafkaOnFailStrategy.STOP_ON_FAIL:
+                raise max_retry_exception
+
+            self.__logger.warning(
+                f"The event {event.id} with the subscriber {subscriber.fqn()} has reach the max number of retries, it will be consumed but not processed"
+            )
+
+            if self.__reject_callback is not None:
+                self.__reject_callback.on_reject(event=event, subscribers=[subscriber], exception=max_retry_exception)
+
+            return
+
         while should_retry is True:
             try:
                 self.__register_retry(event, subscriber)
-                execution_number += 1
+                number_of_executions += 1
                 subscriber.consume(event)
                 self.__clean_retries(event, subscriber)
                 return
@@ -95,7 +118,7 @@ class KafkaEventSyncSubscriberExecutor(KafkaEventSubscriberExecutor):
                 if self.__should_retry(event, subscriber) is True:
                     self.__logger.warning(
                         ConsumerRetryException(
-                            number_of_executions=execution_number,
+                            number_of_executions=number_of_executions,
                             event_id=event.id,
                             subscriber_fqn=subscriber.fqn(),
                         ),
@@ -106,7 +129,7 @@ class KafkaEventSyncSubscriberExecutor(KafkaEventSubscriberExecutor):
 
                 self.__logger.exception(exception)
 
-                if self.__reject_callback:
+                if self.__reject_callback is not None:
                     self.__reject_callback.on_reject(event=event, subscribers=[subscriber], exception=exception)
 
                 if self.__on_fail_strategy == KafkaOnFailStrategy.STOP_ON_FAIL: