buz 2.15.9__tar.gz → 2.15.10rc2__tar.gz

{buz-2.15.9 → buz-2.15.10rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buz
-Version: 2.15.9
+Version: 2.15.10rc2
 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.9 → buz-2.15.10rc2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "buz"
-version = "2.15.9"
+version = "2.15.10-rc2"
 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.9 → buz-2.15.10rc2}/src/buz/event/infrastructure/buz_kafka/base_buz_aiokafka_async_consumer.py

@@ -374,8 +374,7 @@ class BaseBuzAIOKafkaAsyncConsumer(AsyncConsumer):
         self._logger.info("Worker stop requested. Waiting for finalize the current task")
 
     async def __manage_kafka_consumers_stopping(self) -> None:
-        for kafka_consumer in self.__queue_per_consumer_mapper.keys():
-            await kafka_consumer.stop()
+        await gather(*[kafka_consumer.stop() for kafka_consumer in self.__queue_per_consumer_mapper.keys()])
 
     async def __health_check(self) -> web.Response:
         health_information = {

{buz-2.15.9 → buz-2.15.10rc2}/src/buz/kafka/infrastructure/aiokafka/aiokafka_consumer.py

@@ -4,7 +4,7 @@ import asyncio
 from logging import Logger
 from typing import Awaitable, Callable, Optional, Sequence, cast
 
-from aiokafka import AIOKafkaConsumer as AIOKafkaNativeConsumer, TopicPartition, OffsetAndMetadata
+from aiokafka import AIOKafkaConsumer as AIOKafkaNativeConsumer, ConsumerRecord, TopicPartition, OffsetAndMetadata
 from aiokafka.helpers import create_ssl_context
 
 from buz.event.infrastructure.buz_kafka.exceptions.kafka_event_bus_config_not_valid_exception import (
@@ -26,6 +26,7 @@ from buz.kafka.infrastructure.aiokafka.translators.consumer_initial_offset_posit
 
 class AIOKafkaConsumer:
     __DEFAULT_POLL_TIMEOUT_MS = 0
+    __DEFAULT_ASYNC_FUNCTION_TIMEOUT_MS = 3000
 
     def __init__(
         self,
@@ -107,7 +108,7 @@ class AIOKafkaConsumer:
             ),
             session_timeout_ms=self.__session_timeout_ms,
             heartbeat_interval_ms=self.__heartbeat_interval_ms,
-            partition_assignment_strategy=list(self.__partition_assignors),
+            # partition_assignment_strategy=list(self.__partition_assignors),
             max_poll_interval_ms=self.__max_poll_interval_ms,
             rebalance_timeout_ms=self.__max_poll_interval_ms,
         )
@@ -177,14 +178,15 @@ class AIOKafkaConsumer:
     async def poll(
         self,
         *,
-        timeout_ms: int = __DEFAULT_POLL_TIMEOUT_MS,
         number_of_messages_to_poll: Optional[int] = None,
     ) -> list[KafkaPollRecord]:
-        poll_results = await self.__consumer.getmany(
-            timeout_ms=timeout_ms,
+        poll_results = await self.__get_many(
             max_records=number_of_messages_to_poll,
         )
 
+        if poll_results is None:
+            return []
+
         results = [
             cast(KafkaPollRecord, consumer_record)
             for consumer_records in poll_results.values()
@@ -193,6 +195,19 @@ class AIOKafkaConsumer:
 
         return results
 
+    async def __get_many(
+        self,
+        max_records: Optional[int] = None,
+    ) -> Optional[dict[TopicPartition, list[ConsumerRecord]]]:
+        try:
+            return await asyncio.wait_for(
+                self.__consumer.getmany(timeout_ms=self.__DEFAULT_POLL_TIMEOUT_MS, max_records=max_records),
+                timeout=self.__DEFAULT_ASYNC_FUNCTION_TIMEOUT_MS / 1000,
+            )
+        except asyncio.TimeoutError:
+            self.__logger.debug("Timeout while polling")
+            return None
+
     async def commit_poll_record(self, poll_record: KafkaPollRecord) -> None:
         topic_partition = TopicPartition(topic=poll_record.topic, partition=poll_record.partition)
         offset = {topic_partition: OffsetAndMetadata(poll_record.offset + 1, "")}
@@ -201,4 +216,13 @@ class AIOKafkaConsumer:
 
     async def stop(self) -> None:
         self.__logger.info(f"Closing connection of consumer with group_id={self.__consumer_group}")
-        await self.__consumer.stop()
+
+        self.__consumer.unsubscribe()
+
+        try:
+            await asyncio.wait_for(
+                self.__consumer.stop(),
+                timeout=self.__DEFAULT_ASYNC_FUNCTION_TIMEOUT_MS / 1000,
+            )
+        except asyncio.TimeoutError:
+            self.__logger.debug("Timeout while stopping consumer")