starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-18 16:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrently handle terminal state when invoking job through run_script method (#2703)

Browse Source
This commit is contained in:
Stephan Fitzpatrick
2023-11-25 00:38:53 -08:00
committed by GitHub
parent 9c2125bb89
commit f1c8a47155
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python-client/wmill/wmill/client.py
+22 -18
View File
@@ -125,7 +125,7 @@ class Windmill:
atexit.register(cancel_job)
while True:
job = self.get(f"/w/{self.workspace}/jobs_u/get/{job_id}").json()
job = self.get_job(job_id)
if timeout and ((time.time() - start_time) > timeout):
msg = "reached timeout"
@@ -139,17 +139,23 @@ class Windmill:
result = job.get("result")
canceled, canceled_reason = job.get("canceled"), job.get("canceled_reason")
success = job.get("success")
job_type = job.get("type", "")
completed = job_type.lower() == "completedjob"
if cleanup and (canceled or success):
if cleanup and completed:
atexit.unregister(cancel_job)
if canceled:
raise Exception(f"job canceled: {canceled_reason}")
if success:
if assert_result_is_not_none and result is None:
raise Exception(f"result is None for {job_id = }")
return result
if completed:
if success:
if assert_result_is_not_none and result is None:
raise Exception(f"result is None for {job_id = }")
return result
else:
if canceled:
raise Exception(f"job canceled: {canceled_reason}")
else:
error = result.get("error")
raise Exception(f"job failed: {error}")
if verbose:
logger.info(f"sleeping 0.5 seconds for {job_id = }")
@@ -189,18 +195,16 @@ class Windmill:
return result
def get_job(self, job_id: str) -> dict:
return self.get(f"/w/{self.workspace}/jobs_u/get/{job_id}").json()
def get_job_status(self, job_id: str) -> JobStatus:
resp = self.get(
f"/w/{self.workspace}/jobs_u/get/{job_id}",
raise_for_status=False,
)
assert not resp.status_code == 404, f"{job_id} not found"
resp_json = resp.json()
job_type = resp_json.get("type", "")
assert job_type, f"{resp_json} is not a valid job"
job = self.get_job(job_id)
job_type = job.get("type", "")
assert job_type, f"{job} is not a valid job"
if job_type.lower() == "completedjob":
return "COMPLETED"
additional_properties = resp_json.get("additional_properties", {})
additional_properties = job.get("additional_properties", {})
if "running" not in additional_properties:
raise Exception(f"{job_id} is not running")
if additional_properties.get("running"):