From d84694108f91e644cef172b2ec22fe529d146688 Mon Sep 17 00:00:00 2001 From: X6 M Date: Sat, 21 Nov 2026 14:43:10 +0100 Subject: [PATCH] fix(scheduler): preserve label types on ScheduledTask --- taskiq/kicker.py | 3 + taskiq/scheduler/scheduled_task/task.py | 1 + taskiq/scheduler/scheduler.py | 11 +++- tests/scheduler/test_scheduler.py | 77 +++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 1 deletion(-) diff --git a/taskiq/kicker.py b/taskiq/kicker.py index bb10ef89..8e43b573 100644 --- a/taskiq/kicker.py +++ b/taskiq/kicker.py @@ -208,6 +208,7 @@ async def schedule_by_cron( schedule_id=schedule_id, task_name=message.task_name, labels=message.labels, + labels_types=message.labels_types, args=message.args, kwargs=message.kwargs, task_id=self.custom_task_id, @@ -242,6 +243,7 @@ async def schedule_by_interval( schedule_id=schedule_id, task_name=message.task_name, labels=message.labels, + labels_types=message.labels_types, args=message.args, kwargs=message.kwargs, task_id=self.custom_task_id, @@ -273,6 +275,7 @@ async def schedule_by_time( schedule_id=schedule_id, task_name=message.task_name, labels=message.labels, + labels_types=message.labels_types, args=message.args, kwargs=message.kwargs, task_id=self.custom_task_id, diff --git a/taskiq/scheduler/scheduled_task/task.py b/taskiq/scheduler/scheduled_task/task.py index 86ec0586..978dd3ec 100644 --- a/taskiq/scheduler/scheduled_task/task.py +++ b/taskiq/scheduler/scheduled_task/task.py @@ -21,6 +21,7 @@ class ScheduledTask(BaseModel): task_name: str labels: dict[str, Any] + labels_types: dict[str, int] | None = None args: list[Any] kwargs: dict[str, Any] task_id: str | None = None diff --git a/taskiq/scheduler/scheduler.py b/taskiq/scheduler/scheduler.py index 16677554..97ef7a60 100644 --- a/taskiq/scheduler/scheduler.py +++ b/taskiq/scheduler/scheduler.py @@ -3,6 +3,7 @@ from taskiq.exceptions import ScheduledTaskCancelledError from taskiq.kicker import AsyncKicker +from taskiq.labels import parse_label from taskiq.scheduler.scheduled_task import ScheduledTask from taskiq.utils import maybe_awaitable @@ -47,8 +48,16 @@ async def on_ready(self, source: "ScheduleSource", task: ScheduledTask) -> None: except ScheduledTaskCancelledError: logger.info("Scheduled task %s has been cancelled.", task.task_name) else: + labels = ( + { + label: parse_label(val, task.labels_types.get(label)) + for label, val in task.labels.items() + } + if task.labels_types is not None + else dict(task.labels) + ) await ( - AsyncKicker(task.task_name, self.broker, task.labels) + AsyncKicker(task.task_name, self.broker, labels) .with_labels( schedule_id=task.schedule_id, ) diff --git a/tests/scheduler/test_scheduler.py b/tests/scheduler/test_scheduler.py index 05e6358a..e378e70d 100644 --- a/tests/scheduler/test_scheduler.py +++ b/tests/scheduler/test_scheduler.py @@ -1,3 +1,7 @@ +from datetime import datetime, timezone +from typing import Any + +from taskiq import Context, TaskiqDepends from taskiq.abc.schedule_source import ScheduleSource from taskiq.brokers.inmemory_broker import InMemoryBroker from taskiq.exceptions import ScheduledTaskCancelledError @@ -31,3 +35,76 @@ async def test_scheduled_task_cancelled() -> None: ) await scheduler.on_ready(source, task) # error is caught + + +class _RecordingScheduleSource(ScheduleSource): + def __init__(self) -> None: + self.schedules: list[ScheduledTask] = [] + + async def get_schedules(self) -> list[ScheduledTask]: + return list(self.schedules) + + async def add_schedule(self, schedule: ScheduledTask) -> None: + self.schedules.append(schedule) + + +async def test_scheduled_task_preserves_label_types() -> None: + broker = InMemoryBroker(await_inplace=True) + source = _RecordingScheduleSource() + scheduler = TaskiqScheduler(broker=broker, sources=[source]) + received: list[dict[str, Any]] = [] + + @broker.task + async def inspect_labels(context: Context = TaskiqDepends()) -> None: + received.append(dict(context.message.labels)) + + raw_labels: dict[str, Any] = { + "count": 5, + "ratio": 1.5, + "flag": False, + "data": b"hi", + } + kicker = inspect_labels.kicker().with_labels(**raw_labels) + await kicker.schedule_by_cron(source, "* * * * *") + await kicker.schedule_by_interval(source, 60) + await kicker.schedule_by_time(source, datetime.now(timezone.utc)) + + for stored in source.schedules: + restored = ScheduledTask.model_validate(stored.model_dump(mode="json")) + await scheduler.on_ready(source, restored) + + assert len(received) == 3 + for labels in received: + assert labels["count"] == 5 + assert type(labels["count"]) is int + assert labels["ratio"] == 1.5 + assert type(labels["ratio"]) is float + assert labels["flag"] is False + assert type(labels["flag"]) is bool + assert labels["data"] == b"hi" + assert type(labels["data"]) is bytes + + +async def test_scheduled_task_without_labels_types_still_works() -> None: + broker = InMemoryBroker(await_inplace=True) + source = _RecordingScheduleSource() + scheduler = TaskiqScheduler(broker=broker, sources=[source]) + received: dict[str, Any] = {} + + @broker.task + async def inspect_labels(context: Context = TaskiqDepends()) -> None: + received.update(context.message.labels) + + task = ScheduledTask( + task_name=inspect_labels.task_name, + labels={"queue": "default", "retries": 2}, + args=[], + kwargs={}, + cron="* * * * *", + ) + await scheduler.on_ready(source, task) + + assert received["queue"] == "default" + assert received["retries"] == 2 + assert type(received["retries"]) is int + assert "schedule_id" not in task.labels