sfapi-client 0.0.8__tar.gz → 0.1.0__tar.gz

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/.github/workflows/black.yml

@@ -10,7 +10,7 @@ jobs:
   black:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: psf/black@23.9.1
         with:
           options: "--check --verbose"

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/.github/workflows/mkdocs.yml

@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           key: mkdocs-${{ github.ref }}
           path: .cache

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/.github/workflows/pypi.yml

@@ -13,9 +13,9 @@ jobs:
     name: Build wheel
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - name: Install pypa/build
@@ -33,7 +33,7 @@ jobs:
           --wheel
           --outdir dist/
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: wheel
           path: ./dist/
@@ -49,7 +49,7 @@ jobs:
       id-token: write
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: wheel
           path: dist

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/.github/workflows/pytest.yml

@@ -16,9 +16,9 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/.github/workflows/ruff.yml

@@ -10,5 +10,5 @@ jobs:
   ruff:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: chartboost/ruff-action@v1

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: sfapi_client
-Version: 0.0.8
+Version: 0.1.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.0.8 → sfapi_client-0.1.0}/requirements-dev.txt

@@ -3,5 +3,6 @@ unasync
 typer
 pytest
 pytest-asyncio
+pytest-mock
 mkdocs-jupyter
 datamodel-code-generator[http]

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/src/sfapi_client/_async/client.py

@@ -512,3 +512,10 @@ AsyncProject.model_rebuild()
 AsyncRemotePath.model_rebuild()
 AsyncRole.model_rebuild()
 AsyncGroupMember.model_rebuild()
+
+# Ensure that the job models are built, we need to import here to
+# avoid circular imports
+from .jobs import AsyncJobSacct, AsyncJobSqueue  # noqa: E402
+
+AsyncJobSqueue.model_rebuild()
+AsyncJobSacct.model_rebuild()

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/src/sfapi_client/_async/paths.py

@@ -165,7 +165,10 @@ class AsyncRemotePath(PathBase):
 
     @staticmethod
     async def _ls(
-        compute: "Compute", path, directory=False, filter_dots=True  # noqa: F821
+        compute: "AsyncCompute",  # noqa: F821
+        path,
+        directory=False,
+        filter_dots=True,  # noqa: F821
     ) -> List["RemotePath"]:  # noqa: F821
         r = await compute.client.get(f"utilities/ls/{compute.name}/{path}")
 

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/src/sfapi_client/_async/users.py

@@ -6,6 +6,7 @@ from pydantic import ConfigDict
 from .._models import (
     UserInfo as UserBase,
     GroupList as GroupsResponse,
+    Client as APIClient,
 )
 from .projects import AsyncProject, AsyncRole
 from ..exceptions import SfApiError
@@ -31,7 +32,8 @@ class AsyncUser(UserBase):
     @staticmethod
     @check_auth
     async def _fetch_user(
-        client: "AsyncClient", username: Optional[str] = None  # noqa: F821
+        client: "AsyncClient",  # noqa: F821
+        username: Optional[str] = None,  # noqa: F821
     ):  # noqa: F821
         url = "account/"
         if username is not None:
@@ -106,3 +108,17 @@ class AsyncUser(UserBase):
         ]
 
         return roles
+
+    async def clients(self) -> List[APIClient]:
+        """
+        Get information about the authenticated user's SFAPI clients.
+
+        :return: the api clients
+        """
+        r = await self.client.get("account/clients")
+
+        json_response = r.json()
+
+        clients = [APIClient.model_validate(c) for c in json_response]
+
+        return clients

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/src/sfapi_client/_models/__init__.py

@@ -1,12 +1,12 @@
 # generated by datamodel-codegen:
-#   filename:  https://api.nersc.gov/api/v1.2/openapi.json
-#   timestamp: 2023-10-20T20:57:45+00:00
+#   filename:  https://api-dev.nersc.gov/api/v1.2/openapi.json
+#   timestamp: 2024-07-18T15:58:27+00:00
 
 from __future__ import annotations
 
 from datetime import date as date_, datetime
 from enum import Enum
-from typing import Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 from pydantic import BaseModel, Field
 
@@ -37,6 +37,9 @@ class BodySubmitJobComputeJobsMachinePost(BaseModel):
     isPath: bool = Field(..., title="Ispath")
     job: str = Field(..., title="Job")
     args: Optional[List[str]] = Field([], title="Args")
