taskiq-redis 1.0.4__tar.gz → 1.0.6__tar.gz

{taskiq_redis-1.0.4 → taskiq_redis-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: taskiq-redis
-Version: 1.0.4
+Version: 1.0.6
 Summary: Redis integration for taskiq
 Keywords: taskiq,tasks,distributed,async,redis,result_backend
 Author: taskiq-team

{taskiq_redis-1.0.4 → taskiq_redis-1.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "taskiq-redis"
-version = "1.0.4"
+version = "1.0.6"
 description = "Redis integration for taskiq"
 authors = ["taskiq-team <taskiq@norely.com>"]
 readme = "README.md"

{taskiq_redis-1.0.4 → taskiq_redis-1.0.6}/taskiq_redis/list_schedule_source.py

@@ -13,7 +13,7 @@ logger = getLogger("taskiq.redis_schedule_source")
 
 
 class ListRedisScheduleSource(ScheduleSource):
-    """Schecule source based on arrays."""
+    """Schedule source based on arrays."""
 
     def __init__(
         self,
@@ -21,13 +21,13 @@ class ListRedisScheduleSource(ScheduleSource):
         prefix: str = "schedule",
         max_connection_pool_size: Optional[int] = None,
         serializer: Optional[TaskiqSerializer] = None,
-        bufffer_size: int = 50,
+        buffer_size: int = 50,
         skip_past_schedules: bool = False,
         **connection_kwargs: Any,
     ) -> None:
         super().__init__()
         self._prefix = prefix
-        self._buffer_size = bufffer_size
+        self._buffer_size = buffer_size
         self._connection_pool = BlockingConnectionPool.from_url(
             url=url,
             max_connections=max_connection_pool_size,
@@ -185,11 +185,11 @@ class ListRedisScheduleSource(ScheduleSource):
         async with Redis(connection_pool=self._connection_pool) as redis:
             buffer = []
             crons = await redis.lrange(self._get_cron_key(), 0, -1)  # type: ignore
-            logger.debug("Got cron scheduleds: %s", crons)
+            logger.debug("Got %d cron schedules", len(crons))
             if crons:
                 buffer.extend(crons)
             timed.extend(await redis.lrange(self._get_time_key(current_time), 0, -1))  # type: ignore
-            logger.debug("Got timed scheduleds: %s", crons)
+            logger.debug("Got %d timed schedules", len(timed))
             if timed:
                 buffer.extend(timed)
             while buffer:

{taskiq_redis-1.0.4 → taskiq_redis-1.0.6}/taskiq_redis/redis_broker.py

@@ -164,7 +164,10 @@ class RedisStreamBroker(BaseRedisBroker):
         consumer_name: Optional[str] = None,
         consumer_id: str = "$",
         mkstream: bool = True,
-        xread_block: int = 10000,
+        xread_block: int = 2000,
+        maxlen: Optional[int] = None,
+        idle_timeout: int = 600000,  # 10 minutes
+        unacknowledged_batch_size: int = 100,
         additional_streams: Optional[Dict[str, str]] = None,
         **connection_kwargs: Any,
     ) -> None:
@@ -184,8 +187,12 @@ class RedisStreamBroker(BaseRedisBroker):
         :param mkstream: create stream if it does not exist.
         :param xread_block: block time in ms for xreadgroup.
             Better to set it to a bigger value, to avoid unnecessary calls.
+        :param maxlen: sets the maximum length of the stream
+            trims (the old values of) the stream each time a new element is added
         :param additional_streams: additional streams to read from.
             Each key is a stream name, value is a consumer id.
+        :param redeliver_timeout: time in ms to wait before redelivering a message.
+        :param unacknowledged_batch_size: number of unacknowledged messages to fetch.
         """
         super().__init__(
             url,
@@ -200,7 +207,10 @@ class RedisStreamBroker(BaseRedisBroker):
         self.consumer_id = consumer_id
         self.mkstream = mkstream
         self.block = xread_block
+        self.maxlen = maxlen
         self.additional_streams = additional_streams or {}
+        self.idle_timeout = idle_timeout
+        self.unacknowledged_batch_size = unacknowledged_batch_size
 
     async def _declare_consumer_group(self) -> None:
         """
@@ -235,7 +245,11 @@ class RedisStreamBroker(BaseRedisBroker):
         :param message: message to append.
         """
         async with Redis(connection_pool=self.connection_pool) as redis_conn:
-            await redis_conn.xadd(self.queue_name, {b"data": message.message})
+            await redis_conn.xadd(
+                self.queue_name,
+                {b"data": message.message},
+                maxlen=self.maxlen,
+            )
 
     def _ack_generator(self, id: str) -> Callable[[], Awaitable[None]]:
         async def _ack() -> None:
@@ -252,6 +266,7 @@ class RedisStreamBroker(BaseRedisBroker):
         """Listen to incoming messages."""
         async with Redis(connection_pool=self.connection_pool) as redis_conn:
             while True:
+                logger.debug("Starting fetching new messages")
                 fetched = await redis_conn.xreadgroup(
                     self.consumer_group_name,
                     self.consumer_name,
@@ -269,3 +284,29 @@ class RedisStreamBroker(BaseRedisBroker):
                             data=msg[b"data"],
                             ack=self._ack_generator(msg_id),
                         )
+                logger.debug("Starting fetching unacknowledged messages")
+                for stream in [self.queue_name, *self.additional_streams.keys()]:
+                    lock = redis_conn.lock(
+                        f"autoclaim:{self.consumer_group_name}:{stream}",
+                    )
+                    if await lock.locked():
+                        continue
+                    async with lock:
+                        pending = await redis_conn.xautoclaim(
+                            name=stream,
+                            groupname=self.consumer_group_name,
+                            consumername=self.consumer_name,
+                            min_idle_time=self.idle_timeout,
+                            count=self.unacknowledged_batch_size,
+                        )
+                        logger.debug(
+                            "Found %d pending messages in stream %s",
+                            len(pending),
+                            stream,
+                        )
+                        for msg_id, msg in pending[1]:
+                            logger.debug("Received message: %s", msg)
+                            yield AckableMessage(
+                                data=msg[b"data"],
+                                ack=self._ack_generator(msg_id),
+                            )