fix(scheduler): preserve cancellation cleanup with send timeouts

Author: Kuang-xianxin

.github/workflows/test.yml

@@ -17,9 +17,6 @@ permissions:
 
 jobs:
   lint:
-    strategy:
-      matrix:
-        cmd: ["black", "ruff", "mypy"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -36,12 +33,11 @@ jobs:
       - name: Install deps
         run: uv sync --all-extras
       - name: Run lint check
-        run: uv run pre-commit run -a ${{ matrix.cmd }}
+        run: uv run prek run -a
   pytest:
     strategy:
       matrix:
         py_version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
-        pydantic_ver: ["<2", ">=2.5,<3"]
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: "${{ matrix.os }}"
     steps:
@@ -60,8 +56,6 @@ jobs:
           version: "latest"
       - name: Install deps
         run: uv sync --all-extras
-      - name: Setup pydantic version
-        run: uv pip install "pydantic ${{ matrix.pydantic_ver }}"
       - name: Run pytest check
         run: uv run pytest -vv -n auto --cov="taskiq" .
       - name: Generate report

.pre-commit-config.yaml

@@ -1,21 +1,17 @@
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:
       - id: check-ast
+
+  - repo: builtin
+    hooks:
       - id: trailing-whitespace
       - id: check-toml
       - id: end-of-file-fixer
 
-  - repo: https://github.com/asottile/add-trailing-comma
-    rev: v4.0.0
-    hooks:
-      - id: add-trailing-comma
-
   - repo: https://github.com/crate-ci/typos
-    rev: v1.38.1
+    rev: v1.50.2
     hooks:
       - id: typos
 
@@ -29,6 +25,12 @@ repos:
             '--exclude-lines', 'amqp://guest:guest@localhost:5672',
         ]
 
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.16.7
+    hooks:
+      - id: ruff-check
+        args: [ "taskiq", "tests", "docs/examples" ]
+
   - repo: local
     hooks:
       - id: black
@@ -37,19 +39,6 @@ repos:
         language: system
         types: [python]
 
-      - id: ruff
-        name: Run ruff lints
-        entry: uv run ruff
-        language: system
-        pass_filenames: false
-        types: [python]
-        args:
-          - "check"
-          - "--fix"
-          - "taskiq"
-          - "tests"
-          - "docs/examples"
-
       - id: mypy
         name: Validate types with MyPy
         entry: uv run mypy

docs/.vuepress/config.ts

