sfapi-client 0.3.0__tar.gz → 0.3.2__tar.gz

{sfapi_client-0.3.0 → sfapi_client-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: sfapi_client
-Version: 0.3.0
+Version: 0.3.2
 Summary: Python client for NERSC SF API
 Author-email: Chris Harris <cjh@lbl.gov>, Nicholas Tyler <tylern@lbl.gov>
 License-File: LICENSE

{sfapi_client-0.3.0 → sfapi_client-0.3.2}/src/sfapi_client/_async/compute.py

@@ -58,10 +58,11 @@ class AsyncCompute(ComputeBase):
             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
 

{sfapi_client-0.3.0 → sfapi_client-0.3.2}/src/sfapi_client/_async/jobs.py

@@ -24,7 +24,9 @@ async def _fetch_raw_state(
     partition: Optional[str] = None,
     sacct: Optional[bool] = False,
 ):
-    params = {"sacct": sacct}
+    # For now we are pass cached=False to ensure we don't
+    # break compatibility
+    params = {"sacct": sacct, "cached": False}
 
     job_url = f"compute/jobs/{compute.name}"
 

{sfapi_client-0.3.0 → sfapi_client-0.3.2}/src/sfapi_client/_sync/client.py

@@ -383,10 +383,7 @@ class Client:
         stop=tenacity.stop_after_attempt(MAX_RETRY),
     )
     def post(
-        self,
-        url: str,
-        data: Dict[str, Any] = None,
-        json: Dict[str, Any] = None
+        self, url: str, data: Dict[str, Any] = None, json: Dict[str, Any] = None
     ) -> httpx.Response:
         client = self._http_client()
 

{sfapi_client-0.3.0 → sfapi_client-0.3.2}/src/sfapi_client/_sync/compute.py

@@ -58,10 +58,11 @@ class Compute(ComputeBase):
             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
 

{sfapi_client-0.3.0 → sfapi_client-0.3.2}/src/sfapi_client/_sync/jobs.py

@@ -24,7 +24,9 @@ def _fetch_raw_state(
     partition: Optional[str] = None,
     sacct: Optional[bool] = False,
 ):
-    params = {"sacct": sacct}
+    # For now we are pass cached=False to ensure we don't
+    # break compatibility
+    params = {"sacct": sacct, "cached": False}
 
     job_url = f"compute/jobs/{compute.name}"
 

{sfapi_client-0.3.0 → sfapi_client-0.3.2}/tests/test_jobs.py

@@ -2,7 +2,6 @@ import pytest
 from concurrent.futures import ThreadPoolExecutor
 import time
 
-from sfapi_client import Client
 from sfapi_client.jobs import JobState
 from sfapi_client.compute import Compute
 from sfapi_client.jobs import JobSqueue
@@ -52,22 +51,13 @@ def test_complete_timeout(authenticated_client, test_job_path, test_machine):
             job.complete(timeout=10)
 
 
-@pytest.mark.api_dev
 def test_job_monitor_check_request(
     mocker,
-    dev_client_id,
-    dev_client_secret,
+    authenticated_client,
     test_job_path,
     test_machine,
-    dev_api_url,
-    dev_token_url,
 ):
-    with Client(
-        client_id=dev_client_id,
-        secret=dev_client_secret,
-        api_base_url=dev_api_url,
-        token_url=dev_token_url,
-    ) as client:
+    with authenticated_client as client:
         num_jobs = 10
         _fetch_jobs = mocker.patch("sfapi_client._monitor._fetch_jobs")
 
@@ -122,24 +112,14 @@ def test_job_monitor_check_request(
         assert len(ids) == num_jobs
 
 
-# We currently run this in api-dev as its a new feature deployed there
-@pytest.mark.api_dev
 def test_job_monitor_multiple_threads(
-    dev_client_id,
-    dev_client_secret,
+    authenticated_client,
     test_job_path,
     test_machine,
-    dev_api_url,
-    dev_token_url,
 ):
     num_jobs = 5
 
-    with Client(
-        client_id=dev_client_id,
-        secret=dev_client_secret,
-        api_base_url=dev_api_url,
-        token_url=dev_token_url,
-    ) as client:
+    with authenticated_client as client:
         machine = client.compute(test_machine)
 
         jobs = []

{sfapi_client-0.3.0 → sfapi_client-0.3.2}/tests/test_jobs_async.py

@@ -1,7 +1,6 @@
 import pytest
 import asyncio
 
-from sfapi_client import AsyncClient
 from sfapi_client.compute import AsyncCompute
 from sfapi_client.jobs import AsyncJobSqueue, AsyncJobSacct, JobState
 
@@ -162,23 +161,11 @@ async def test_job_monitor_job_types(async_authenticated_client, mocker, test_ma
         assert kwargs["job_type"] == AsyncJobSacct
 
 
-# We currently run this in api-dev as its a new feature deployed there
-@pytest.mark.api_dev
 @pytest.mark.asyncio
 async def test_job_monitor_gather(
-    dev_client_id,
-    dev_client_secret,
-    test_job_path,
-    test_machine,
-    dev_api_url,
-    dev_token_url,
+    async_authenticated_client, test_job_path, test_machine
 ):
-    async with AsyncClient(
-        client_id=dev_client_id,
-        secret=dev_client_secret,
-        api_base_url=dev_api_url,
-        token_url=dev_token_url,
-    ) as client:
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
 
         submit_tasks = []