taskiq-redis 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

taskiq_redis/list_schedule_source.py

@@ -85,6 +85,9 @@ class ListRedisScheduleSource(ScheduleSource):
         """Get the key for a cron-based schedule."""
         return f"{self._prefix}:cron"
 
+    def _get_interval_key(self) -> str:
+        return f"{self._prefix}:interval"
+
     def _get_data_key(self, schedule_id: str) -> str:
         """Get the key for a schedule data."""
         return f"{self._prefix}:data:{schedule_id}"
@@ -150,6 +153,8 @@ class ListRedisScheduleSource(ScheduleSource):
                 elif schedule.time is not None:
                     time_key = self._get_time_key(schedule.time)
                     await redis.lrem(time_key, 0, schedule_id)  # type: ignore[misc]
+                elif schedule.interval:
+                    await redis.lrem(self._get_interval_key(), 0, schedule_id)  # type: ignore[misc]
 
     async def add_schedule(self, schedule: "ScheduledTask") -> None:
         """Add a schedule to the source."""
@@ -169,6 +174,11 @@ class ListRedisScheduleSource(ScheduleSource):
                     self._get_time_key(schedule.time),
                     schedule.schedule_id,
                 )
+            elif schedule.interval:
+                await redis.rpush(  # type: ignore[misc]
+                    self._get_interval_key(),
+                    schedule.schedule_id,
+                )
 
     async def post_send(self, task: ScheduledTask) -> None:
         """Delete a task after it's completed."""
@@ -199,6 +209,10 @@ class ListRedisScheduleSource(ScheduleSource):
             logger.debug("Got %d cron schedules", len(crons))
             if crons:
                 buffer.extend(crons)
+            intervals = await redis.lrange(self._get_interval_key(), 0, -1)  # type: ignore[misc]
+            logger.debug("Got %d interval schedules", len(intervals))
+            if intervals:
+                buffer.extend(intervals)
             timed.extend(await redis.lrange(self._get_time_key(current_time), 0, -1))  # type: ignore[misc]
             logger.debug("Got %d timed schedules", len(timed))
             if timed:

taskiq_redis/redis_broker.py

@@ -161,6 +161,7 @@ class RedisStreamBroker(BaseRedisBroker):
         approximate: bool = True,
         idle_timeout: int = 600000,  # 10 minutes
         unacknowledged_batch_size: int = 100,
+        unacknowledged_lock_timeout: float | None = None,
         xread_count: int | None = 100,
         additional_streams: dict[str, str | int] | None = None,
         **connection_kwargs: Any,
@@ -188,8 +189,10 @@ class RedisStreamBroker(BaseRedisBroker):
         :param xread_count: number of messages to fetch from the stream at once.
         :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.
