buz 2.15.2__py3-none-any.whl → 2.15.4__py3-none-any.whl

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/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/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/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/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/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)

{buz-2.15.2.dist-info → buz-2.15.4.dist-info}/METADATA

@@ -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.dist-info → buz-2.15.4.dist-info}/RECORD

@@ -57,10 +57,11 @@ buz/event/infrastructure/buz_kafka/consume_strategy/kafka_on_fail_strategy.py,sh
 buz/event/infrastructure/buz_kafka/consume_strategy/topic_and_subscription_group_per_subscriber_kafka_consumer_strategy.py,sha256=LX9mARKCLKyyo4loxegxR_s4qNP1QfabXXYp4Keusts,634
 buz/event/infrastructure/buz_kafka/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 buz/event/infrastructure/buz_kafka/exceptions/kafka_event_bus_config_not_valid_exception.py,sha256=VUKZXA2ygjg21P4DADFl_Tace6RwSXia1MRYvJypxbM,135
+buz/event/infrastructure/buz_kafka/exceptions/max_consumer_retry_exception.py,sha256=5O33uUC8FLILY1C13tQwkfsLSXrmbe0vMaUfBmOuXdU,264
 buz/event/infrastructure/buz_kafka/exceptions/retry_exception.py,sha256=Fq9kvI3DpFsGD3x2icmQ1fYIsuKZAFqI3tCibAuEtSQ,441
-buz/event/infrastructure/buz_kafka/kafka_event_async_subscriber_executor.py,sha256=wJ7hxf5k1YWOkUpkUSmMMWrXLTCt94-QHkIRDfM5YuI,5566
+buz/event/infrastructure/buz_kafka/kafka_event_async_subscriber_executor.py,sha256=KDJjeY1z8ZJGKGmEUB7OxknenBCI0o0WkgcNkNmQITU,6804
 buz/event/infrastructure/buz_kafka/kafka_event_subscriber_executor.py,sha256=EyG2vsFYErWAyqxdXqSwxx5Zi_y0d6i0h05XavJMnxg,254
-buz/event/infrastructure/buz_kafka/kafka_event_sync_subscriber_executor.py,sha256=S9ECzWpUQm7YKEtOFuzZMZvRVaiAMyMVfNksJ7Jno9A,5600
+buz/event/infrastructure/buz_kafka/kafka_event_sync_subscriber_executor.py,sha256=tuK9gHJXuGwHtfjYNEoLi-aKOGv_YjOeqPg_1zns7NM,6849
 buz/event/infrastructure/buz_kafka/publish_strategy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 buz/event/infrastructure/buz_kafka/publish_strategy/publish_strategy.py,sha256=zIkgMnUU7ueG6QHEubMzdTHOtqdldIbS7k5FDLNmqVk,178
 buz/event/infrastructure/buz_kafka/publish_strategy/topic_per_event_kafka_publish_strategy.py,sha256=aLKj6GyLJNcMbuDA1QBa-RzWKBHEorBuPFkkqo_H60k,405
@@ -103,10 +104,10 @@ buz/event/strategies/execution_strategy/cyclic_iterator_execution_strategy.py,sh
 buz/event/strategies/execution_strategy/execution_strategy.py,sha256=sbr4N8Q19lWLrafh0obLitn8dJ-SahXgSV8aMKEP_LM,192
 buz/event/strategies/execution_strategy/self_process_execution_strategy.py,sha256=fE3qRF_nHAkiDXltKloj06--DPKpiZQcvNBVw1u-Hmo,385
 buz/event/strategies/retry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-buz/event/strategies/retry/consume_retrier.py,sha256=DE8zxK5eSiimozq3tcRhOjZHjGM6nUKUIc0ygBtQcyg,421
+buz/event/strategies/retry/consume_retrier.py,sha256=aXVXGahKBBRAuxz-24TTcRFR9_0aZGOO8bVBvujsmpw,545
 buz/event/strategies/retry/consumed_event_retry.py,sha256=sjRoSymBexiGTgh6g8V5ThzTCHiyrvE3WlMEFqcNZfY,205
-buz/event/strategies/retry/consumed_event_retry_repository.py,sha256=2LP2qEdrT69yVRGpBWQCCXQHWUobHPxUkShnzkLzTMQ,543
-buz/event/strategies/retry/max_retries_consume_retrier.py,sha256=6D5g5yknHFXAxpanisaIN8Rm8DECQbNhqPPRUeKI5G8,1579
+buz/event/strategies/retry/consumed_event_retry_repository.py,sha256=Udls0pJEEXuizGG1-aGhnJ8RArD82MGOPU70Cizk1QI,659
+buz/event/strategies/retry/max_retries_consume_retrier.py,sha256=hY-DrAI8MRZKDUHraY2nSsQHcUo50jzLwBZrmvN3L5I,1743
 buz/event/strategies/retry/max_retries_negative_exception.py,sha256=UdM5T4cxRv_at9GmNZXaE7Lcf6zX6jd7uaUAkBD9qvU,230
 buz/event/strategies/retry/reject_callback.py,sha256=TnmUt0AkB2DEQMieec9TtB7IAkRHdFAFepAclbiCRns,316
 buz/event/subscriber.py,sha256=WxppO8PFP5zO-gwLZNg1DKSY_uFdsF8JgWIJa6nTTds,237
@@ -249,7 +250,7 @@ buz/serializer/message_to_json_bytes_serializer.py,sha256=RGZJ64t4t4Pz2FCASZZCv-
 buz/wrapper/__init__.py,sha256=GnRdJFcncn-qp0hzDG9dBHLmTJSbHFVjE_yr-MdW_n4,77
 buz/wrapper/async_to_sync.py,sha256=OfK-vrVUhuN-LLLvekLdMbQYtH0ue5lfbvuasj6ovMI,698
 buz/wrapper/event_loop.py,sha256=pfBJ1g-8A2a3YgW8Gf9Fg0kkewoh3-wgTy2KIFDyfHk,266
-buz-2.15.2.dist-info/LICENSE,sha256=Jytu2S-2SPEgsB0y6BF-_LUxIWY7402fl0JSh36TLZE,1062
-buz-2.15.2.dist-info/METADATA,sha256=vJLWjCrVTn6AdIIQ1IJZv3jUlrPg0Kfp4O05HCaggMc,1659
-buz-2.15.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-buz-2.15.2.dist-info/RECORD,,
+buz-2.15.4.dist-info/LICENSE,sha256=Jytu2S-2SPEgsB0y6BF-_LUxIWY7402fl0JSh36TLZE,1062
+buz-2.15.4.dist-info/METADATA,sha256=Bmkw2uK83S8-3WW0oRhfpqlmofc98Zw0n1ipjyGTwr0,1659
+buz-2.15.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+buz-2.15.4.dist-info/RECORD,,