taskiq-redis 1.2.0__tar.gz → 1.2.2__tar.gz

{taskiq_redis-1.2.0 → taskiq_redis-1.2.2}/PKG-INFO

@@ -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.2/pyproject.toml

@@ -0,0 +1,155 @@
+[project]
+name = "taskiq-redis"
+version = "1.2.2"
+description = "Redis integration for taskiq"
+readme = "README.md"
+requires-python = ">=3.10"
+license = "MIT"
+license-files = ["LICENSE"]
+authors = [{ name = "Taskiq team", email = "taskiq@no-reply.com" }]
+maintainers = [{ name = "Taskiq team", email = "taskiq@no-reply.com" }]
+keywords = [
+  "async",
+  "distributed",
+  "redis",
+  "result_backend",
+  "taskiq",
+  "tasks",
+]
+classifiers = [
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+]
+dependencies = [
+  "redis>=7.0.0,<8",  # TODO: fix issues in tests with 7.1.0
+  "taskiq>=0.12.0",
+]
+
+[project.urls]
+homepage = "https://github.com/taskiq-python/taskiq-redis"
+repository = "https://github.com/taskiq-python/taskiq-redis"
+
+[dependency-groups]
+dev = [
+  "pre-commit>=4.5.0",
+  { include-group = "lint" },
+  { include-group = "test" },
+]
+lint = [
+  "black>=25.11.0",
+  "mypy>=1.19.0",
+  "ruff>=0.14.7",
+]
+test = [
+  "fakeredis>=2.32.1",
+  "freezegun>=1.5.5",
+  "pytest>=9.0.1",
+  "pytest-cov>=7.0.0",
+  "pytest-env>=1.2.0",
+  "pytest-xdist>=3.8.0",
+]
+
+[build-system]
+requires = ["uv_build>=0.9.13,<0.10.0"]
+build-backend = "uv_build"
+
+[tool.mypy]
+strict = true
+ignore_missing_imports = true
+allow_subclassing_any = true
+allow_untyped_calls = true
+pretty = true
+show_error_codes = true
+implicit_reexport = true
+allow_untyped_decorators = true
+warn_return_any = false
+
+[[tool.mypy.overrides]]
+module = ["redis"]
+ignore_missing_imports = true
+ignore_errors = true
+strict = false
+
+[tool.pytest.ini_options]
+filterwarnings = [
+  # about deprecated RedisScheduleSource usage - delete after removing RedisScheduleSource
+  "ignore:RedisScheduleSource is deprecated:DeprecationWarning",
+]
+
+[tool.ruff]
+# List of enabled rulsets.
+# See https://docs.astral.sh/ruff/rules/ for more information.
+lint.select = [
+  "E",  # Error
+  "F",  # Pyflakes
+  "W",  # Pycodestyle
+  "C90",  # McCabe complexity
+  "I",  # Isort
+  "N",  # pep8-naming
+  "D",  # Pydocstyle
+  "ANN",  # Pytype annotations
+  "S",  # Bandit
+  "B",  # Bugbear
+  "COM",  # Commas
+  "C4",  # Comprehensions
+  "ISC",  # Implicit string concat
+  "PIE",  # Unnecessary code
+  "T20",  # Catch prints
+  "PYI",  # validate pyi files
+  "Q",  # Checks for quotes
+  "RSE",  # Checks raise statements
+  "RET",  # Checks return statements
+  "SLF",  # Self checks
+  "SIM",  # Simplificator
+  "PTH",  # Pathlib checks
+  "ERA",  # Checks for commented out code
+  "PL",  # PyLint checks
+  "RUF",  # Specific to Ruff checks
+  "FA102",  # Future annotations
+  "UP",  # Pyupgrade
+]
+lint.ignore = [
+  "D105",  # Missing docstring in magic method
+  "D107",  # Missing docstring in __init__
+  "D212",  # Multi-line docstring summary should start at the first line
+  "D401",  # First line should be in imperative mood
+  "D104",  # Missing docstring in public package
+  "D100",  # Missing docstring in public module
+  "ANN401",  # typing.Any are disallowed in `**kwargs
+  "PLR0913",  # Too many arguments for function call
+  "D106",  # Missing docstring in public nested class
+]
+exclude = [".venv/"]
+line-length = 88
+
+[tool.ruff.lint.mccabe]
+max-complexity = 10
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = [
+  "S101",  # Use of assert detected
+  "S301",  # Use of pickle detected
+  "D103",  # Missing docstring in public function
+  "SLF001",  # Private member accessed
+  "S311",  # Standard pseudo-random generators are not suitable for security/cryptographic purposes
+  "D101",  # Missing docstring in public class
+]
+
+[tool.ruff.lint.pydocstyle]
+convention = "pep257"
+ignore-decorators = ["typing.overload"]
+
+[tool.ruff.lint.pylint]
+allow-magic-value-types = ["int", "str", "float"]
+
+[tool.ruff.lint.flake8-bugbear]
+extend-immutable-calls = ["taskiq_dependencies.Depends", "taskiq.TaskiqDepends"]
+
+[tool.uv.build-backend]
+module-root = ""
+module-name = "taskiq_redis"