+    callbackTimeout: Optional[int] = Field(None, title="Callbacktimeout")
+    callbackEmail: Optional[str] = Field(None, title="Callbackemail")
+    callbackUrl: Optional[str] = Field(None, title="Callbackurl")
 
 
 class BodyUpdateGroupMembershipAccountGroupsGroupPut(BaseModel):
@@ -53,6 +56,13 @@ class Changelog(BaseModel):
     change: Optional[str] = Field(None, title="Change")
 
 
+class Client(BaseModel):
+    name: str = Field(..., title="Name")
+    clientId: str = Field(..., title="Clientid")
+    expiresAt: str = Field(..., title="Expiresat")
+    comments: Optional[str] = Field(None, title="Comments")
+
+
 class Config(BaseModel):
     key: str = Field(..., title="Key")
     value: Optional[str] = Field(None, title="Value")
@@ -88,6 +98,7 @@ class Outage(BaseModel):
 
 class PublicHost(str, Enum):
     dtn01 = "dtn01"
+    dtns = "dtns"
     perlmutter = "perlmutter"
 
 
@@ -117,8 +128,8 @@ class StorageStats(BaseModel):
 
 class Task(BaseModel):
     id: str = Field(..., title="Id")
-    status: Optional[str] = Field(None, title="Status")
-    result: Optional[str] = Field(None, title="Result")
+    status: Optional[str] = Field(..., title="Status")
+    result: Optional[str] = Field(..., title="Result")
 
 
 class Tasks(BaseModel):
@@ -142,7 +153,7 @@ class UserStats(BaseModel):
 
 
 class ValidationError(BaseModel):
-    loc: List[str] = Field(..., title="Location")
+    loc: List[Union[str, int]] = Field(..., title="Location")
     msg: str = Field(..., title="Message")
     type: str = Field(..., title="Error Type")
 
@@ -212,6 +223,22 @@ class ProjectStats(BaseModel):
     hours_used: Optional[float] = Field(None, title="Hours Used")
     project_hours_given: Optional[float] = Field(None, title="Project Hours Given")
     project_hours_used: Optional[float] = Field(None, title="Project Hours Used")
+    cpu_hours_given: Optional[float] = Field(None, title="Cpu Hours Given")
+    cpu_hours_used: Optional[float] = Field(None, title="Cpu Hours Used")
+    cpu_project_hours_given: Optional[float] = Field(
+        None, title="Cpu Project Hours Given"
+    )
+    cpu_project_hours_used: Optional[float] = Field(
+        None, title="Cpu Project Hours Used"
+    )
+    gpu_hours_given: Optional[float] = Field(None, title="Gpu Hours Given")
+    gpu_hours_used: Optional[float] = Field(None, title="Gpu Hours Used")
+    gpu_project_hours_given: Optional[float] = Field(
+        None, title="Gpu Project Hours Given"
+    )
+    gpu_project_hours_used: Optional[float] = Field(
+        None, title="Gpu Project Hours Used"
+    )
     projdir_usage: Optional[List[StorageStats]] = Field(None, title="Projdir Usage")
     project_projdir_usage: Optional[StorageStats] = None
     hpss_usage: Optional[List[StorageStats]] = Field(None, title="Hpss Usage")
@@ -226,7 +253,7 @@ class QueueOutput(BaseModel):
 class TransferResult(BaseModel):
     task_id: str = Field(..., title="Task Id")
     status: AppRoutersStorageModelsStatus
-    reason: Optional[str] = Field(None, title="Reason")
+    reason: Optional[str] = Field(..., title="Reason")
 
 
 class UploadResult(BaseModel):

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/src/sfapi_client/_sync/client.py

@@ -512,3 +512,9 @@ Project.model_rebuild()
 RemotePath.model_rebuild()
 Role.model_rebuild()
 GroupMember.model_rebuild()
+
+# Ensure that the job models are built, we need to import here to
+# avoid circular imports
+from .jobs import JobSacct, JobSqueue
+JobSqueue.model_rebuild()
+JobSacct.model_rebuild()

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/src/sfapi_client/_sync/users.py

@@ -6,6 +6,7 @@ from pydantic import ConfigDict
 from .._models import (
     UserInfo as UserBase,
     GroupList as GroupsResponse,
+    Client as APIClient,
 )
 from .projects import Project, Role
 from ..exceptions import SfApiError
