buz 2.15.2__tar.gz → 2.15.4__tar.gz

{buz-2.15.2 → buz-2.15.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buz
-Version: 2.15.2
+Version: 2.15.4
 Summary: Buz is a set of light, simple and extensible implementations of event, command and query buses.
 License: MIT
 Author: Luis Pintado Lozano

{buz-2.15.2 → buz-2.15.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "buz"
-version = "2.15.2"
+version = "2.15.4"
 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>"]

buz-2.15.4/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.2 → buz-2.15.4}/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,12 +79,36 @@ 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)
                 number_of_executions += 1
                 await subscriber.consume(event)
+                self.__clean_retry(event, subscriber)
                 return
             except Exception as exception:
                 if self.__should_retry(event, subscriber) is True:
@@ -95,13 +120,12 @@ class KafkaEventAsyncSubscriberExecutor(KafkaEventSubscriberExecutor):
                         ),
                         exc_info=exception,
                     )
-                    self.__register_retry(event, subscriber)
                     await sleep(self.__seconds_between_retires)
                     continue
 
                 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:
@@ -120,3 +144,9 @@ class KafkaEventAsyncSubscriberExecutor(KafkaEventSubscriberExecutor):
             return None
 
         return self.__consume_retrier.register_retry(event, [subscriber])
+
+    def __clean_retry(self, event: Event, subscriber: AsyncSubscriber) -> None:
+        if self.__consume_retrier is None:
+            return None
+
+        return self.__consume_retrier.clean_retries(event, [subscriber])

{buz-2.15.2 → buz-2.15.4}/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,30 +83,53 @@ 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:
-                execution_number += 1
+                self.__register_retry(event, subscriber)
+                number_of_executions += 1
                 subscriber.consume(event)
+                self.__clean_retries(event, subscriber)
                 return
             except Exception as exception:
                 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(),
                         ),
                         exc_info=exception,
                     )
-                    self.__register_retry(event, subscriber)
                     time.sleep(self.__seconds_between_retires)
                     continue
 
                 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:
@@ -124,3 +148,9 @@ class KafkaEventSyncSubscriberExecutor(KafkaEventSubscriberExecutor):
             return None
 
         return self.__consume_retrier.register_retry(event, [subscriber])
+
+    def __clean_retries(self, event: Event, subscriber: Subscriber) -> None:
+        if self.__consume_retrier is None:
+            return None
+
+        return self.__consume_retrier.clean_retries(event, [subscriber])

{buz-2.15.2 → buz-2.15.4}/src/buz/event/strategies/retry/consume_retrier.py

@@ -12,3 +12,7 @@ class ConsumeRetrier(ABC):
     @abstractmethod
     def register_retry(self, event: Event, subscribers: Sequence[MetaSubscriber]) -> None:
         pass
+
+    @abstractmethod
+    def clean_retries(self, event: Event, subscribers: Sequence[MetaSubscriber]) -> None:
+        pass

{buz-2.15.2 → buz-2.15.4}/src/buz/event/strategies/retry/consumed_event_retry_repository.py

@@ -17,3 +17,7 @@ class ConsumedEventRetryRepository(ABC):
         self, event: Event, subscribers: Sequence[MetaSubscriber]
     ) -> ConsumedEventRetry:
         pass
+
+    @abstractmethod
+    def clean(self, event: Event, subscribers: Sequence[MetaSubscriber]) -> None:
+        pass

{buz-2.15.2 → buz-2.15.4}/src/buz/event/strategies/retry/max_retries_consume_retrier.py

@@ -35,3 +35,6 @@ class MaxRetriesConsumeRetrier(ConsumeRetrier):
         )
         consumed_event_retry.register_retry()
         self.__consumed_event_retry_repository.save(consumed_event_retry)
+
+    def clean_retries(self, event: Event, subscribers: Sequence[MetaSubscriber]) -> None:
+        self.__consumed_event_retry_repository.clean(event, subscribers)