wmill 1.215.0__py3-none-any.whl → 1.216.0__py3-none-any.whl

wmill/client.py

@@ -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"):
@@ -253,7 +257,7 @@ class Windmill:
         self,
         path: str,
         none_if_undefined: bool = False,
-    ) -> str | None:
+    ) -> str | dict | None:
         """Get resource from Windmill"""
         try:
             return self.get(
@@ -567,7 +571,7 @@ def get_state() -> Any:
 def get_resource(
     path: str,
     none_if_undefined: bool = False,
-) -> str | None:
+) -> str | dict | None:
     """Get resource from Windmill"""
     return _client.get_resource(path, none_if_undefined)
 

{wmill-1.215.0.dist-info → wmill-1.216.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wmill
-Version: 1.215.0
+Version: 1.216.0
 Summary: A client library for accessing Windmill server wrapping the Windmill client API
 Home-page: https://windmill.dev
 License: Apache-2.0

wmill-1.216.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+wmill/__init__.py,sha256=d0Q6Fn44e7wFfLabDOBxpcJ1DPKWlFunGYDUBmO-4hA,22
+wmill/client.py,sha256=TyNaAiPsvG2a1dtcV0598OsWBwYetSXLZs_bqL6wm8E,19573
+wmill/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26
+wmill-1.216.0.dist-info/METADATA,sha256=WddJXyU_BfnCQJ0phGyWTohswEhQL1BdMp5Yj_reU1E,2699
+wmill-1.216.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+wmill-1.216.0.dist-info/RECORD,,

wmill-1.215.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-wmill/__init__.py,sha256=d0Q6Fn44e7wFfLabDOBxpcJ1DPKWlFunGYDUBmO-4hA,22
-wmill/client.py,sha256=3YeuRnvm2KrywzVjMi4Ar1BKwtiFnvY-D4F92Ezmw1E,19375
-wmill/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26
-wmill-1.215.0.dist-info/METADATA,sha256=AsHYfCVDmpadD_vFpA6S5W4wOLdT1dw9_U3WP3hzWkw,2699
-wmill-1.215.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-wmill-1.215.0.dist-info/RECORD,,