@@ -31,7 +32,8 @@ class User(UserBase):
     @staticmethod
     @check_auth
     def _fetch_user(
-        client: "Client", username: Optional[str] = None  # noqa: F821
+        client: "Client",  # noqa: F821
+        username: Optional[str] = None,  # noqa: F821
     ):  # noqa: F821
         url = "account/"
         if username is not None:
@@ -106,3 +108,17 @@ class User(UserBase):
         ]
 
         return roles
+
+    def clients(self) -> List[APIClient]:
+        """
+        Get information about the authenticated user's SFAPI clients.
+
+        :return: the api clients
+        """
+        r = self.client.get("account/clients")
+
+        json_response = r.json()
+
+        clients = [APIClient.model_validate(c) for c in json_response]
+
+        return clients

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/tests/conftest.py

@@ -8,12 +8,15 @@ from authlib.jose import JsonWebKey
 
 from sfapi_client.compute import Machine
 from sfapi_client import Resource
+from sfapi_client import Client, AsyncClient
 
 from pydantic import ConfigDict
 from pydantic_settings import BaseSettings
 
 
 class Settings(BaseSettings):
+    API_BASE_URL: str = "https://api.nersc.gov/api/v1.2"
+    TOKEN_URL: str = "https://oidc.nersc.gov/c2id/token"
     SFAPI_CLIENT_ID: Optional[str] = None
     SFAPI_CLIENT_SECRET: Optional[Union[str, Dict]] = None
     SFAPI_DEV_CLIENT_ID: Optional[str] = None
@@ -125,3 +128,43 @@ def dev_api_url():
 @pytest.fixture
 def dev_token_url():
     return settings.DEV_TOKEN_URL
+
+
+@pytest.fixture
+def api_base_url():
+    return settings.API_BASE_URL
+
+
+@pytest.fixture
+def token_url():
+    return settings.TOKEN_URL
+
+
+@pytest.fixture
+def unauthenticated_client(api_base_url):
+    return Client(api_base_url=api_base_url)
+
+
+@pytest.fixture
+def async_unauthenticated_client(api_base_url):
+    return AsyncClient(api_base_url=api_base_url)
+
+
+@pytest.fixture
+def authenticated_client(api_base_url, token_url, client_id, client_secret):
+    return Client(
+        api_base_url=api_base_url,
+        token_url=token_url,
+        client_id=client_id,
+        secret=client_secret,
+    )
+
+
+@pytest.fixture
+def async_authenticated_client(api_base_url, token_url, client_id, client_secret):
+    return AsyncClient(
+        api_base_url=api_base_url,
+        token_url=token_url,
+        client_id=client_id,
+        secret=client_secret,
+    )

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/tests/test_api.py

@@ -1,16 +1,15 @@
 import pytest
-from sfapi_client import Client
 
 
 @pytest.mark.public
-def test_changelog():
-    with Client() as client:
+def test_changelog(unauthenticated_client):
+    with unauthenticated_client as client:
         changelog = client.api.changelog()
         assert len(changelog) > 0
 
 
 @pytest.mark.public
-def test_config():
-    with Client() as client:
+def test_config(unauthenticated_client):
+    with unauthenticated_client as client:
         config = client.api.config()
         assert "compute.targets" in config

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/tests/test_api_async.py

@@ -1,19 +1,17 @@
 import pytest
 
-from sfapi_client import AsyncClient
-
 
 @pytest.mark.public
 @pytest.mark.asyncio
-async def test_changelog():
-    async with AsyncClient() as client:
+async def test_changelog(async_unauthenticated_client):
+    async with async_unauthenticated_client as client:
         changelog = await client.api.changelog()
         assert len(changelog) > 0
 
 
 @pytest.mark.public
 @pytest.mark.asyncio
-async def test_config():
-    async with AsyncClient() as client:
+async def test_config(async_unauthenticated_client):
+    async with async_unauthenticated_client as client:
         config = await client.api.config()
         assert "compute.targets" in config

sfapi_client-0.1.0/tests/test_client.py

@@ -0,0 +1,17 @@
+import pytest
+
+from sfapi_client import SfApiError
+
+
+@pytest.mark.public
+def test_no_creds(unauthenticated_client):
+    with unauthenticated_client as client:
+        assert client is not None
+
+
+@pytest.mark.public
+def test_no_creds_auth_required(unauthenticated_client, test_machine):
+    with unauthenticated_client as client:
+        machine = client.compute(test_machine)
+        with pytest.raises(SfApiError):
+            machine.jobs()

