Merge pull request #1124 from syucream/fix/simplify-job-more

Simplify some remaining entry tasks additionally

Author: userlocalhost

airone/lib/job.py

@@ -1,11 +1,12 @@
 import functools
 from typing import Any, Callable
 
+from acl.models import ACLBase
 from job.models import Job, JobStatus
 
 
 def may_schedule_until_job_is_ready(
-    func: Callable[[Any, Job], JobStatus | tuple[JobStatus, str] | None],
+    func: Callable[[Any, Job], JobStatus | tuple[JobStatus, str, ACLBase | None] | None],
 ):
     @functools.wraps(func)
     def wrapper(kls, job_id: int):
@@ -18,15 +19,20 @@ def wrapper(kls, job_id: int):
 
         try:
             # running Job processing
-            ret: JobStatus | tuple[JobStatus, str] | None = func(kls, job)
+            ret: JobStatus | tuple[JobStatus, str, ACLBase | None] | None = func(kls, job)
         except Exception:
             ret = JobStatus.ERROR
 
         # update Job status after finishing Job processing
         if isinstance(ret, JobStatus):
             job.update(status=ret)
-        elif isinstance(ret, tuple) and isinstance(ret[0], JobStatus) and isinstance(ret[1], str):
-            job.update(status=ret[0], text=ret[1])
+        elif (
+            isinstance(ret, tuple)
+            and isinstance(ret[0], JobStatus)
+            and isinstance(ret[1], str)
+            and isinstance(ret[2], ACLBase | None)
+        ):
+            job.update(status=ret[0], text=ret[1], target=ret[2])
         elif not job.is_canceled():
             job.update(JobStatus.DONE)