+        :param unacknowledged_lock_timeout: time in seconds before auto-releasing
+            the lock. Useful when the worker crashes or gets killed.
+            If not set, the lock can remain locked indefinitely.
         """
         super().__init__(
             url,
@@ -209,6 +212,7 @@ class RedisStreamBroker(BaseRedisBroker):
         self.additional_streams = additional_streams or {}
         self.idle_timeout = idle_timeout
         self.unacknowledged_batch_size = unacknowledged_batch_size
+        self.unacknowledged_lock_timeout = unacknowledged_lock_timeout
         self.count = xread_count
 
     async def _declare_consumer_group(self) -> None:
@@ -290,6 +294,7 @@ class RedisStreamBroker(BaseRedisBroker):
                 for stream in [self.queue_name, *self.additional_streams.keys()]:
                     lock = redis_conn.lock(
                         f"autoclaim:{self.consumer_group_name}:{stream}",
+                        timeout=self.unacknowledged_lock_timeout,
                     )
                     if await lock.locked():
                         continue

{taskiq_redis-1.2.0.dist-info → taskiq_redis-1.2.2.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: taskiq-redis
-Version: 1.2.0
+Version: 1.2.2
 Summary: Redis integration for taskiq
-Keywords: taskiq,tasks,distributed,async,redis,result_backend
+Keywords: async,distributed,redis,result_backend,taskiq,tasks
 Author: Taskiq team
 Author-email: Taskiq team <taskiq@no-reply.com>
 License-Expression: MIT
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: redis>=7.0.0,<7.1.0
+Requires-Dist: redis>=7.0.0,<8
 Requires-Dist: taskiq>=0.12.0
 Maintainer: Taskiq team
 Maintainer-email: Taskiq team <taskiq@no-reply.com>

{taskiq_redis-1.2.0.dist-info → taskiq_redis-1.2.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 taskiq_redis/__init__.py,sha256=Sl4m9rKxweU1t0m289Qtf0qm4xSSkkFHoOfKq6qaz6g,1192
 taskiq_redis/exceptions.py,sha256=7buBJ7CRVWd5WqVqSjtHO8cVL7QzZg-DOM3nB87t-Sk,738
-taskiq_redis/list_schedule_source.py,sha256=Jam7XuobaJS4f0cou64hq92bZURo-eMU5rcR_0ktSso,9931
+taskiq_redis/list_schedule_source.py,sha256=Z7YHKUPpdiEc2yu5eskSL7cVsJ-IZgDagEEm5aj8QUU,10589
 taskiq_redis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskiq_redis/redis_backend.py,sha256=0d9prosVA85nbu8xBYfmhVW0szjtVmEbG5k6vUCkvtg,19639
-taskiq_redis/redis_broker.py,sha256=ybOG5UzZV9DK_Gf4iS2kTmnVSJrZuw5lv_NtcHTiwuM,12260
+taskiq_redis/redis_broker.py,sha256=1n8skcqFK2D1HdWPZ-KtyElry_QHDFlnFpvoslZ5Yig,12587
 taskiq_redis/redis_cluster_broker.py,sha256=s3UCePRP8C61ABXJmf_aqGXB2FgKnPIJzDfNb-YvAKE,7271
 taskiq_redis/redis_sentinel_broker.py,sha256=5NjsABhyjBfdeaIKxIoiEuuyfIHMgKC0DzIIF6QfAY8,9541
 taskiq_redis/schedule_source.py,sha256=rVdHmAyFaO35jEoHCR7dZxSgWjvCUT0zGabzB1_Algo,9999
-taskiq_redis-1.2.0.dist-info/licenses/LICENSE,sha256=lEHEEE-ZxmuItxYgUMPiFWdRcAITxE8DFMNyAg4eOYE,1075
-taskiq_redis-1.2.0.dist-info/WHEEL,sha256=93kfTGt3a0Dykt_T-gsjtyS5_p8F_d6CE1NwmBOirzo,79
-taskiq_redis-1.2.0.dist-info/METADATA,sha256=SCWfsKXPElRhEtjaqJkG8z6dpkoaARvpLjGS2KgPReY,7163
-taskiq_redis-1.2.0.dist-info/RECORD,,
+taskiq_redis-1.2.2.dist-info/licenses/LICENSE,sha256=lEHEEE-ZxmuItxYgUMPiFWdRcAITxE8DFMNyAg4eOYE,1075
+taskiq_redis-1.2.2.dist-info/WHEEL,sha256=5DEXXimM34_d4Gx1AuF9ysMr1_maoEtGKjaILM3s4w4,80
+taskiq_redis-1.2.2.dist-info/METADATA,sha256=23OZwbDrTHTtM1lv17BWKS2YoV7_hJj2Xi9udnwLCCI,7159
+taskiq_redis-1.2.2.dist-info/RECORD,,

{taskiq_redis-1.2.0.dist-info → taskiq_redis-1.2.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.16
+Generator: uv 0.9.29
 Root-Is-Purelib: true
-Tag: py3-none-any
+Tag: py3-none-any