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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sfapi_client
-Version: 0.3.2
+Version: 0.4.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.3.2 → sfapi_client-0.4.1}/src/sfapi_client/__init__.py

@@ -1,5 +1,6 @@
 from .client import AsyncClient  # noqa: F401
 from .client import Client  # noqa: F401
 from .exceptions import SfApiError  # noqa: F401
+from ._models import OutageStatusValue  # noqa: F401
 from ._models import StatusValue  # noqa: F401
 from ._models.resources import Resource  # noqa: F401

{sfapi_client-0.3.2 → sfapi_client-0.4.1}/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.2 → sfapi_client-0.4.1}/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.2 → sfapi_client-0.4.1}/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

{sfapi_client-0.3.2 → sfapi_client-0.4.1}/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