proximl 0.5.13.post1__py3-none-any.whl → 0.5.15__py3-none-any.whl

proximl/__init__.py

@@ -13,5 +13,5 @@ logging.basicConfig(
 logger = logging.getLogger(__name__)
 
 
-__version__ = "0.5.13.post1"
+__version__ = "0.5.15"
 __all__ = "ProxiML"

proximl/cli/job/create.py

@@ -180,6 +180,12 @@ def create(config):
     help="Third Party Credentials to add to the job environment",
     multiple=True,
 )
+@click.option(
+    "--secret",
+    type=click.STRING,
+    help="Project secrets to add to the job environment",
+    multiple=True,
+)
 @click.option(
     "--git-uri",
     type=click.STRING,
@@ -222,6 +228,7 @@ def notebook(
     custom_image,
     env,
     credential,
+    secret,
     apt_packages,
     pip_packages,
     conda_packages,
@@ -254,7 +261,7 @@ def notebook(
         data=dict(datasets=datasets),
         model=dict(checkpoints=checkpoints),
         environment=dict(
-            credentials=[k for k in credential],
+            credentials=[k for k in credential], secrets=[s for s in secret]
         ),
     )
 
@@ -508,6 +515,12 @@ def notebook(
     help="Third Party Credentials to add to the job environment",
     multiple=True,
 )
+@click.option(
+    "--secret",
+    type=click.STRING,
+    help="Project secrets to add to the job environment",
+    multiple=True,
+)
 @click.option(
     "--apt-packages",
     type=click.STRING,
@@ -564,6 +577,7 @@ def training(
     custom_image,
     env,
     credential,
+    secret,
     apt_packages,
     pip_packages,
     conda_packages,
@@ -596,7 +610,7 @@ def training(
         data=dict(datasets=datasets),
         model=dict(checkpoints=checkpoints),
         environment=dict(
-            credentials=[k for k in credential],
+            credentials=[k for k in credential], secrets=[s for s in secret]
         ),
     )
 
@@ -852,6 +866,12 @@ def training(
     help="Third Party Credentials to add to the job environment",
     multiple=True,
 )
+@click.option(
+    "--secret",
+    type=click.STRING,
+    help="Project secrets to add to the job environment",
+    multiple=True,
+)
 @click.option(
     "--apt-packages",
     type=click.STRING,
@@ -908,6 +928,7 @@ def inference(
     custom_image,
     env,
     credential,
+    secret,
     apt_packages,
     pip_packages,
     conda_packages,
@@ -934,6 +955,7 @@ def inference(
         model=dict(checkpoints=checkpoints),
         environment=dict(
             credentials=[k for k in credential],
+            secrets=[s for s in secret],
         ),
     )
 
@@ -1171,6 +1193,12 @@ def from_json(config, attach, connect, file):
     help="Third Party Credentials to add to the job environment",
     multiple=True,
 )
+@click.option(
+    "--secret",
+    type=click.STRING,
+    help="Project secrets to add to the job environment",
+    multiple=True,
+)
 @click.option(
     "--apt-packages",
     type=click.STRING,
@@ -1231,6 +1259,7 @@ def endpoint(
     custom_image,
     env,
     credential,
+    secret,
     apt_packages,
     pip_packages,
     conda_packages,
@@ -1258,6 +1287,7 @@ def endpoint(
         model=dict(checkpoints=checkpoints),
         environment=dict(
             credentials=[k for k in credential],
+            secrets=[s for s in secret],
         ),
     )
 

proximl/cloudbender/services.py

@@ -67,7 +67,7 @@ class Services(object):
 
 
 class Service:
-    def __init__(self, proximl, **kwargs):
+    def __init__(self, proximl,  **kwargs):
         self.proximl = proximl
         self._service = kwargs
         self._id = self._service.get("service_id")
@@ -177,3 +177,21 @@ class Service:
                 logging.debug(f"self: {self}, retry count {count}")
 
         raise ProxiMLException(f"Timeout waiting for {status}")
+    
+    async def generate_certificate(self, **kwargs):
+        resp = await self.proximl._query(
+            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/service/{self._id}/certificate",
+            "POST",
+            kwargs
+        )
+        self.__init__(self.proximl, **resp)
+        return self
+    
+    async def sign_client_certificate(self, csr, **kwargs):
+        certificate = await self.proximl._query(
+            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/service/{self._id}/certificate/sign",
+            "POST",
+            kwargs,
+            dict(csr=csr)
+        )
+        return certificate

proximl/jobs.py

@@ -530,6 +530,15 @@ class Job:
                         "waiting for data/model download",
                     ]
                 )
+                or (
+                    status
+                    == "running"  ## this status could be too short for polling could miss it
+                    and self.status
+                    in [
+                        "uploading",
+                        "finished"
+                    ]
+                )
             ):
                 return self
             elif self.status == "failed":

proximl/projects/members.py

@@ -0,0 +1,98 @@
+import json
+import logging
+from typing import Literal
+
+class ProjectMembers(object):
+    def __init__(self, proximl, project_id):
+        self.proximl = proximl
+        self.project_id = project_id
+
+    async def list(self, **kwargs):
+        resp = await self.proximl._query(
+            f"/project/{self.project_id}/access", "GET", kwargs
+        )
+        members = [ProjectMember(self.proximl, **member) for member in resp]
+        return members
+    
+    async def add(self, email: str, job: Literal["all", "read"], dataset: Literal["all", "read"], model: Literal["all", "read"], checkpoint: Literal["all", "read"], volume: Literal["all", "read"],  **kwargs):
+        data = dict(
+            email=email,
+            job=job,
+            dataset=dataset,
+            model=model,
+            checkpoint=checkpoint,
+            volume=volume,
+        )
+        payload = {k: v for k, v in data.items() if v is not None}
+        resp = await self.proximl._query(
+            f"/project/{self.project_id}/access", "POST",kwargs, payload)
+        member = ProjectMember(self.proximl, **resp)
+        logging.info(f"Added Project Member {email} to project {self.project_id}")
+        return member
+
+    
+    async def remove(self, email, **kwargs):
+        await self.proximl._query(
+            f"/project/{self.project_id}/access", "DELETE", dict(**kwargs, email=email)
+        )
+
+
+class ProjectMember:
+    def __init__(self, proximl, **kwargs):
+        self.proximl = proximl
+        self._entity = kwargs
+        self._id = self._entity.get("email")
+        self._project_uuid = self._entity.get("project_uuid")
+        self._owner = self._entity.get("owner")
+        self._job = self._entity.get("job")
+        self._dataset = self._entity.get("dataset")
+        self._model = self._entity.get("model")
+        self._checkpoint = self._entity.get("checkpoint")
+        self._volume = self._entity.get("volume")
+
+    @property
+    def id(self) -> str:
+        return self._id
+
+    @property
+    def project_uuid(self) -> str:
+        return self._project_uuid
+    
+    @property
+    def email(self) -> str:
+        return self._id
+
+    @property
+    def owner(self) -> bool:
+        return self._owner
+
+    @property
+    def job(self) -> str:
+        return self._job
+
+    @property
+    def dataset(self) -> str:
+        return self._dataset
+    
+    @property
+    def model(self) -> str:
+        return self._model
+    
+    @property
+    def checkpoint(self) -> str:
+        return self._checkpoint
+    
+    @property
+    def volume(self) -> str:
+        return self._volume
+
+    def __str__(self):
+        return json.dumps({k: v for k, v in self._entity.items()})
+
+    def __repr__(self):
+        return f"ProjectMember( proximl , **{self._entity.__repr__()})"
+
+    def __bool__(self):
+        return bool(self._id)
+
+

proximl/projects/projects.py

@@ -5,6 +5,7 @@ from .data_connectors import ProjectDataConnectors
 from .services import ProjectServices
 from .credentials import ProjectCredentials
 from .secrets import ProjectSecrets
+from .members import ProjectMembers
 
 
 class Projects(object):
@@ -56,6 +57,7 @@ class Project:
         self.services = ProjectServices(self.proximl, self._id)
         self.credentials = ProjectCredentials(self.proximl, self._id)
         self.secrets = ProjectSecrets(self.proximl, self._id)
+        self.members = ProjectMembers(self.proximl, self._id)
 
     @property
     def id(self) -> str:

proximl/projects/services.py

@@ -77,3 +77,20 @@ class ProjectService:
         await self.proximl._query(
             f"/project/{self._project_uuid}/services/{self._id}/disable", "PATCH"
         )
+
+    async def get_service_ca_certificate(self, **kwargs):
+        certificate = await self.proximl._query(
+            f"/project/{self._project_uuid}/services/{self._id}/certificate/ca",
+            "GET",
+            kwargs,
+        )
+        return certificate
+    
+    async def sign_client_certificate(self, csr, **kwargs):
+        certificate = await self.proximl._query(
+            f"/project/{self._project_uuid}/services/{self._id}/certificate/sign",
+            "POST",
+            kwargs,
+            dict(csr=csr)
+        )
+        return certificate

proximl/proximl.py

@@ -4,6 +4,7 @@ import asyncio
 import aiohttp
 import logging
 import traceback
+import random
 from importlib.metadata import version
 
 from proximl.auth import Auth
@@ -91,7 +92,7 @@ class ProxiML(object):
     def project(self) -> str:
         return self.active_project
 
-    async def _query(self, path, method, params=None, data=None, headers=None):
+    async def _query(self, path, method, params=None, data=None, headers=None,max_retries=3, backoff_factor=0.5):
         try:
             tokens = self.auth.get_tokens()
         except ProxiMLException as e:
@@ -142,24 +143,40 @@ class ProxiML(object):
         logging.debug(
             f"Request - Url: {url}, Method: {method}, Params: {params}, Body: {data}, Headers: {headers}"
         )
-        async with aiohttp.ClientSession() as session:
-            async with session.request(
-                method,
-                url,
-                data=json.dumps(data),
-                headers=headers,
-                params=params,
-            ) as resp:
-                if (resp.status // 100) in [4, 5]:
-                    what = await resp.read()
-                    content_type = resp.headers.get("content-type", "")
-                    resp.close()
-                    if content_type == "application/json":
-                        raise ApiError(resp.status, json.loads(what.decode("utf8")))
-                    else:
-                        raise ApiError(resp.status, {"message": what.decode("utf8")})
-                results = await resp.json()
-                return results
+        for attempt in range(max_retries):
+            try:
+                async with aiohttp.ClientSession() as session:
+                    async with session.request(
+                        method,
+                        url,
+                        data=json.dumps(data),
+                        headers=headers,
+                        params=params,
+                    ) as resp:
+                        if (resp.status // 100) in [4, 5]:
+                            if resp.status == 502 and attempt < max_retries - 1:
+                                wait_time = (2 ** attempt) * backoff_factor * (random.random() + 0.5)
+                                await asyncio.sleep(wait_time)
+                                continue
+                            else:
+                                what = await resp.read()
+                                content_type = resp.headers.get("content-type", "")
+                                resp.close()
+                                if content_type == "application/json":
+                                    raise ApiError(resp.status, json.loads(what.decode("utf8")))
+                                else:
+                                    raise ApiError(resp.status, {"message": what.decode("utf8")})
+                        results = await resp.json()
+                        return results
+            except aiohttp.ClientResponseError as e:
+                if e.status == 502 and attempt < max_retries - 1:
+                    wait_time = (2 ** attempt) * backoff_factor * (random.random() + 0.5)
+                    await asyncio.sleep(wait_time)
+                    continue
+                else:
+                    raise  ApiError(e.status, f"Error {e.message}")
+
+        raise ProxiMLException("Unexpected API failure")
 
     async def _ws_subscribe(self, entity, project_uuid, id, msg_handler):
         headers = {

{proximl-0.5.13.post1.dist-info → proximl-0.5.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: proximl
-Version: 0.5.13.post1
+Version: 0.5.15
 Summary: proxiML client SDK and command line utilities
 Home-page: https://github.com/proxiML/python-sdk
 Author: proxiML

{proximl-0.5.13.post1.dist-info → proximl-0.5.15.dist-info}/RECORD

@@ -2,7 +2,7 @@ examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 examples/create_dataset_and_training_job.py,sha256=Fqueoz2KD1MTxnU960iqHUdxvo68Xe64HT5XS55lI9w,1178
 examples/local_storage.py,sha256=6K6LMO7ZPI7N2KdBcgqXSvdsqJfjISzN4yRO9YrJqbA,1745
 examples/training_inference_pipeline.py,sha256=pxux0QUUtRXxKj2rX-6fPEKBIi43mhRd1zJ-Lf1ZJGI,2334
-proximl/__init__.py,sha256=H24uX4w44gBopXgz6-IQz2EmtKokV3dNMKqD9KEsAKM,439
+proximl/__init__.py,sha256=cS84qd0OsBVm8H9pmmykeIzYpGPYj5wbaGNpQezWMdI,433
 proximl/__main__.py,sha256=JgErYkiskih8Y6oRwowALtR-rwQhAAdqOYWjQraRIPI,59
 proximl/auth.py,sha256=LacGBDAVel5HcJx7JXp1wVn3s0gZc7nf--vDfSFOXYU,26565
 proximl/checkpoints.py,sha256=Ezpiab9Wfcmd2h5Slm9U5lekZGXiPzvhDKxXXgla1yo,8790
@@ -11,9 +11,9 @@ proximl/datasets.py,sha256=dBDzf7DZ1rS5LmJPy5oV-JC0PXGTf-NZuBDG1KPyoA4,8600
 proximl/environments.py,sha256=L_cRmau1wJxpGvnJAqgms-GiNdDhiuOntrlBqsdoE3A,1507
 proximl/exceptions.py,sha256=q1YfsqbLw3y1DJHP1FcMM8xG5CEhQsTIvRfq4v5PyVw,5468
 proximl/gpu_types.py,sha256=V-EZzE-hDLi5eVQ2_9yGLTm8-Qk1AnnzctfSVC44yLY,1901
-proximl/jobs.py,sha256=DySH1hzLiYFdE5IhAX5ppISXQTK-hB1dKtWOgrTenEM,17632
+proximl/jobs.py,sha256=HiGs2gRKPFZReHLg9DLPsDWEecxZpafWv6XFBSGXYj0,17947
 proximl/models.py,sha256=gJQ1C3HGEHScW41PAQS3Q8IKSQSauIUIJxOZvkDzizQ,8284
-proximl/proximl.py,sha256=yzKbJ7ak8YiVv6q7CEagPufECNU4YTNeul6N3OuyH1M,10864
+proximl/proximl.py,sha256=7UyqYbGO9edFJec54xqk_wwahKldXQlY5112Izg3saA,11902
 proximl/volumes.py,sha256=qRIgzvJ4NTHuLi7QN_6v61Urns8l4Y9KjWladCIQ2gk,8443
 proximl/cli/__init__.py,sha256=R_8ExAKQp67N2xtwGM00gtK3zSoWPGruHAP_XFLddSI,4346
 proximl/cli/checkpoint.py,sha256=Iv1i1EAt2LJey2wy2ioQ6-ZysqwRG4kFj0lnE6INZCM,7170
@@ -32,7 +32,7 @@ proximl/cli/cloudbender/provider.py,sha256=qhWbDK1tWi00wQWEYqGw7yGoZx0nEjV40GLHR
 proximl/cli/cloudbender/region.py,sha256=WnSkY4dXKRJ-FNaoxMfmoh6iuUx5dXCNJmEFT34Xtao,2892
 proximl/cli/cloudbender/service.py,sha256=6NuwlFULJLtOmMy9OFA8GkW4MLvNemAcd_KitQyDXV8,3147
 proximl/cli/job/__init__.py,sha256=s8mU2PvCWDcv4gGT3EmjHn8MIZlXBAoayoZKmnKpXnY,6545
-proximl/cli/job/create.py,sha256=0EsICgLxP5EniWxN-eTKnJtMoKJJXcfgB5myfNzcDrs,34380
+proximl/cli/job/create.py,sha256=plRiX9lRqt6lrjWvTIVbLC-EoDgSL0-oYqwIfuWb_ek,35098
 proximl/cli/project/__init__.py,sha256=ZSiXhsq7O1JwGecsBKBOD1W0VuiwErs-FFsfrXMOiFs,1918
 proximl/cli/project/credential.py,sha256=5vPI6VBIo_YyvAzfUa9ARmz-LUnkdIVW0zbko9t0Q38,3443
 proximl/cli/project/data_connector.py,sha256=CKF4snfrzDmeDXb4au8nV2W9jTweRMDZ89U2GAlBedQ,1411
@@ -48,33 +48,38 @@ proximl/cloudbender/devices.py,sha256=vHooaOw2k2Tf99FJHnVZTgggqCTYJg7rq46aUPW0k8
 proximl/cloudbender/nodes.py,sha256=T7aCh2O6sF2tFX4D5a7wDW8hJmEgHoCV9So1kg70tdg,5924
 proximl/cloudbender/providers.py,sha256=KLO4Pc8yeW8TpSDICgTw3NxN44_0s4HptVsR2hHc28w,3738
 proximl/cloudbender/regions.py,sha256=6doBdfMXIQI-uexzvwmNg2ATDzruatw-ixviZSMjonU,5157
-proximl/cloudbender/services.py,sha256=km3KcIgaRRVb3iuZEIn6ONIekuyXhBgk_brAFJcMMl4,5126
+proximl/cloudbender/services.py,sha256=FOhtRozqNroO9Ru6gtsKgjumGREiLCooXMXchDh5cNM,5773
 proximl/projects/__init__.py,sha256=6NKCcHtQMeGB1IyU-djANphfnDX6MEkrXUM5Fyq9fWg,75
 proximl/projects/credentials.py,sha256=hWz6EUEAgltkAQMDjQVsFlVvfWUbZfY3KoWpldnCrXY,2255
 proximl/projects/data_connectors.py,sha256=o2-K40BdF85TBXJgj1UMsznBmNHmnYh1qbZtHmmOa2Y,2216
 proximl/projects/datastores.py,sha256=8nHpMEHn3UzsIhmPMoXympbRRJ10XkHdyRhBXUVXyeE,2095
-proximl/projects/projects.py,sha256=V86mKR5USaLaqcKf7XcGIXeH5qmIL0bYITvnwqSTwzI,2792
+proximl/projects/members.py,sha256=siREAa-Oac1pLGRHMXmj3ShoB0DVl8uY34eFdTlSezA,2826
+proximl/projects/projects.py,sha256=PJYUaXbYMINcvlDQePKUSAz6uO11jg9tj5gJW-cNjGQ,2890
 proximl/projects/secrets.py,sha256=xlfzRONjT2ySJDcq8FYRQmSU2ZJMdPLS8NbePWYNCeM,2160
-proximl/projects/services.py,sha256=C1YUxixkio8n4AlgmGqZJ93hP3VKOoTXVXTNCkRVd9Y,2206
+proximl/projects/services.py,sha256=aCESZjqfI9K-iXl8uJQsjEyoX29LuPaNv_TFjK6B2Ts,2771
 tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/conftest.py,sha256=zRWpherX-yfbpk7xqZk9bIZCyJ-dwVeszY_7kekn2M4,1134
-tests/integration/test_checkpoints_integration.py,sha256=m-m6KM5Iy99bbCyA6VQVBFWc9MI7VItuoAPb_Q6Q0Fk,3206
-tests/integration/test_datasets_integration.py,sha256=Ndp8itnncDSjVH0t5BM5R_-_yL4qt6JrkQAVOTMi1R8,3499
+tests/integration/conftest.py,sha256=rqOKgDZ37SZH6CxXZIQSHtx8SF5GC1MlC49Zb5xrzsk,1135
+tests/integration/test_checkpoints_integration.py,sha256=2gKhbax96ePIEZqcM4IeqSB0fTOYPh9nexNJtC96LuU,3239
+tests/integration/test_datasets_integration.py,sha256=y8NL7fKQvZhJs1r9UAcLjXI0832tHr9XfIaRhHX9aOk,3529
 tests/integration/test_environments_integration.py,sha256=7P6pKSyxA7rTwyNCD9HEaM2ablMG8WcBesOzkG-BgsQ,1403
 tests/integration/test_gpu_types_integration.py,sha256=Zv-yrHcAgKau9BJQvzi92bdrRHhLPl_hbhhzNLEWJ9w,1256
-tests/integration/test_jobs_integration.py,sha256=9wY6ZfCv9FkafV0FJ5QRIwO0-8JR-81iB6uLT9C3pQ8,25110
-tests/integration/test_models_integration.py,sha256=cnsao7Zo4PwVCbdAdcBs0xombAslI_X_JOw6ipxdzOA,2878
-tests/integration/test_volumes_integration.py,sha256=Xo2Whw2U-7jyvESIkyex3f0SMXKlExe3kLmsbpXTHhQ,3270
+tests/integration/test_jobs_integration.py,sha256=mSgPERDycfphLuLd7Hp3tSo-SpnbACp963x99K3XbtU,25263
+tests/integration/test_models_integration.py,sha256=du9i3GsWjwEWei_-5BzfoBneBNcZ-9NQsDdOfn4dzd8,2906
+tests/integration/test_volumes_integration.py,sha256=fTsP5_wyspzR_DX_ArXz5Fflq2dEmXtJbhwqCjSQDOA,3299
 tests/integration/cloudbender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/cloudbender/test_providers_integration.py,sha256=gFqPQom-Cn1iZC50_ChQ2us2_f4tIPATQSAUcWdf7ss,1473
+tests/integration/cloudbender/conftest.py,sha256=K1EQC7U7aBnywJq-QvBZINqHtQm7kq5feDWVKAtp22E,777
+tests/integration/cloudbender/test_providers_integration.py,sha256=8_1TBxcIpQcET7VStHIsi_-_3j5hs8H-icsKN3qnNa8,1327
+tests/integration/cloudbender/test_regions_integration.py,sha256=9Cj2s2cX07iUnhYvFyrNxLxYHCPVjAA9Gfes7Xf7OV0,1406
+tests/integration/cloudbender/test_services_integration.py,sha256=ziw3K-48Yl2Rzy-rCNw9QZ5m3TtfmQecdgdTpzSuUVA,3367
 tests/integration/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/projects/conftest.py,sha256=4WbknSwdJgzPAr5qumCJD3Cl1rQFWgGZ5-Wro1ka0xA,249
-tests/integration/projects/test_projects_credentials_integration.py,sha256=_JqE2sGN09gZpvhtMRFjBPXumJ-PqKl8iXOgcYHlvSY,1636
-tests/integration/projects/test_projects_data_connectors_integration.py,sha256=ag6w2FFQYNlAdV83rOqat0FVZnP4JFhDunCvRwMJdzo,1630
-tests/integration/projects/test_projects_datastores_integration.py,sha256=DCHFnCYguhtrZvfTeWgKpPxlkeAXxVfE3IWkM4KjgAc,1469
-tests/integration/projects/test_projects_integration.py,sha256=wlRLxZkMnJZHlNPaeRFjAeyUlMfbgdrrFEI2eMBcoUI,1241
-tests/integration/projects/test_projects_secrets_integration.py,sha256=wRkcVkaf-zLWvCdJx9ikJYAoiJXU1esv0diRxwwRFdc,1481
-tests/integration/projects/test_projects_services_integration.py,sha256=MV9tZFTgrUtzImNrc-ZAoHYLbf_ZxAAAeVpxxr5AGdg,1530
+tests/integration/projects/conftest.py,sha256=C_UumszWK-Es39ULv-Lz4TvbMdXXKQvZV6OwFSX8Mn0,294
+tests/integration/projects/test_projects_credentials_integration.py,sha256=-OXDLaaWm_W0-AHDEHbMATjPGkyoAd_Vf3UsVJBg0_A,1675
+tests/integration/projects/test_projects_data_connectors_integration.py,sha256=UBeqWbGoVZCH4BIVm4t9_L4mwzbN7oqncZyxcuwEnZQ,1669
+tests/integration/projects/test_projects_datastores_integration.py,sha256=M-Hv3bSgG6FZap-WFA2DavqUaNJ4K9W4Du5214dURjQ,1508
+tests/integration/projects/test_projects_integration.py,sha256=s5_M04wIKh4VHEdcc6FImUz5KhTS0-Wgxd6CMvWNmy8,1280
+tests/integration/projects/test_projects_members_integration.py,sha256=4i4SeDCDZwmG82tjQEDyyFU-U52aBE5TeSXIP3RW8sA,1882
+tests/integration/projects/test_projects_secrets_integration.py,sha256=TyqItJs-SBzOUwDy3vs_-yrDXeDF8r1_bAovr8C1a_s,1520
+tests/integration/projects/test_projects_services_integration.py,sha256=cHOGSUpl3rqYJnCrbYp-2Zmn1ngFJTDV9Io7K8fDOp0,1569
 tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/conftest.py,sha256=11Z49O4mKXtm6xl18kWPomZvbZJQpqdaDYeJHFQbO1A,35588
 tests/unit/test_auth_unit.py,sha256=IJZHT5CZLNfu3MybTdEWIsKlvxNfFYpZ6oWYzbS856g,858
@@ -124,12 +129,13 @@ tests/unit/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 tests/unit/projects/test_project_credentials_unit.py,sha256=y528DyvIm7uc5mFuwiUPjOMO1dkVcMEeYQqzMmKLOuk,3480
 tests/unit/projects/test_project_data_connectors_unit.py,sha256=Yx2yCUgcuN_KfTKynZxse0Nx8jRrSlMygI7R8a-NjE4,3385
 tests/unit/projects/test_project_datastores_unit.py,sha256=WZMKkhpEg2dcevJqT7k6QRcYJF6FJfq177BDk2GWOBk,3129
+tests/unit/projects/test_project_members_unit.py,sha256=dtbRfP454mviQYn6Dc0Uzyb3BBIuR3Ive6g3mnUAR6M,3466
 tests/unit/projects/test_project_secrets_unit.py,sha256=VE9L91FJodcwVGizfF65WYMiHZaF0s2AdW1aiJ3z7xA,3276
 tests/unit/projects/test_project_services_unit.py,sha256=PzeNuJRuAG7RkrPWX0FfgFTt6-63FviecrDY06rLQ6A,3331
 tests/unit/projects/test_projects_unit.py,sha256=4vMo7TF-SjduoT2ejpuyM3dULslpdqE8-c25M9X-iYc,3810
-proximl-0.5.13.post1.dist-info/LICENSE,sha256=ADFxLEZDxKY0j4MdyUd5GNuhQ18rnWH5rOz1ZG7yiOA,1069
-proximl-0.5.13.post1.dist-info/METADATA,sha256=BvyKWNRgTQNT4Wg2eqJeEwbjcsJWsPoANfYhJUVkfNU,7351
-proximl-0.5.13.post1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-proximl-0.5.13.post1.dist-info/entry_points.txt,sha256=HmI311IIabkZReMCXu-nGbvIEW-KfaduAOyfiSqt5SY,63
-proximl-0.5.13.post1.dist-info/top_level.txt,sha256=-TWqc9tAaxmWmW4c7uYsmzPEYUIoh6z02xxqPbv7Kys,23
-proximl-0.5.13.post1.dist-info/RECORD,,
+proximl-0.5.15.dist-info/LICENSE,sha256=ADFxLEZDxKY0j4MdyUd5GNuhQ18rnWH5rOz1ZG7yiOA,1069
+proximl-0.5.15.dist-info/METADATA,sha256=9lwoFniw9bBF974xxoeOv2j89XLjBGienszKZwhh-9c,7345
+proximl-0.5.15.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+proximl-0.5.15.dist-info/entry_points.txt,sha256=HmI311IIabkZReMCXu-nGbvIEW-KfaduAOyfiSqt5SY,63
+proximl-0.5.15.dist-info/top_level.txt,sha256=-TWqc9tAaxmWmW4c7uYsmzPEYUIoh6z02xxqPbv7Kys,23
+proximl-0.5.15.dist-info/RECORD,,

tests/integration/cloudbender/conftest.py

@@ -0,0 +1,28 @@
+
+from pytest import fixture, mark
+
+
+pytestmark = [mark.integration,mark.cloudbender]
+
+@fixture(scope="session")
+@mark.create
+@mark.asyncio
+@mark.xdist_group("cloudbender_resources")
+async def provider( proximl):
+    provider = await proximl.cloudbender.providers.enable(type="test")
+    await provider.wait_for("ready")
+    yield provider
+    await provider.remove()
+
+@fixture(scope="session")
+@mark.create
+@mark.asyncio
+@mark.xdist_group("cloudbender_resources")
+async def region(proximl, provider):
+    region = await proximl.cloudbender.regions.create(provider_uuid=provider.id,name="test-region",
+        public=False,
+        storage=dict(mode="local"),)
+    await region.wait_for("healthy")
+    yield region
+    await region.remove()
+    await region.wait_for("archived")

tests/integration/cloudbender/test_providers_integration.py

@@ -8,14 +8,9 @@ pytestmark = [mark.sdk, mark.integration, mark.cloudbender, mark.providers]
 
 @mark.create
 @mark.asyncio
-class GetProvidersTests:
-    @fixture(scope="class")
-    async def provider(self, proximl):
-        provider = await proximl.cloudbender.providers.enable(type="test")
-        yield provider
-        await provider.remove()
-
-    async def test_get_providers(self, proximl):
+@mark.xdist_group("cloudbender_resources")
+class GetProviderTests:
+    async def test_get_providers(self, proximl, provider):
         providers = await proximl.cloudbender.providers.list()
         assert len(providers) > 0
 

tests/integration/cloudbender/test_regions_integration.py

@@ -0,0 +1,42 @@
+import re
+import sys
+import asyncio
+from pytest import mark, fixture
+
+pytestmark = [mark.sdk, mark.integration, mark.cloudbender, mark.regions]
+
+
+@mark.create
+@mark.asyncio
+@mark.xdist_group("cloudbender_resources")
+class GetRegionTests:
+    async def test_get_regions(self, proximl, provider, region):
+        regions = await proximl.cloudbender.regions.list(provider_uuid=provider.id)
+        assert len(regions) > 0
+
+    async def test_get_region(self, proximl, provider, region):
+        response = await proximl.cloudbender.regions.get(provider.id, region.id)
+        assert response.id == region.id
+
+    async def test_region_properties(self, provider, region):
+        assert isinstance(region.id, str)
+        assert isinstance(region.provider_uuid, str)
+        assert isinstance(region.type, str)
+        assert region.type == "test"
+        assert region.provider_uuid == provider.id
+
+    async def test_region_str(self, region):
+        string = str(region)
+        regex = r"^{.*\"region_uuid\": \"" + region.id + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_region_repr(self, region):
+        string = repr(region)
+        regex = (
+            r"^Region\( proximl , \*\*{.*'region_uuid': '"
+            + region.id
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)

tests/integration/cloudbender/test_services_integration.py

@@ -0,0 +1,87 @@
+import re
+import sys
+import asyncio
+from pytest import mark, fixture
+from cryptography import x509
+from cryptography.x509.oid import NameOID, ExtendedKeyUsageOID
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives import serialization, hashes
+
+pytestmark = [mark.sdk, mark.integration, mark.cloudbender, mark.regions]
+
+def get_csr(service_id):
+    private_key = rsa.generate_private_key(
+        public_exponent=65537,
+        key_size=4096
+    )
+    csr = x509.CertificateSigningRequestBuilder().subject_name(x509.Name([
+        x509.NameAttribute(NameOID.COUNTRY_NAME, "US"),
+        x509.NameAttribute(NameOID.ORGANIZATION_NAME, "proxiML"),
+        x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, service_id),
+        x509.NameAttribute(NameOID.COMMON_NAME, "test-client"),  # Client identity
+    ])).add_extension(
+        x509.ExtendedKeyUsage([
+            ExtendedKeyUsageOID.CLIENT_AUTH  # Client authentication usage
+        ]),
+        critical=True
+    ).sign(private_key, hashes.SHA256())
+    return csr.public_bytes(serialization.Encoding.PEM).decode("utf-8")
+
+@mark.create
+@mark.asyncio
+@mark.xdist_group("cloudbender_resources")
+class GetServiceTests:
+    @fixture(scope="class")
+    async def service(self, proximl, region):
+        service = await proximl.cloudbender.services.create(
+            provider_uuid=region.provider_uuid,
+            region_uuid=region.id,
+            name="CLI Automated Service",
+            type="tcp",
+            port="8989",
+            public=False,
+        )
+        await service.wait_for("active")
+        yield service
+        await service.remove()
+        await service.wait_for("archived")
+
+    async def test_get_services(self, proximl, region,service):
+        services = await proximl.cloudbender.services.list(provider_uuid=region.provider_uuid, region_uuid=region.id)
+        assert len(services) > 0
+
+    async def test_get_service(self, proximl, provider, region, service):
+        response = await proximl.cloudbender.services.get(provider.id, region.id, service.id)
+        assert response.id == service.id
+
+    async def test_service_properties(self, region, service):
+        assert isinstance(service.id, str)
+        assert isinstance(service.provider_uuid, str)
+        assert isinstance(service.region_uuid, str)
+        assert isinstance(service.public, bool)
+        assert service.port == "8989"
+        assert service.provider_uuid == region.provider_uuid
+        assert service.region_uuid == region.id
+
+    async def test_service_str(self, service):
+        string = str(service)
+        regex = r"^{.*\"service_id\": \"" + service.id + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_service_repr(self, service):
+        string = repr(service)
+        regex = (
+            r"^Service\( proximl , \*\*{.*'service_id': '"
+            + service.id
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_service_certificate(self, service):
+        service = await service.generate_certificate()
+        assert isinstance(service._service.get("auth_cert"), str)
+        csr = get_csr(service.id)
+        certificate = await service.sign_client_certificate(csr)
+        assert isinstance(certificate, str)

tests/integration/conftest.py

@@ -40,7 +40,7 @@ def env(request):
     yield ENVS[env]
 
 
-@fixture(scope="module")
+@fixture(scope="session")
 def proximl(env):
     proximl = ProxiML(**env)
     yield proximl

tests/integration/projects/conftest.py

@@ -1,7 +1,8 @@
-from pytest import fixture
+from pytest import fixture, mark
 
 
 @fixture(scope="module")
+@mark.xdist_group("project_resources")
 async def project(proximl):
     project = await proximl.projects.create(
         name="New Project", copy_credentials=False, copy_secrets=False

tests/integration/projects/test_projects_credentials_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectCredentialsTests:
     @fixture(scope="class")
     async def project_credential(self, project):

tests/integration/projects/test_projects_data_connectors_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectDataConnectorsTests:
     @fixture(scope="class")
     async def project_data_connector(self, project):

tests/integration/projects/test_projects_datastores_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectDatastoresTests:
     @fixture(scope="class")
     async def project_datastore(self, project):

tests/integration/projects/test_projects_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class GetProjectsTests:
     async def test_get_projects(self, proximl):
         projects = await proximl.projects.list()

tests/integration/projects/test_projects_members_integration.py

@@ -0,0 +1,50 @@
+import re
+import sys
+import asyncio
+from pytest import mark, fixture
+
+pytestmark = [mark.sdk, mark.integration, mark.projects]
+
+
+@mark.create
+@mark.asyncio
+@mark.xdist_group("project_resources")
+class ProjectMembersTests:
+    @fixture(scope="class")
+    async def project_member(self, project):
+        member = await project.members.add("test.account@proximl.ai","read","read","read","read","read")
+        yield member
+        await project.members.remove("test.account@proximl.ai")
+
+    async def test_list_project_members(self, project):
+        members = await project.members.list()
+        assert len(members) > 0
+
+    async def test_project_member_properties(self, project, project_member):
+        assert isinstance(project_member.id, str)
+        assert isinstance(project_member.email, str)
+        assert isinstance(project_member.project_uuid, str)
+        assert isinstance(project_member.owner, bool)
+        assert isinstance(project_member.job, str)
+        assert isinstance(project_member.dataset, str)
+        assert isinstance(project_member.model, str)
+        assert isinstance(project_member.checkpoint, str)
+        assert isinstance(project_member.volume, str)
+        assert project.id == project_member.project_uuid
+        assert project_member.id == "test.account@proximl.ai"
+
+    async def test_project_member_str(self, project_member):
+        string = str(project_member)
+        regex = r"^{.*\"email\": \"" + project_member.email + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_project_member_repr(self, project_member):
+        string = repr(project_member)
+        regex = (
+            r"^ProjectMember\( proximl , \*\*{.*'email': '"
+            + project_member.email
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)

tests/integration/projects/test_projects_secrets_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectSecretsTests:
     @fixture(scope="class")
     async def project_secret(self, project):

tests/integration/projects/test_projects_services_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("project_resources")
 class ProjectServicesTests:
     @fixture(scope="class")
     async def project_service(self, project):

tests/integration/test_checkpoints_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.checkpoints]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("checkpoints")
 class GetCheckpointTests:
     @fixture(scope="class")
     async def checkpoint(self, proximl):

tests/integration/test_datasets_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.datasets]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("datasets")
 class GetDatasetTests:
     @fixture(scope="class")
     async def dataset(self, proximl):

tests/integration/test_jobs_integration.py

@@ -20,6 +20,7 @@ def extract_domain_suffix(hostname):
 
 
 @fixture(scope="class")
+@mark.xdist_group("job_lifecycle")
 async def job(proximl):
     job = await proximl.jobs.create(
         name="CLI Automated Tests - Job Lifecycle",
@@ -38,6 +39,7 @@ async def job(proximl):
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("job_lifecycle")
 class JobLifeCycleTests:
     async def test_wait_for_running(self, job):
         assert job.status != "running"
@@ -413,6 +415,7 @@ class JobAPIWorkerValidationTests:
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("job_io")
 class JobIOTests:
     async def test_job_local_output(self, proximl, capsys):
         temp_dir = tempfile.TemporaryDirectory()
@@ -423,11 +426,11 @@ class JobIOTests:
             disk_size=10,
             workers=["python $ML_MODEL_PATH/tensorflow/main.py"],
             environment=dict(
-                type="DEEPLEARNING_PY310",
+                type="DEEPLEARNING_PY312",
                 env=[
                     dict(
                         key="CHECKPOINT_FILE",
-                        value="model.ckpt-0050",
+                        value="model.ckpt-0050.weights.h5",
                     )
                 ],
             ),
@@ -469,7 +472,7 @@ class JobIOTests:
         sys.stderr.write(captured.err)
         assert "Epoch 1/2" in captured.out
         assert "Epoch 2/2" in captured.out
-        assert "adding: model.ckpt-0001.data-00000-of-00001" in captured.out
+        assert "adding: model.ckpt-0001" in captured.out
         assert "Send complete" in captured.out
 
     async def test_job_model_input_and_output(self, proximl, capsys):
@@ -527,6 +530,7 @@ class JobIOTests:
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("job_types")
 class JobTypeTests:
     async def test_endpoint(self, proximl):
 
@@ -558,7 +562,7 @@ class JobTypeTests:
         assert job.url
         assert extract_domain_suffix(urlparse(job.url).hostname) == "proximl.cloud"
         tries = 0
-        await asyncio.sleep(30)
+        await asyncio.sleep(180) ## downloading weights can be slow
         async with aiohttp.ClientSession() as session:
             retry = True
             while retry:
@@ -640,7 +644,7 @@ class JobTypeTests:
         assert "Epoch 2/2" in captured.out
         assert "Uploading s3://proximl-example/output/resnet_cifar10" in captured.out
         assert (
-            "upload: ./model.ckpt-0002.data-00000-of-00001 to s3://proximl-example/output/resnet_cifar10/model.ckpt-0002.data-00000-of-00001"
+            "upload: ./model.ckpt-0002.weights.h5 to s3://proximl-example/output/resnet_cifar10/model.ckpt-0002.weights.h5"
             in captured.out
         )
         assert "Upload complete" in captured.out
@@ -648,6 +652,7 @@ class JobTypeTests:
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("job_features")
 class JobFeatureTests:
     async def test_cpu_instance(self, proximl, capsys):
         job = await proximl.jobs.create(
@@ -713,9 +718,9 @@ class JobFeatureTests:
         sys.stderr.write(captured.err)
         upload_contents = os.listdir(temp_dir.name)
         temp_dir.cleanup()
-        assert len(upload_contents) > 4
+        assert len(upload_contents) >= 3
         assert any(
-            "model.ckpt-0002.data-00000-of-00001" in content
+            "model.ckpt-0002" in content
             for content in upload_contents
         )
 
@@ -724,5 +729,5 @@ class JobFeatureTests:
         sys.stderr.write(captured.err)
         assert "Epoch 1/2" in captured.out
         assert "Epoch 2/2" in captured.out
-        assert "Number of regular files transferred: 7" in captured.out
+        assert "Number of regular files transferred: 4" in captured.out
         assert "Send complete" in captured.out

tests/integration/test_models_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.models]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("models")
 class GetModelTests:
     @fixture(scope="class")
     async def model(self, proximl):

tests/integration/test_volumes_integration.py

@@ -8,6 +8,7 @@ pytestmark = [mark.sdk, mark.integration, mark.volumes]
 
 @mark.create
 @mark.asyncio
+@mark.xdist_group("volumes")
 class GetVolumeTests:
     @fixture(scope="class")
     async def volume(self, proximl):

tests/unit/projects/test_project_members_unit.py

@@ -0,0 +1,107 @@
+import re
+import json
+import logging
+from unittest.mock import AsyncMock, patch
+from pytest import mark, fixture, raises
+from aiohttp import WSMessage, WSMsgType
+
+import proximl.projects.members as specimen
+from proximl.exceptions import (
+    ApiError,
+    SpecificationError,
+    ProxiMLException,
+)
+
+pytestmark = [mark.sdk, mark.unit, mark.projects]
+
+
+@fixture
+def project_members(mock_proximl):
+    yield specimen.ProjectMembers(mock_proximl, project_id="1")
+
+
+@fixture
+def project_member(mock_proximl):
+    yield specimen.ProjectMember(
+        mock_proximl,
+        id="owner@gmail.com",
+        email="owner@gmail.com",
+        project_uuid="proj-id-1",
+       owner= True,
+                job= "all",
+                dataset= "all",
+                model= "all",
+                checkpoint="all",
+                volume= "all"
+    )
+
+
+class ProjectMembersTests:
+    @mark.asyncio
+    async def test_project_members_list(self, project_members, mock_proximl):
+        api_response = [
+            {
+                "project_uuid": "proj-id-1",
+                "email": "owner@gmail.com",
+                "createdAt": "2024-09-04T00:42:39.529Z",
+                "updatedAt": "2024-09-04T00:42:39.529Z",
+                "owner": True,
+                "job": "all",
+                "dataset": "all",
+                "model": "all",
+                "checkpoint": "all",
+                "volume": "all"
+            },
+            {
+                "project_uuid": "proj-id-1",
+                "email": "non-owner@gmail.com",
+                "createdAt": "2024-09-04T00:42:39.529Z",
+                "updatedAt": "2024-09-04T00:42:39.529Z",
+                "owner": False,
+                "job": "all",
+                "dataset": "all",
+                "model": "all",
+                "checkpoint": "read",
+                "volume": "read"
+            },
+        ]
+        mock_proximl._query = AsyncMock(return_value=api_response)
+        resp = await project_members.list()
+        mock_proximl._query.assert_called_once_with(
+            "/project/1/access", "GET", dict()
+        )
+        assert len(resp) == 2
+
+
+class ProjectMemberTests:
+    def test_project_member_properties(self, project_member):
+        assert isinstance(project_member.id, str)
+        assert isinstance(project_member.email, str)
+        assert isinstance(project_member.project_uuid, str)
+        assert isinstance(project_member.owner, bool)
+        assert isinstance(project_member.job, str)
+        assert isinstance(project_member.dataset, str)
+        assert isinstance(project_member.model, str)
+        assert isinstance(project_member.checkpoint, str)
+        assert isinstance(project_member.volume, str)
+
+    def test_project_member_str(self, project_member):
+        string = str(project_member)
+        regex = r"^{.*\"id\": \"" + project_member.id + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    def test_project_member_repr(self, project_member):
+        string = repr(project_member)
+        regex = (
+            r"^ProjectMember\( proximl , \*\*{.*'id': '"
+            + project_member.id
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    def test_project_member_bool(self, project_member, mock_proximl):
+        empty_project_member = specimen.ProjectMember(mock_proximl)
+        assert bool(project_member)
+        assert not bool(empty_project_member)