sfapi-client 0.2.0__tar.gz → 0.3.1__tar.gz

{sfapi_client-0.2.0 → sfapi_client-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sfapi_client
-Version: 0.2.0
+Version: 0.3.1
 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.2.0 → sfapi_client-0.3.1}/requirements-dev.txt

@@ -6,3 +6,7 @@ pytest-asyncio
 pytest-mock
 mkdocs-jupyter
 datamodel-code-generator[http]
+cryptography
+authlib
+tenacity
+pydantic_settings

{sfapi_client-0.2.0 → sfapi_client-0.3.1}/src/sfapi_client/_async/client.py

@@ -382,12 +382,15 @@ class AsyncClient:
         wait=tenacity.wait_exponential(max=MAX_RETRY),
         stop=tenacity.stop_after_attempt(MAX_RETRY),
     )
-    async def post(self, url: str, data: Dict[str, Any]) -> httpx.Response:
+    async def post(
+        self, url: str, data: Dict[str, Any] = None, json: Dict[str, Any] = None
+    ) -> httpx.Response:
         client = await self._http_client()
 
         r = await client.post(
             f"{self._api_base_url}/{url}",
             data=data,
+            json=json,
         )
         r.raise_for_status()
 

{sfapi_client-0.2.0 → sfapi_client-0.3.1}/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.2.0 → sfapi_client-0.3.1}/src/sfapi_client/_sync/client.py

@@ -382,12 +382,18 @@ class Client:
         wait=tenacity.wait_exponential(max=MAX_RETRY),
         stop=tenacity.stop_after_attempt(MAX_RETRY),
     )
-    def post(self, url: str, data: Dict[str, Any]) -> httpx.Response:
+    def post(
+        self,
+        url: str,
+        data: Dict[str, Any] = None,
+        json: Dict[str, Any] = None
+    ) -> httpx.Response:
         client = self._http_client()
 
         r = client.post(
             f"{self._api_base_url}/{url}",
             data=data,
+            json=json,
         )
         r.raise_for_status()
 

{sfapi_client-0.2.0 → sfapi_client-0.3.1}/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