sfapi-client 0.0.3__tar.gz → 0.0.5__tar.gz

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sfapi_client
-Version: 0.0.3
+Version: 0.0.5
 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.3 → sfapi_client-0.0.5}/scripts/run.py

@@ -31,6 +31,7 @@ def run_unasync():
         "AsyncGroupMember": "GroupMember",
         "AsyncRemotePath": "RemotePath",
         "AsyncProject": "Project",
+        "AsyncRole": "Role",
         "AsyncUser": "User",
         "AsyncJob": "Job",
         "AsyncJobSacct": "JobSacct",
@@ -151,7 +152,8 @@ def resources_codegen(
     ),
 ):
 
-    import requests, datetime
+    import requests
+    import datetime
     api_url = "https://api.nersc.gov/api/v1.2/status"
     response = requests.get(api_url)
     status = response.json()

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/src/sfapi_client/_async/compute.py

@@ -121,7 +121,7 @@ class AsyncCompute(ComputeBase):
 
     @check_auth
     async def job(
-        self, jobid: int, command: Optional[JobCommand] = JobCommand.sacct
+        self, jobid: Union[int, str], command: Optional[JobCommand] = JobCommand.sacct
     ) -> Union["AsyncJobSacct", "AsyncJobSqueue"]:
         # Get different job depending on query
         Job = AsyncJobSacct if (command == JobCommand.sacct) else AsyncJobSqueue
