Merge pull request #90 from NERSC/result-fix

Use status to determine exit condition
NERSC · Sep 27, 2024 · 5c8bc9d · 5c8bc9d
2 parents c0a24bc + 3bac936
commit 5c8bc9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/sfapi_client/_async/compute.py b/src/sfapi_client/_async/compute.py
@@ -58,10 +58,11 @@ async def _wait_for_task(self, task_id) -> str:
             json_response = r.json()
             task = Task.model_validate(json_response)
 
-            if task.status.lower() in ["error", "failed"]:
+            status = task.status.lower()
+            if status in ["error", "failed"]:
                 raise SfApiError(task.result)
 
-            if task.result is None:
+            if status not in ["completed", "cancelled"]:
                 await _ASYNC_SLEEP(1)
                 continue
 

diff --git a/src/sfapi_client/_sync/compute.py b/src/sfapi_client/_sync/compute.py
@@ -58,10 +58,11 @@ def _wait_for_task(self, task_id) -> str:
             json_response = r.json()
             task = Task.model_validate(json_response)
 
-            if task.status.lower() in ["error", "failed"]:
+            status = task.status.lower()
+            if status in ["error", "failed"]:
                 raise SfApiError(task.result)
 
-            if task.result is None:
+            if status not in ["completed", "cancelled"]:
                 _SLEEP(1)
                 continue