sfapi_client-0.1.0/tests/test_client_async.py

@@ -0,0 +1,19 @@
+import pytest
+
+from sfapi_client import SfApiError
+
+
+@pytest.mark.public
+@pytest.mark.asyncio
+async def test_no_creds(async_unauthenticated_client):
+    async with async_unauthenticated_client as client:
+        assert client is not None
+
+
+@pytest.mark.public
+@pytest.mark.asyncio
+async def test_no_creds_auth_required(async_unauthenticated_client, test_machine):
+    async with async_unauthenticated_client as client:
+        machine = await client.compute(test_machine)
+        with pytest.raises(SfApiError):
+            await machine.jobs()

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/tests/test_compute.py

@@ -1,18 +1,17 @@
 from pathlib import Path
 
-from sfapi_client import Client
 from sfapi_client.jobs import JobState
 
 
-def test_compute(client_id, client_secret, test_machine):
-    with Client(client_id, client_secret) as client:
+def test_compute(authenticated_client, test_machine):
+    with authenticated_client as client:
         machine = client.compute(test_machine)
         assert machine.status in ["active", "unavailable", "degraded", "other"]
         assert machine.name == test_machine.value
 
 
-def test_job(client_id, client_secret, test_job_path, test_machine):
-    with Client(client_id, client_secret) as client:
+def test_job(authenticated_client, test_job_path, test_machine):
+    with authenticated_client as client:
         machine = client.compute(test_machine)
 
         job = machine.submit_job(test_job_path)
@@ -24,14 +23,14 @@ def test_job(client_id, client_secret, test_job_path, test_machine):
         assert job.jobid == job_looked_up.jobid
 
 
-def test_fetch_jobs(client_id, client_secret, test_machine, test_username):
-    with Client(client_id, client_secret) as client:
+def test_fetch_jobs(authenticated_client, test_machine, test_username):
+    with authenticated_client as client:
         machine = client.compute(test_machine)
         machine.jobs(user=test_username)
 
 
-def test_list_dir_contents(client_id, client_secret, test_machine, test_job_path):
-    with Client(client_id, client_secret) as client:
+def test_list_dir_contents(authenticated_client, test_machine, test_job_path):
+    with authenticated_client as client:
         machine = client.compute(test_machine)
         test_job = Path(test_job_path)
         test_path = test_job.parent
