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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: sfapi_client
-Version: 0.3.1
+Version: 0.4.0
 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.1 → sfapi_client-0.4.0}/src/sfapi_client/_async/client.py

@@ -276,9 +276,15 @@ class AsyncClient:
 
                 await self.__http_client.fetch_token()
             else:
-                # We have a session
-                # Make sure it's still active
-                await self.__http_client.ensure_active_token(self.__http_client.token)
+                if self.__http_client.token is None:
+                    # We don't have a token, fetch one
+                    await self.__http_client.fetch_token()
+                else:
+                    # We have a session
+                    # Make sure it's still active
+                    await self.__http_client.ensure_active_token(
+                        self.__http_client.token
+                    )
         # Use regular client, but add the access token if we have one
         elif self.__http_client is None:
             # We already have an access token

{sfapi_client-0.3.1 → sfapi_client-0.4.0}/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.1 → sfapi_client-0.4.0}/src/sfapi_client/_models/__init__.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
-#   filename:  https://api-dev.nersc.gov/api/v1.2/openapi.json
-#   timestamp: 2024-07-18T15:58:27+00:00
+#   filename:  https://api.nersc.gov/api/v1.2/openapi.json
+#   timestamp: 2025-01-23T19:49:01+00:00
 
 from __future__ import annotations
 
@@ -85,15 +85,12 @@ class Note(BaseModel):
     timestamp: Optional[datetime] = Field(None, title="Timestamp")
 
 
-class Outage(BaseModel):
-    name: str = Field(..., title="Name")
-    start_at: Optional[datetime] = Field(None, title="Start At")
-    end_at: Optional[datetime] = Field(None, title="End At")
-    description: Optional[str] = Field(None, title="Description")
-    notes: Optional[str] = Field(None, title="Notes")
-    status: Optional[str] = Field(None, title="Status")
-    swo: Optional[str] = Field(None, title="Swo")
-    update_at: Optional[datetime] = Field(None, title="Update At")
+class OutageStatusValue(str, Enum):
+    Active = "Active"
+    Cancelled = "Cancelled"
+    Completed = "Completed"
+    Extended = "Extended"
+    Planned = "Planned"
 
 
 class PublicHost(str, Enum):
@@ -126,14 +123,11 @@ class StorageStats(BaseModel):
     files_used: Optional[float] = Field(None, title="Files Used")
 
 
-class Task(BaseModel):
-    id: str = Field(..., title="Id")
-    status: Optional[str] = Field(..., title="Status")
-    result: Optional[str] = Field(..., title="Result")
-
-
-class Tasks(BaseModel):
-    tasks: Optional[List[Task]] = Field(None, title="Tasks")
+class TaskStatus(str, Enum):
+    new = "new"
+    completed = "completed"
+    cancelled = "cancelled"
+    failed = "failed"
 
 
 class UserInfo(BaseModel):
@@ -214,6 +208,17 @@ class JobOutput(BaseModel):
     error: Optional[str] = Field(None, title="Error")
 
 
+class Outage(BaseModel):
+    name: str = Field(..., title="Name")
+    start_at: Optional[datetime] = Field(None, title="Start At")
+    end_at: Optional[datetime] = Field(None, title="End At")
+    description: Optional[str] = Field(None, title="Description")
+    notes: Optional[str] = Field(None, title="Notes")
+    status: Optional[OutageStatusValue] = None
+    swo: Optional[str] = Field(None, title="Swo")
+    update_at: Optional[datetime] = Field(None, title="Update At")
+
+
 class ProjectStats(BaseModel):
     id: int = Field(..., title="Id")
     description: str = Field(..., title="Description")
@@ -250,6 +255,16 @@ class QueueOutput(BaseModel):
     error: Optional[str] = Field(None, title="Error")
 
 
+class Task(BaseModel):
+    id: str = Field(..., title="Id")
+    status: Optional[TaskStatus]
+    result: Optional[str] = Field(..., title="Result")
+
+
+class Tasks(BaseModel):
+    tasks: Optional[List[Task]] = Field(..., title="Tasks")
+
+
 class TransferResult(BaseModel):
     task_id: str = Field(..., title="Task Id")
     status: AppRoutersStorageModelsStatus

{sfapi_client-0.3.1 → sfapi_client-0.4.0}/src/sfapi_client/_sync/client.py

@@ -276,9 +276,15 @@ class Client:
 
                 self.__http_client.fetch_token()
             else:
-                # We have a session
-                # Make sure it's still active
-                self.__http_client.ensure_active_token(self.__http_client.token)
+                if self.__http_client.token is None:
+                    # We don't have a token, fetch one
+                    self.__http_client.fetch_token()
+                else:
+                    # We have a session
+                    # Make sure it's still active
+                    self.__http_client.ensure_active_token(
+                        self.__http_client.token
+                    )
         # Use regular client, but add the access token if we have one
         elif self.__http_client is None:
             # We already have an access token
@@ -383,10 +389,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.1 → sfapi_client-0.4.0}/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.1 → sfapi_client-0.4.0}/tests/test_groups.py

@@ -3,15 +3,8 @@ from sfapi_client import Client
 
 
 @pytest.mark.api_dev
-def test_group(
-    dev_client_id, dev_client_secret, test_group, 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:
+def test_group(authenticated_client, test_group):
+    with authenticated_client as client:
         group = client.group(test_group)
         assert group is not None
         assert group.name == test_group

{sfapi_client-0.3.1 → sfapi_client-0.4.0}/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.1 → sfapi_client-0.4.0}/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 = []