@@ -134,7 +134,7 @@ class AsyncCompute(ComputeBase):
     @check_auth
     async def jobs(
         self,
-        jobids: Optional[int] = None,
+        jobids: Optional[List[Union[int, str]]] = None,
         user: Optional[str] = None,
         partition: Optional[str] = None,
         command: Optional[JobCommand] = JobCommand.squeue,

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/src/sfapi_client/_async/projects.py

@@ -3,10 +3,15 @@ from pydantic import ValidationError, Field
 
 from .._models import (
     ProjectStats as ProjectBase,
+    RoleStats as RoleBase
 )
 from ..exceptions import SfApiError
 
 
+class AsyncRole(RoleBase):
+    client: Optional["AsyncClient"]
+
+
 class AsyncProject(ProjectBase):
     client: Optional["AsyncClient"]
     name: str = Field(alias="repo_name")

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/src/sfapi_client/_async/users.py

@@ -5,7 +5,7 @@ from .._models import (
     UserInfo as UserBase,
     GroupList as GroupsResponse,
 )
-from .projects import AsyncProject
+from .projects import AsyncProject, AsyncRole
 from ..exceptions import SfApiError
 
 
@@ -69,7 +69,7 @@ class AsyncUser(UserBase):
         if self.name != (await self.client._user()).name:
             raise SfApiError(f"Can only fetch projects for authenticated user.")
 
-        r = await self.client.get("account/roles")
+        r = await self.client.get("account/projects")
 
         json_response = r.json()
 
@@ -82,3 +82,24 @@ class AsyncUser(UserBase):
         projects = map(_set_client, projects)
 
         return list(projects)
+
+    async def roles(self) -> List[AsyncRole]:
+        """
+        The roles the user is associate with.
+        """
+        if self.name != (await self.client._user()).name:
+            raise SfApiError(f"Can only fetch roles for authenticated user.")
+
+        r = await self.client.get("account/roles")
+
+        json_response = r.json()
+
+        roles = [AsyncRole.parse_obj(p) for p in json_response]
+
+        def _set_client(p):
+            p.client = self.client
+            return p
+
+        roles = map(_set_client, roles)
+
+        return list(roles)

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/src/sfapi_client/_models/__init__.py

@@ -91,6 +91,13 @@ class PublicHost(str, Enum):
     perlmutter = "perlmutter"
 
 
+class RoleStats(BaseModel):
+    id: int = Field(..., title="Id")
+    description: str = Field(..., title="Description")
+    repo_name: str = Field(..., title="Repo Name")
+    iris_role: Optional[str] = Field(None, title="Iris Role")
+
+
 class StatusValue(str, Enum):
     active = "active"
     unavailable = "unavailable"

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/src/sfapi_client/_monitor.py

@@ -62,8 +62,9 @@ class AsyncJobMonitor:
         return job_type
 
     async def fetch_jobs(
-        self, job_type: Union[AsyncJobSacct, AsyncJobSqueue], jobids: List[int]
+        self, job_type: Union[AsyncJobSacct, AsyncJobSqueue], jobids: List[Union[int, str]]
     ) -> List[Union[AsyncJobSacct, AsyncJobSqueue]]:
+        jobids = list(map(str, jobids))
         jobids_for_type = self._jobids.setdefault(job_type, set())
         jobids_for_type.update(jobids)
 
@@ -132,8 +133,9 @@ class SyncJobMonitor:
         self._request_lock = Lock()
 
     def fetch_jobs(
-        self, job_type: Union["JobSacct", "JobSqueue"], jobids: List[int]
+        self, job_type: Union["JobSacct", "JobSqueue"], jobids: List[Union[int, str]]
     ) -> List[Union[JobSqueue, JobSacct]]:
+        jobids = list(map(str, jobids))
         # First update the jobids and create a request context
         request = None
         with self._requests_lock:

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/src/sfapi_client/_sync/compute.py

@@ -121,7 +121,7 @@ class Compute(ComputeBase):
 
     @check_auth
     def job(
-        self, jobid: int, command: Optional[JobCommand] = JobCommand.sacct
+        self, jobid: Union[int, str], command: Optional[JobCommand] = JobCommand.sacct
     ) -> Union["JobSacct", "JobSqueue"]:
         # Get different job depending on query
         Job = JobSacct if (command == JobCommand.sacct) else JobSqueue
@@ -134,7 +134,7 @@ class Compute(ComputeBase):
     @check_auth
     def jobs(
         self,
-        jobids: Optional[int] = None,
+        jobids: Optional[List[Union[int, str]]] = None,
         user: Optional[str] = None,
         partition: Optional[str] = None,
         command: Optional[JobCommand] = JobCommand.squeue,

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/src/sfapi_client/_sync/projects.py

@@ -3,10 +3,15 @@ from pydantic import ValidationError, Field
 
 from .._models import (
     ProjectStats as ProjectBase,
+    RoleStats as RoleBase
 )
 from ..exceptions import SfApiError
 
 
+class Role(RoleBase):
+    client: Optional["Client"]
+
+
 class Project(ProjectBase):
     client: Optional["Client"]
     name: str = Field(alias="repo_name")

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/src/sfapi_client/_sync/users.py

@@ -5,7 +5,7 @@ from .._models import (
     UserInfo as UserBase,
     GroupList as GroupsResponse,
 )
-from .projects import Project
+from .projects import Project, Role
 from ..exceptions import SfApiError
 
 
@@ -69,7 +69,7 @@ class User(UserBase):
         if self.name != (self.client._user()).name:
             raise SfApiError(f"Can only fetch projects for authenticated user.")
 
-        r = self.client.get("account/roles")
+        r = self.client.get("account/projects")
 
         json_response = r.json()
 
@@ -82,3 +82,24 @@ class User(UserBase):
         projects = map(_set_client, projects)
 
         return list(projects)
+
+    def roles(self) -> List[Role]:
+        """
+        The roles the user is associate with.
+        """
+        if self.name != (self.client._user()).name:
+            raise SfApiError(f"Can only fetch roles for authenticated user.")
+
+        r = self.client.get("account/roles")
+
+        json_response = r.json()
+
+        roles = [Role.parse_obj(p) for p in json_response]
+
+        def _set_client(p):
+            p.client = self.client
+            return p
+
+        roles = map(_set_client, roles)
+
+        return list(roles)

sfapi_client-0.0.5/src/sfapi_client/projects.py

@@ -0,0 +1,2 @@
+from ._async.projects import AsyncProject, AsyncRole
+from ._sync.projects import Project, Role

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/tests/test_projects.py

@@ -24,3 +24,21 @@ async def test_create_group(
         group = project.create_group(test_group_create)
 
         assert group.name == test_create_group
+
+
+def test_projects(
+    client_id, client_secret
+):
+    with Client(client_id, client_secret) as client:
+        user = client.user()
+        projects = user.projects()
+        assert projects
+
+
+def test_roles(
+    client_id, client_secret
+):
+    with Client(client_id, client_secret) as client:
+        user = client.user()
+        roles = user.roles()
+        assert roles

{sfapi_client-0.0.3 → sfapi_client-0.0.5}/tests/test_projects_async.py

@@ -26,3 +26,23 @@ async def test_create_group(
         group = await project.create_group(test_group_create)
 
         assert group.name == test_create_group
+
+
+@pytest.mark.asyncio
+async def test_projects(
+    client_id, client_secret
+):
+    async with AsyncClient(client_id, client_secret) as client:
+        user = await client.user()
+        projects = await user.projects()
+        assert projects
+
+
+@pytest.mark.asyncio
+async def test_roles(
+    client_id, client_secret
+):
+    async with AsyncClient(client_id, client_secret) as client:
+        user = await client.user()
+        roles = await user.roles()
+        assert roles

sfapi_client-0.0.3/src/sfapi_client/projects.py

@@ -1,2 +0,0 @@
-from ._async.projects import AsyncProject
-from ._sync.projects import Project