@@ -48,8 +47,8 @@ def test_list_dir_contents(client_id, client_secret, test_machine, test_job_path
         assert found
 
 
-def test_list_dir(client_id, client_secret, test_machine, test_job_path):
-    with Client(client_id, client_secret) as client:
+def test_list_dir(authenticated_client, test_machine, test_job_path):
+    with authenticated_client as client:
         machine = client.compute(test_machine)
         test_job = Path(test_job_path)
         test_path = test_job.parent
@@ -59,8 +58,8 @@ def test_list_dir(client_id, client_secret, test_machine, test_job_path):
         assert paths[0].name == test_path.name
 
 
-def test_list_file(client_id, client_secret, test_machine, test_job_path):
-    with Client(client_id, client_secret) as client:
+def test_list_file(authenticated_client, test_machine, test_job_path):
+    with authenticated_client as client:
         machine = client.compute(test_machine)
         test_job_filename = Path(test_job_path).name
 
@@ -75,24 +74,24 @@ def test_list_file(client_id, client_secret, test_machine, test_job_path):
         assert found
 
 
-def test_run_arg_list(client_id, client_secret, test_machine, test_job_path):
-    with Client(client_id, client_secret) as client:
+def test_run_arg_list(authenticated_client, test_machine, test_job_path):
+    with authenticated_client as client:
         machine = client.compute(test_machine)
         output = machine.run(["ls", test_job_path])
 
         assert test_job_path in output
 
 
-def test_run_arg_str(client_id, client_secret, test_machine, test_job_path):
-    with Client(client_id, client_secret) as client:
+def test_run_arg_str(authenticated_client, test_machine, test_job_path):
+    with authenticated_client as client:
         machine = client.compute(test_machine)
         output = machine.run(f"ls {test_job_path}")
 
         assert test_job_path in output
 
 
-def test_run_arg_path(client_id, client_secret, test_machine):
-    with Client(client_id, client_secret) as client:
+def test_run_arg_path(authenticated_client, test_machine):
+    with authenticated_client as client:
         machine = client.compute(test_machine)
         [remote_path] = machine.ls("/usr/bin/hostname")
         output = machine.run(remote_path)

{sfapi_client-0.0.8 → sfapi_client-0.1.0}/tests/test_compute_async.py

@@ -1,21 +1,20 @@
 import pytest
 from pathlib import Path
 
-from sfapi_client import AsyncClient
 from sfapi_client.jobs import JobState
 
 
 @pytest.mark.asyncio
-async def test_compute(client_id, client_secret, test_machine):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_compute(async_authenticated_client, test_machine):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
         assert machine.status in ["active", "unavailable", "degraded", "other"]
         assert machine.name == test_machine.value
 
 
 @pytest.mark.asyncio
-async def test_job(client_id, client_secret, test_job_path, test_machine):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_job(async_authenticated_client, test_job_path, test_machine):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
 
         job = await machine.submit_job(test_job_path)
@@ -28,15 +27,17 @@ async def test_job(client_id, client_secret, test_job_path, test_machine):
 
 
 @pytest.mark.asyncio
-async def test_fetch_jobs(client_id, client_secret, test_machine, test_username):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_fetch_jobs(async_authenticated_client, test_machine, test_username):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
         await machine.jobs(user=test_username)
 
 
 @pytest.mark.asyncio
-async def test_list_dir_contents(client_id, client_secret, test_machine, test_job_path):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_list_dir_contents(
+    async_authenticated_client, test_machine, test_job_path
+):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
         test_job = Path(test_job_path)
         test_path = test_job.parent
@@ -54,8 +55,8 @@ async def test_list_dir_contents(client_id, client_secret, test_machine, test_jo
 
 
 @pytest.mark.asyncio
-async def test_list_dir(client_id, client_secret, test_machine, test_job_path):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_list_dir(async_authenticated_client, test_machine, test_job_path):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
         test_job = Path(test_job_path)
         test_path = test_job.parent
@@ -66,8 +67,8 @@ async def test_list_dir(client_id, client_secret, test_machine, test_job_path):
 
 
 @pytest.mark.asyncio
-async def test_list_file(client_id, client_secret, test_machine, test_job_path):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_list_file(async_authenticated_client, test_machine, test_job_path):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
         test_job_filename = Path(test_job_path).name
         test_job_dir = Path(test_job_path).parent
@@ -84,8 +85,8 @@ async def test_list_file(client_id, client_secret, test_machine, test_job_path):
 
 
 @pytest.mark.asyncio
-async def test_run_arg_list(client_id, client_secret, test_machine, test_job_path):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_run_arg_list(async_authenticated_client, test_machine, test_job_path):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
         output = await machine.run(["ls", test_job_path])
 
@@ -93,8 +94,8 @@ async def test_run_arg_list(client_id, client_secret, test_machine, test_job_pat
 
 
 @pytest.mark.asyncio
-async def test_run_arg_str(client_id, client_secret, test_machine, test_job_path):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_run_arg_str(async_authenticated_client, test_machine, test_job_path):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
         output = await machine.run(f"ls {test_job_path}")
 
@@ -102,8 +103,8 @@ async def test_run_arg_str(client_id, client_secret, test_machine, test_job_path
 
 
 @pytest.mark.asyncio
-async def test_run_arg_path(client_id, client_secret, test_machine):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_run_arg_path(async_authenticated_client, test_machine):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
         [remote_path] = await machine.ls("/usr/bin/hostname")
         output = await machine.run(remote_path)
@@ -112,8 +113,8 @@ async def test_run_arg_path(client_id, client_secret, test_machine):
 
 
 @pytest.mark.asyncio
-async def test_outages(client_id, client_secret, test_machine):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_outages(async_authenticated_client, test_machine):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
         outages = await machine.outages()
 
@@ -121,8 +122,8 @@ async def test_outages(client_id, client_secret, test_machine):
 
 
 @pytest.mark.asyncio
-async def test_planned_outages(client_id, client_secret, test_machine):
-    async with AsyncClient(client_id, client_secret) as client:
+async def test_planned_outages(async_authenticated_client, test_machine):
+    async with async_authenticated_client as client:
         machine = await client.compute(test_machine)
         outages = await machine.planned_outages()