{taskiq_redis-1.2.0 → taskiq_redis-1.2.2}/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-1.2.0 → taskiq_redis-1.2.2}/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/pyproject.toml

@@ -1,159 +0,0 @@
-[project]
-name = "taskiq-redis"
-version = "1.2.0"
-description = "Redis integration for taskiq"
-authors = [
-    { name = "Taskiq team", email = "taskiq@no-reply.com" }
-]
-maintainers = [
-    { name = "Taskiq team", email = "taskiq@no-reply.com" }
-]
-license = "MIT"
-license-files = ["LICENSE"]
-readme = "README.md"
-requires-python = ">=3.10"
-classifiers = [
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-]
-keywords = [
-    "taskiq",
-    "tasks",
-    "distributed",
-    "async",
-    "redis",
-    "result_backend",
-]
-dependencies = [
-    "redis>=7.0.0,<7.1.0",  # TODO: fix issues in tests with 7.1.0
-    "taskiq>=0.12.0",
-]
-
-[dependency-groups]
-dev = [
-    {include-group = "lint"},
-    {include-group = "test"},
-    "pre-commit>=4.5.0",
-]
-test = [
-    "fakeredis>=2.32.1",
-    "freezegun>=1.5.5",
-    "pytest>=9.0.1",
-    "pytest-cov>=7.0.0",
-    "pytest-env>=1.2.0",
-    "pytest-xdist>=3.8.0",
-]
-lint = [
-    "black>=25.11.0",
-    "mypy>=1.19.0",
-    "ruff>=0.14.7",
-]
-
-[project.urls]
-homepage = "https://github.com/taskiq-python/taskiq-redis"
-repository = "https://github.com/taskiq-python/taskiq-redis"
-
-[tool.mypy]
-strict = true
-ignore_missing_imports = true
-allow_subclassing_any = true
-allow_untyped_calls = true
-pretty = true
-show_error_codes = true
-implicit_reexport = true
-allow_untyped_decorators = true
-warn_return_any = false
-
-[[tool.mypy.overrides]]
-module = ['redis']
-ignore_missing_imports = true
-ignore_errors = true
-strict = false
-
-[build-system]
-requires = ["uv_build>=0.9.13,<0.10.0"]
-build-backend = "uv_build"
-
-[tool.uv.build-backend]
-module-root = ""
-module-name = "taskiq_redis"
-
-[tool.ruff]
-# List of enabled rulsets.
-# See https://docs.astral.sh/ruff/rules/ for more information.
-lint.select = [
-    "E",   # Error
-    "F",   # Pyflakes
-    "W",   # Pycodestyle
-    "C90", # McCabe complexity
-    "I",   # Isort
-    "N",   # pep8-naming
-    "D",   # Pydocstyle
-    "ANN", # Pytype annotations
-    "S",   # Bandit
-    "B",   # Bugbear
-    "COM", # Commas
-    "C4",  # Comprehensions
-    "ISC", # Implicit string concat
-    "PIE", # Unnecessary code
-    "T20", # Catch prints
-    "PYI", # validate pyi files
-    "Q",   # Checks for quotes
-    "RSE", # Checks raise statements
-    "RET", # Checks return statements
-    "SLF", # Self checks
-    "SIM", # Simplificator
-    "PTH", # Pathlib checks
-    "ERA", # Checks for commented out code
-    "PL",  # PyLint checks
-    "RUF", # Specific to Ruff checks
-    "FA102", # Future annotations
-    "UP", # Pyupgrade
-]
-lint.ignore = [
-    "D105",    # Missing docstring in magic method
-    "D107",    # Missing docstring in __init__
-    "D212",    # Multi-line docstring summary should start at the first line
-    "D401",    # First line should be in imperative mood
-    "D104",    # Missing docstring in public package
-    "D100",    # Missing docstring in public module
-    "ANN401",  # typing.Any are disallowed in `**kwargs
-    "PLR0913", # Too many arguments for function call
-    "D106",    # Missing docstring in public nested class
-]
-exclude = [".venv/"]
-line-length = 88
-
-[tool.ruff.lint.mccabe]
-max-complexity = 10
-
-[tool.ruff.lint.per-file-ignores]
-"tests/*" = [
-    "S101",   # Use of assert detected
-    "S301",   # Use of pickle detected
-    "D103",   # Missing docstring in public function
-    "SLF001", # Private member accessed
-    "S311",   # Standard pseudo-random generators are not suitable for security/cryptographic purposes
-    "D101",   # Missing docstring in public class
-]
-
-[tool.ruff.lint.pydocstyle]
-convention = "pep257"
-ignore-decorators = ["typing.overload"]
-
-[tool.ruff.lint.pylint]
-allow-magic-value-types = ["int", "str", "float"]
-
-[tool.ruff.lint.flake8-bugbear]
-extend-immutable-calls = ["taskiq_dependencies.Depends", "taskiq.TaskiqDepends"]
-
-[tool.pytest.ini_options]
-filterwarnings = [
-    # about deprecated RedisScheduleSource usage - delete after removing RedisScheduleSource
-    'ignore:RedisScheduleSource is deprecated:DeprecationWarning',
-]