@@ -33,6 +33,7 @@ export default defineUserConfig({
     sidebar: "structure",
 
     pure: true,
+    focus: false,
 
     markdown: {
       tabs: true,

docs/available-components/README.md

@@ -6,7 +6,7 @@ dir:
 
 # Available components
 
-In this section, you can find a list of officially supported plugins for the taskiq.
+In this section, you can find a list of officially supported plugins for taskiq.
 
 - [Available brokers](./brokers.md)
 - [Available middlewares](./middlewares.md)

docs/available-components/brokers.md

@@ -25,7 +25,7 @@ If you choose this type of broker, please run taskiq with `-w 1` parameter,
 otherwise you may encounter undefined behavior.
 :::
 
-To run this broker please install the [pyzmq](https://pypi.org/project/pyzmq/) lib. Or you can taskiq with `zmq` extra.
+To run this broker please install the [pyzmq](https://pypi.org/project/pyzmq/) lib. Or you can install taskiq with `zmq` extra.
 
 ::: tabs
 
@@ -56,7 +56,7 @@ def my_task() -> bool:
     return True
 ```
 
-To kiq this task you have to options:
+To kiq this task you have two options:
 
 - Explicitly define broker using kicker for this kiq;
 - Add default broker for all shared tasks.
@@ -82,8 +82,8 @@ await my_task.kicker().with_broker(broker).kiq()
 
 ## Custom brokers
 
-These brokers are not parts of the core Taskiq lib. But they are maintained by Taskiq developers.
-You can install them as a separate packages.
+These brokers are not part of the core Taskiq lib. But they are maintained by Taskiq developers.
+You can install them as separate packages.
 
 You can read more about parameters and abilities of these brokers in README.md of each repo.
 
@@ -112,9 +112,25 @@ Project link: [taskiq-nats](https://github.com/taskiq-python/taskiq-nats).
 pip install taskiq-nats
 ```
 
+### SQS broker
+
+Project link: [taskiq-sqs](https://github.com/taskiq-python/taskiq-sqs).
+
+```bash
+pip install taskiq-sqs
+```
+
+### Kafka broker
+
+Project link: [taskiq-aio-kafka](https://github.com/taskiq-python/taskiq-aio-kafka).
+
+```bash
+pip install taskiq-aio-kafka
+```
+
 ## Third-party brokers
 
-These brokers are not part of the core Taskiq library. They are maintained by other open‑source contributors. You can install them as a separate packages.
+These brokers are not part of the core Taskiq library. They are maintained by other open‑source contributors. You can install them as separate packages.
 
 You can read more about parameters and abilities of these brokers in README.md of each repo.
 
@@ -141,3 +157,11 @@ Project link: [taskiq-ydb](https://github.com/danfimov/taskiq-ydb).
 ```bash
 pip install taskiq-ydb
 ```
+
+### Azure Service Bus broker
+
+Project link: [taskiq-service-bus](https://github.com/hamiltonkibbe/taskiq-service-bus).
+
+```bash
+pip install taskiq-service-bus
+```

docs/available-components/result-backends.md

@@ -22,7 +22,7 @@ This broker will always return `None` for any return_value. Please be careful.
 
 ## Official result backends
 
-This result backends is not part of the core Taskiq library. But they are maintained by Taskiq developers. You can install them as a separate package.
+These result backends are not part of the core Taskiq library. But they are maintained by Taskiq developers. You can install them as a separate package.
 
 ### Redis result backend
 
@@ -40,9 +40,17 @@ Project link: [taskiq-nats](https://github.com/taskiq-python/taskiq-nats).
 pip install taskiq-nats
 ```
 
+### S3 result backend
+
+Project link: [taskiq-sqs](https://github.com/taskiq-python/taskiq-sqs). Provides `S3ResultBackend`.
+
+```bash
+pip install taskiq-sqs
+```
+
 ## Third-party result backends
 
-These result backends are not part of the core Taskiq library. They are maintained by other open‑source contributors. You can install them as a separate packages.
+These result backends are not part of the core Taskiq library. They are maintained by other open‑source contributors. You can install them as separate packages.
 
 ### PostgreSQL result backend
 

docs/available-components/schedule-sources.md

@@ -56,7 +56,7 @@ Parameters:
 - `cron` - crontab string when to run the task.
 - `cron_offset` - timezone offset for cron values. Explained [here](../guide/scheduling-tasks.md#working-with-timezones)
 - `interval` - Interval to run periodic tasks. Must be at least 1 second and cannot have fractional seconds.
-- `time` - specific time when send the task.
+- `time` - specific time when to send the task.
 - `args` - args to use, when invoking the task.
 - `kwargs` - key-word arguments to use when invoking the task.
 - `labels` - additional labels to use when invoking the task.
@@ -105,7 +105,7 @@ This schedule source doesn't use `schedule` label on tasks. To add new schedules
 
 ## Third-party schedule sources
 
-These schedule sources are not part of the core Taskiq library. They are maintained by other open‑source contributors. You can install them as a separate packages.
+These schedule sources are not part of the core Taskiq library. They are maintained by other open‑source contributors. You can install them as separate packages.
 
 ### PostgreSQL schedule source
 

docs/contrib.md

@@ -9,10 +9,10 @@ We have several rules for contributors:
 * Please do not add malware.
 * Please make sure that your request solves the problem.
 
-If you struggle with something or feel frustrated, you either create an issue, create a [discussions](https://github.com/orgs/taskiq-python/discussions).
+If you struggle with something or feel frustrated, you either create an issue, create a [discussions](https://github.com/orgs/taskiq-python/discussions)
 page or publish a draft PR and ask your question in the description.
 
-We have lots of tests in CI. But since CI runs from first-time contributors should be approved, you better test locally. It just takes less time to prepare PR for merging.
+We have lots of tests in CI. But since CI runs from first-time contributors need to be approved, you better test locally. It just takes less time to prepare PR for merging.
 
 ## Setting up environment
 
@@ -42,7 +42,7 @@ You can run `pytest` without any parameters and it will do the thing.
 pytest
 ```
 
-If you want to speedup testings, you can run it with `-n` option from [pytest-xdist](https://pypi.org/project/pytest-xdist/) to run tests in parallel.
+If you want to speed up testing, you can run it with `-n` option from [pytest-xdist](https://pypi.org/project/pytest-xdist/) to run tests in parallel.
 
 ```bash
 pytest -n 2
@@ -71,7 +71,7 @@ After that, you can run documentation server with hot-reloading using:
 pnpm docs:dev
 ```
 
-If you want to check how documentation looks like in production mode, you can build it and then serve using:
+If you want to check how documentation looks in production mode, you can build it and then serve using:
 
 ```bash
 pnpm docs:build

docs/examples/state/progress_tracker.py

@@ -0,0 +1,11 @@
+import asyncio
+
+from taskiq_dependencies import Depends
+
+from taskiq.depends.progress_tracker import ProgressTracker, TaskState
+
+
+async def my_task(progress: ProgressTracker[str] = Depends()) -> None:
+    for i in range(10):
+        await asyncio.sleep(1)
+        await progress.set_progress(TaskState.STARTED, meta=f"{(i + 1) * 10}%")

docs/examples/state/progress_tracker_annot.py

@@ -0,0 +1,12 @@
+import asyncio
+from typing import Annotated
+
+from taskiq_dependencies import Depends
+
+from taskiq.depends.progress_tracker import ProgressTracker, TaskState
+
+
+async def my_task(progress: Annotated[ProgressTracker[str], Depends()]) -> None:
+    for i in range(10):
+        await asyncio.sleep(1)
+        await progress.set_progress(TaskState.STARTED, meta=f"{(i + 1) * 10}%")