buz 2.15.2__tar.gz → 2.15.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buz
-Version: 2.15.2
+Version: 2.15.3
 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.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "buz"
-version = "2.15.2"
+version = "2.15.3"
 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.2 → buz-2.15.3}/src/buz/event/infrastructure/buz_kafka/kafka_event_async_subscriber_executor.py

@@ -82,8 +82,10 @@ class KafkaEventAsyncSubscriberExecutor(KafkaEventSubscriberExecutor):
         number_of_executions = 0
         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,7 +97,6 @@ class KafkaEventAsyncSubscriberExecutor(KafkaEventSubscriberExecutor):
                         ),
                         exc_info=exception,
                     )
-                    self.__register_retry(event, subscriber)
                     await sleep(self.__seconds_between_retires)
                     continue
 
@@ -120,3 +121,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.3}/src/buz/event/infrastructure/buz_kafka/kafka_event_sync_subscriber_executor.py

@@ -86,8 +86,10 @@ class KafkaEventSyncSubscriberExecutor(KafkaEventSubscriberExecutor):
         execution_number = 0
         while should_retry is True:
             try:
+                self.__register_retry(event, subscriber)
                 execution_number += 1
                 subscriber.consume(event)
+                self.__clean_retries(event, subscriber)
                 return
             except Exception as exception:
                 if self.__should_retry(event, subscriber) is True:
@@ -99,7 +101,6 @@ class KafkaEventSyncSubscriberExecutor(KafkaEventSubscriberExecutor):
                         ),
                         exc_info=exception,
                     )
-                    self.__register_retry(event, subscriber)
                     time.sleep(self.__seconds_between_retires)
                     continue
 
@@ -124,3 +125,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.3}/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.3}/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.3}/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)