Skip to content

Commit 0ada353

Browse files
committed
Normalize arguments in result constructor
1 parent 8876c56 commit 0ada353

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

django_tasks/backends/rq.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,6 @@ def enqueue(
208208
) -> TaskResult[T]:
209209
self.validate_task(task)
210210

211-
queue = django_rq.get_queue(task.queue_name, job_class=Job)
212-
213211
task_result = TaskResult[T](
214212
task=task,
215213
id=get_random_id(),
@@ -225,6 +223,8 @@ def enqueue(
225223
worker_ids=[],
226224
)
227225

226+
queue = django_rq.get_queue(task.queue_name, job_class=Job)
227+
228228
job = queue.create_job(
229229
task.module_path,
230230
args=args,

django_tasks/base.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,17 +131,13 @@ def enqueue(self, *args: P.args, **kwargs: P.kwargs) -> "TaskResult[T]":
131131
"""
132132
Queue up the task to be executed
133133
"""
134-
return self.get_backend().enqueue(
135-
self, json_normalize(args), json_normalize(kwargs)
136-
)
134+
return self.get_backend().enqueue(self, args, kwargs)
137135

138136
async def aenqueue(self, *args: P.args, **kwargs: P.kwargs) -> "TaskResult[T]":
139137
"""
140138
Queue up a task function (or coroutine) to be executed
141139
"""
142-
return await self.get_backend().aenqueue(
143-
self, json_normalize(args), json_normalize(kwargs)
144-
)
140+
return await self.get_backend().aenqueue(self, args, kwargs)
145141

146142
def get_result(self, result_id: str) -> "TaskResult[T]":
147143
"""
@@ -319,6 +315,10 @@ class TaskResult(Generic[T]):
319315

320316
_return_value: T | None = field(init=False, default=None)
321317

318+
def __post_init__(self) -> None:
319+
object.__setattr__(self, "args", json_normalize(self.args))
320+
object.__setattr__(self, "kwargs", json_normalize(self.kwargs))
321+
322322
@property
323323
def return_value(self) -> T | None:
324324
"""

0 commit comments

Comments
 (0)