@@ -289,20 +289,9 @@ def to_dict(self) -> Dict[str, Any]:
289289 model = str (self .task_type ),
290290 name = self .name ,
291291 callable = self .callable ,
292- callable_args = [
293- dict (
294- arg_type = arg .arg_type ,
295- val = arg .val ,
296- )
297- for arg in self .callable_args .all ()
298- ],
292+ callable_args = [dict (arg_type = arg .arg_type , val = arg .val ) for arg in self .callable_args .all ()],
299293 callable_kwargs = [
300- dict (
301- arg_type = arg .arg_type ,
302- key = arg .key ,
303- val = arg .val ,
304- )
305- for arg in self .callable_kwargs .all ()
294+ dict (arg_type = arg .arg_type , key = arg .key , val = arg .val ) for arg in self .callable_kwargs .all ()
306295 ],
307296 enabled = self .enabled ,
308297 queue = self .queue ,
@@ -344,23 +333,18 @@ def _schedule(self) -> bool:
344333 logger .debug (f"Task { str (self )} scheduled time is in the past, not scheduling" )
345334 return False
346335 kwargs = self ._enqueue_args ()
347- job = self .rqueue .create_and_enqueue_job (
348- run_task ,
349- args = (self .task_type , self .id ),
350- when = schedule_time ,
351- ** kwargs ,
352- )
336+ job = self .rqueue .create_and_enqueue_job (run_task , args = (self .task_type , self .id ), when = schedule_time , ** kwargs )
353337 self .job_name = job .name
354338 return True
355339
356340 def save (self , ** kwargs : Any ) -> None :
357341 should_clean = kwargs .pop ("clean" , True )
342+ schedule_job = kwargs .pop ("schedule_job" , True )
358343 if should_clean :
359344 self .clean ()
360345 update_fields = kwargs .get ("update_fields" , None )
361346 if update_fields is not None :
362347 kwargs ["update_fields" ] = set (update_fields ).union ({"updated_at" })
363- schedule_job = kwargs .pop ("schedule_job" , True )
364348 super (Task , self ).save (** kwargs )
365349 if schedule_job :
366350 self ._schedule ()
0 commit comments