trainml 0.5.13__py3-none-any.whl → 0.5.15__py3-none-any.whl

trainml/cloudbender/services.py

@@ -67,7 +67,7 @@ class Services(object):
 
 
 class Service:
-    def __init__(self, trainml, **kwargs):
+    def __init__(self, trainml,  **kwargs):
         self.trainml = trainml
         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 TrainMLException(f"Timeout waiting for {status}")
+    
+    async def generate_certificate(self, **kwargs):
+        resp = await self.trainml._query(
+            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/service/{self._id}/certificate",
+            "POST",
+            kwargs
+        )
+        self.__init__(self.trainml, **resp)
+        return self
+    
+    async def sign_client_certificate(self, csr, **kwargs):
+        certificate = await self.trainml._query(
+            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/service/{self._id}/certificate/sign",
+            "POST",
+            kwargs,
+            dict(csr=csr)
+        )
+        return certificate

trainml/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":

trainml/projects/members.py

@@ -0,0 +1,98 @@
+import json
+import logging
+from typing import Literal
+
+class ProjectMembers(object):
+    def __init__(self, trainml, project_id):
+        self.trainml = trainml
+        self.project_id = project_id
+
+    async def list(self, **kwargs):
+        resp = await self.trainml._query(
+            f"/project/{self.project_id}/access", "GET", kwargs
+        )
+        members = [ProjectMember(self.trainml, **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.trainml._query(
+            f"/project/{self.project_id}/access", "POST",kwargs, payload)
+        member = ProjectMember(self.trainml, **resp)
+        logging.info(f"Added Project Member {email} to project {self.project_id}")
+        return member
+
+    
+    async def remove(self, email, **kwargs):
+        await self.trainml._query(
+            f"/project/{self.project_id}/access", "DELETE", dict(**kwargs, email=email)
+        )
+
+
+class ProjectMember:
+    def __init__(self, trainml, **kwargs):
+        self.trainml = trainml
+        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( trainml , **{self._entity.__repr__()})"
+
+    def __bool__(self):
+        return bool(self._id)
+
+

trainml/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.trainml, self._id)
         self.credentials = ProjectCredentials(self.trainml, self._id)
         self.secrets = ProjectSecrets(self.trainml, self._id)
+        self.members = ProjectMembers(self.trainml, self._id)
 
     @property
     def id(self) -> str:

trainml/projects/services.py

@@ -77,3 +77,20 @@ class ProjectService:
         await self.trainml._query(
             f"/project/{self._project_uuid}/services/{self._id}/disable", "PATCH"
         )
+
+    async def get_service_ca_certificate(self, **kwargs):
+        certificate = await self.trainml._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.trainml._query(
+            f"/project/{self._project_uuid}/services/{self._id}/certificate/sign",
+            "POST",
+            kwargs,
+            dict(csr=csr)
+        )
+        return certificate

trainml/trainml.py

@@ -4,6 +4,7 @@ import asyncio
 import aiohttp
 import logging
 import traceback
+import random
 from importlib.metadata import version
 
 from trainml.auth import Auth
@@ -48,7 +49,7 @@ class TrainML(object):
             kwargs.get("domain_suffix")
             or os.environ.get("TRAINML_DOMAIN_SUFFIX")
             or env.get("domain_suffix")
-            or "trainml.ai"
+            or "proximl.ai"
         )
         self.auth = Auth(
             config_dir=CONFIG_DIR,
@@ -91,7 +92,7 @@ class TrainML(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 TrainMLException as e:
@@ -142,24 +143,40 @@ class TrainML(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 TrainMLException("Unexpected API failure")
 
     async def _ws_subscribe(self, entity, project_uuid, id, msg_handler):
         headers = {

{trainml-0.5.13.dist-info → trainml-0.5.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trainml
-Version: 0.5.13
+Version: 0.5.15
 Summary: trainML client SDK and command line utilities
 Home-page: https://github.com/trainML/trainml-cli
 Author: trainML

{trainml-0.5.13.dist-info → trainml-0.5.15.dist-info}/RECORD

@@ -3,25 +3,28 @@ examples/create_dataset_and_training_job.py,sha256=Ht6soyBZxt8qA9Fp6zAW2syGEdasv
 examples/local_storage.py,sha256=w8iAeqr5CLOCOkNrqGzEDtybjDGGY7SQUqeE0ibMUrM,1745
 examples/training_inference_pipeline.py,sha256=SNr4RFT9y69F9G9tMD8ONUbJmXRFrq1yxynq-FbfEf8,2334
 tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/conftest.py,sha256=VWWTfofsFcBOdSCXQxNYbMcDEEaErDi2wFFMn--LE4Y,1134
-tests/integration/test_checkpoints_integration.py,sha256=Giy5Z6WyselfXzskDGR7Z0ks2KK2U7WGQBDPfyqQ6dk,3206
-tests/integration/test_datasets_integration.py,sha256=zdHOevduuMUWvVxaHBslpmH8AdvPdqEJ95MdqCC5_rw,3499
+tests/integration/conftest.py,sha256=otgb7lZu62_5zAMAsPpr0U2j0h5lApPlDRCiu7ZfDr8,1135
+tests/integration/test_checkpoints_integration.py,sha256=RbOHZK-fjj2xvYo1XDa6H0war43Qe_1PbiNFndVY87o,3239
+tests/integration/test_datasets_integration.py,sha256=sV88UAMM0IyVVum3zvxfYFbqmR8W4skNWE7jQxbc9ms,3529
 tests/integration/test_environments_integration.py,sha256=0IckhJvQhd8j4Ouiu0hMq2b7iA1dbZpZYmknyfWjsFM,1403
 tests/integration/test_gpu_types_integration.py,sha256=V2OncokZWWVq_l5FSmKEDM4EsWrmpB-zKiVPt-we0aY,1256
-tests/integration/test_jobs_integration.py,sha256=vj-lINOzprUBj61F4i4CBe64MmT0HCDDsPneYsulv3I,25110
-tests/integration/test_models_integration.py,sha256=u6KVnX-F00TqwiU-gEoZJP1oKfAblqnyRptOc9vNGJ4,2878
-tests/integration/test_volumes_integration.py,sha256=gOmZpwwFxqeOAVmfKWSTmuyshx8nb2zu_0xv1RUEepM,3270
+tests/integration/test_jobs_integration.py,sha256=_c33hYpub3VoWiFY-dAzTVyB66U3n5yvMxoRR-pskHg,25263
+tests/integration/test_models_integration.py,sha256=Kwh8MQ0hOaecclAPq07LBEtAxoZB3rx-yamq0WGtWEA,2906
+tests/integration/test_volumes_integration.py,sha256=W5DeuuKCBx3C89LRWc0jhAZjJEREuPiawTLUnqpPrjg,3299
 tests/integration/cloudbender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/cloudbender/test_providers_integration.py,sha256=oV8ydFsosDZ_Z1Dkg2IN-ZhWuIl5e_HkHAORMsOsAJc,1473
+tests/integration/cloudbender/conftest.py,sha256=jBYUHKJioI-WHM-d0Y4lq5pD4LiOPINj6K9kQkgaGWY,777
+tests/integration/cloudbender/test_providers_integration.py,sha256=mQn2dr4oMpctCVCVs53G5P0Raa0U2uBxEYjZtFFSvTg,1327
+tests/integration/cloudbender/test_regions_integration.py,sha256=Ex1SB8xrl3KQ48n-Cka_1Whj8_uFsmhvJuOSdfK3kPk,1406
+tests/integration/cloudbender/test_services_integration.py,sha256=_cGxEtjTDwz4pne6s1gVyEwoRcYYKcJClNUP5Yalrz0,3367
 tests/integration/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/projects/conftest.py,sha256=sNN1Svq2IO63Yx3DC7-5ZnksaEifGpDZU-3ti9sZhIU,249
-tests/integration/projects/test_projects_credentials_integration.py,sha256=3PnpxNEsedXmyyhqjSb8T4JzupB1Kmwu--3stNTBlN8,1636
-tests/integration/projects/test_projects_data_connectors_integration.py,sha256=R90v7HVN4i9k-AOEl17AvnbWIwnD9Fl1OK9IGOV847o,1630
-tests/integration/projects/test_projects_datastores_integration.py,sha256=S9aSvryVjrcoEDezr33x4T5aPjEhUwL9O1-1eyzhQ-s,1469
-tests/integration/projects/test_projects_integration.py,sha256=HP4jPAyTqGt7pwk42bxQsqGp0olgai6sI-S1XXcXoJs,1241
-tests/integration/projects/test_projects_keys_integration.py,sha256=O-a9OwBxIM2l0vi__GMlWP8ncNswxGBJvEhgo8PoalQ,1423
-tests/integration/projects/test_projects_secrets_integration.py,sha256=bagLLfSUP805gOOPbn_xCQyifflNzIs8DGUBeUwOhO0,1481
-tests/integration/projects/test_projects_services_integration.py,sha256=lBnrqFpjsL3zfaJJmFh2rCWfNmmX-TjyOPCR3KobDAc,1530
+tests/integration/projects/conftest.py,sha256=v4XqQEmNSmV_hNEjLEIOeGJxFoAl-km8UXO_5jO--6E,294
+tests/integration/projects/test_projects_credentials_integration.py,sha256=DYkd57hxu6wGFAyfgQGQbIR6Ja0501UCsSnjWzxBEkk,1675
+tests/integration/projects/test_projects_data_connectors_integration.py,sha256=0giPCNeMx-Mj6--i0LTEt3m_ZwElSQzhrbxmcpNOthc,1669
+tests/integration/projects/test_projects_datastores_integration.py,sha256=Eln5xPy6qp2JWai97U61fAQa4lGpmYlSTjbuzJl2jYc,1508
+tests/integration/projects/test_projects_integration.py,sha256=1tHXGeF05Bsr5osyMyf4VY8qf1a4xYLUaF7yRaoDoLE,1280
+tests/integration/projects/test_projects_members_integration.py,sha256=bEc9AqC-YZ0hifvVaDmcVGbK3aYuTBNGBj0g4rjBEiQ,1882
+tests/integration/projects/test_projects_secrets_integration.py,sha256=dnIT0KiHnXBVP-azfw8MCspTjX7q1ic03rz8XZNijvU,1520
+tests/integration/projects/test_projects_services_integration.py,sha256=3DpOtVMIdG_Icp4s7JxMT70ZDKC1wMD8imkKjlQChb0,1569
 tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/conftest.py,sha256=hLfECgT0w4pVZABrpK4UUUeaX1aDzQvj8-erWTGBjHA,35588
 tests/unit/test_auth_unit.py,sha256=nfhlOCR7rUsn_MaD8QQtBc2v0k8pIxqbzGgRAZK1WGc,858
@@ -55,7 +58,6 @@ tests/unit/cli/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 tests/unit/cli/projects/test_cli_project_credential_unit.py,sha256=gnmEpNbpEG5S9cYQUjSGty2e8mqeC_cCKmIUAJCgRXg,943
 tests/unit/cli/projects/test_cli_project_data_connector_unit.py,sha256=_NgnxV8zTIycpHKe7dyL6EXq774puFHQjvgCKsiEMO0,993
 tests/unit/cli/projects/test_cli_project_datastore_unit.py,sha256=E_kLoIZ5U92LQaPcYAKDyUqpjM1Xe6PVPvofU1Yn6Yk,936
-tests/unit/cli/projects/test_cli_project_key_unit.py,sha256=Ma5HjsZt2RaHKgmMdGY59EIc2WdAgbWKWn2LvlYeDqQ,894
 tests/unit/cli/projects/test_cli_project_secret_unit.py,sha256=QBkq1gVqkjGUni2xCihL994bvseNcA-dyUWaJVU9GjI,915
 tests/unit/cli/projects/test_cli_project_service_unit.py,sha256=TRNOwK3RUCtktYdCGzfhQE3fE_mn8LweCN5E4gRn1h4,922
 tests/unit/cli/projects/test_cli_project_unit.py,sha256=0IynsMwFsXBZn-u0gX2iir7AjPsNraHe68PuAe-Lkaw,627
@@ -72,22 +74,22 @@ tests/unit/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 tests/unit/projects/test_project_credentials_unit.py,sha256=ObTaJ7_g0MP5N-0qHWdeYips0in1j_4UkOhXXI2FFwo,3480
 tests/unit/projects/test_project_data_connectors_unit.py,sha256=uQPFx6rwYMWZz1IJkns_LdM5gccyHSIaKb3k8zmfSkY,3385
 tests/unit/projects/test_project_datastores_unit.py,sha256=kcoaSs54gGqJ9gwPMpP6KHAPRvDJtdJpm49s4aYYt3E,3129
-tests/unit/projects/test_project_keys_unit.py,sha256=2-w_VwmWxWHoLWBCoBAfg5WozyeYJHV361ZndlA0xk4,3161
+tests/unit/projects/test_project_members_unit.py,sha256=C5N6jzT7zM3eL3_bXEddddBHPFJ3617T0lYluBjMy78,3466
 tests/unit/projects/test_project_secrets_unit.py,sha256=StVlY-ZR3CKxXAt9NL8hTkXUEdgGESH0m6foEPXKE-4,3276
 tests/unit/projects/test_project_services_unit.py,sha256=ZK5nz78RAmmaCrAwYBd34t87dh6etU-7snLB_xukZHM,3331
 tests/unit/projects/test_projects_unit.py,sha256=8rJ40bJ7YszEsoL6D02Muey-sgRjqFmMoR-R3IiP_Ig,3810
-trainml/__init__.py,sha256=KVgJtJhufpHLxSIxc6VgC9rtBlScxurtZsM8FibfA3o,433
+trainml/__init__.py,sha256=yxX-2bQsXFk3KgMV8b7day_Wz6qy6Ag4kOHvcMCv15k,433
 trainml/__main__.py,sha256=JgErYkiskih8Y6oRwowALtR-rwQhAAdqOYWjQraRIPI,59
-trainml/auth.py,sha256=gruZv27nhttrCbhcVQTH9kZkF2uMm1E06SwA_2pQAHQ,26565
+trainml/auth.py,sha256=clbx5S5prJ3u62aEESdBXIHF_HmreQ-L1ShxcyWQNDs,26565
 trainml/checkpoints.py,sha256=Hg3_Si7ohzsv4_8JIjoj9pMRpHNZRWKC5R2gtgmp01s,8790
 trainml/connections.py,sha256=h-S1NZbOkaXpIlpRStA6q-3eXc_OMlFWOLzF8R9SVG8,20029
 trainml/datasets.py,sha256=dxTZbK-cnr8eoq48KAx2TZNK1ndcFveTVBtaNK2QyJ0,8600
 trainml/environments.py,sha256=OH4o08zXZ7IJ2CiA1rPnys2Fl45r8qvQHfM2mCBRAIc,1507
 trainml/exceptions.py,sha256=Qdof2fKRvbMiwarX1VSw1XJXXJjY71H4U3v05nE7-7g,5468
 trainml/gpu_types.py,sha256=mm-dwfYc02192bmYPIJmzesndyBcoOdkKYBaYZXOUwU,1901
-trainml/jobs.py,sha256=5wHiEmHfri1btgIn6zbFp9kIO6EU5FCOVkNMP0-WuYM,17632
+trainml/jobs.py,sha256=6iaZUz69v6NCSuM0jiSd6j8gElB3JOTuOZuVt2VtAHQ,17947
 trainml/models.py,sha256=SpVNt9oZMu70m_3VjO9j_QYexw_z-yRqMhIuJXPs4Vg,8284
-trainml/trainml.py,sha256=EBnqQ3Q291xrPKYuN6xKm5yt0mJQOJ3b7GAlR-fl8NI,10864
+trainml/trainml.py,sha256=c-Qxiarv170RaQn0O1wJ6h9RP8e17M15KFg3Rh2ckZc,11902
 trainml/volumes.py,sha256=7T0ZN_Xq3qk4yzw7YYxC0rxH3KqlqADd6HOZCkAfCR4,8443
 trainml/cli/__init__.py,sha256=Gvj6oGSEtgpb40ACtiVeMD93GM-uy15MG6VlX6rwdwA,4346
 trainml/cli/checkpoint.py,sha256=8Rh4bmFwJ4DKlIjHK-FLTeRynABqKCgIUGRtbQhAsX4,7170
@@ -106,12 +108,11 @@ trainml/cli/cloudbender/provider.py,sha256=oFjZWKfFQjNY7OtDu7nUdfv-RTmQc_Huuug96
 trainml/cli/cloudbender/region.py,sha256=X6-FYOb-pGpOEazn-NbsYSwa9ergB7FGATFkTe4a8Pk,2892
 trainml/cli/cloudbender/service.py,sha256=Wh6ycEuECiKL7qpFhc4IyO1rR5lvLtIHk3S475_R6pk,3147
 trainml/cli/job/__init__.py,sha256=ljY-ELeXhXQ7txASbJEKGBom7OXfNyy7sWILz3nxRAE,6545
-trainml/cli/job/create.py,sha256=1YGHgl0bN0LC7EtMStukHT6RvnBheaaOnkqoKsAxuco,34380
+trainml/cli/job/create.py,sha256=MDf53CFua58uJoW4n9FZT1XERJOvAYunEc8tcuO6WQ8,35098
 trainml/cli/project/__init__.py,sha256=HDcJUbKMHhz4Thrvpst5hnywFqzsv0XWmvfKNRi8zuo,1918
 trainml/cli/project/credential.py,sha256=gByXKiYf5sJeNRtuXWcercWv8P2IzO5TjT8Ypp4mCR8,3443
 trainml/cli/project/data_connector.py,sha256=KLDhpNJfwcJkcmyuJRgcVH70Jf73619O9ddYP8vhMvk,1411
 trainml/cli/project/datastore.py,sha256=IwF0LqsSFn7DrKPRdxQs6kturk9MCI52A1aoWeb7ClA,1336
-trainml/cli/project/key.py,sha256=kQlCs_N-5c27hOyGkmT22_J47x8U6CZaSardsaPYGbw,3203
 trainml/cli/project/secret.py,sha256=tHt7bYDt0MNkLTTePTIJFUh9Mn9ogebPcaSCiNRJFNQ,1927
 trainml/cli/project/service.py,sha256=FzcyGI9MN-UvnjdKW7GmXLTXLUIXtuTFAISR_FmCmJo,1310
 trainml/cloudbender/__init__.py,sha256=iE29obtC0_9f0IhRvHQcG5aY58fVhVYipTakpjAhdss,64
@@ -123,18 +124,18 @@ trainml/cloudbender/devices.py,sha256=QORNmKdLJoqGZmeWXRnivC1JmNBIw-ebvf4bsoem3r
 trainml/cloudbender/nodes.py,sha256=U2sTIL2fuBVsNFPsJrvB2JbBcuLULF1-AwJ4dp5ChmM,5924
 trainml/cloudbender/providers.py,sha256=22ymUl1KLC8UlyoWMsIrOKhUDOwnhklhHQ3EZ_V6eWA,3738
 trainml/cloudbender/regions.py,sha256=nfSY9fIWp_AaRE_1Y0qwXX6WVSyPKxpji-zUfM3BNUo,5157
-trainml/cloudbender/services.py,sha256=KC3VcyljvnazUUG-Tzwm6Ab6d0--yuccXjOaMgYB5uA,5126
+trainml/cloudbender/services.py,sha256=bJtp9ljq8g10r-04phV_XXS8mS8YR3KMbJ4XtHa2SOI,5773
 trainml/projects/__init__.py,sha256=6NKCcHtQMeGB1IyU-djANphfnDX6MEkrXUM5Fyq9fWg,75
 trainml/projects/credentials.py,sha256=6WqHy_-SZZwqE4rULLF8gSyeRVmfsUxqZBuCjBXyxKw,2255
 trainml/projects/data_connectors.py,sha256=WZATdUq4vE3x47Ny5HDwPD7lIUx0syjaSE9BmFWNuEg,2216
 trainml/projects/datastores.py,sha256=qocqD5mGfm2V_wh36CEh3oldnIeJg57ppc6CM129Dkk,2095
-trainml/projects/keys.py,sha256=qcQAdysTbfVW19tzzxZDvBBWjU9DG0dkViLmG_S0SyM,2157
-trainml/projects/projects.py,sha256=0ZghShqjbs5swfn3BsLrMW2NzrdBXpf_M-nyzwYPjpM,2792
+trainml/projects/members.py,sha256=7fptZ2leIQEUiRtvd3z15RTOJyPafzc5wwQLNxICElQ,2826
+trainml/projects/projects.py,sha256=5_6HUg9ZYq8v69QPgC4Yfd_DM0OlZd8tnxh2ahjOgm0,2890
 trainml/projects/secrets.py,sha256=TIvBd3rAvd4lF3pm5qR98UslHjldzlnzn_n9yvpmLgg,2160
-trainml/projects/services.py,sha256=W2IHgRUT9BemWThsY7uAot2gbmyPaH41WAii-NQ_cT8,2206
-trainml-0.5.13.dist-info/LICENSE,sha256=s0lpBxhSSUEpMavwde-Vb6K_K7xDCTTvSpNznVqVGR0,1069
-trainml-0.5.13.dist-info/METADATA,sha256=8BjIAywdzYBrUOb_k6PkSdc20fFaVW7pUEKiOPqHzf4,7346
-trainml-0.5.13.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-trainml-0.5.13.dist-info/entry_points.txt,sha256=OzBDm2wXby1bSGF02jTVxzRFZLejnbFiLHXhKdW3Bds,63
-trainml-0.5.13.dist-info/top_level.txt,sha256=Y1kLFRWKUW7RG8BX7cvejHF_yW8wBOaRYF1JQHENY4w,23
-trainml-0.5.13.dist-info/RECORD,,
+trainml/projects/services.py,sha256=rI-uFmojqOTNLbqBeX6gaSwMkI6LKzRuJthQCH0A2h4,2771
+trainml-0.5.15.dist-info/LICENSE,sha256=s0lpBxhSSUEpMavwde-Vb6K_K7xDCTTvSpNznVqVGR0,1069
+trainml-0.5.15.dist-info/METADATA,sha256=kFbUgFw2pcOjJgySdhnKmVrkVpkFMI6mtVrN7t26yXA,7346
+trainml-0.5.15.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+trainml-0.5.15.dist-info/entry_points.txt,sha256=OzBDm2wXby1bSGF02jTVxzRFZLejnbFiLHXhKdW3Bds,63
+trainml-0.5.15.dist-info/top_level.txt,sha256=Y1kLFRWKUW7RG8BX7cvejHF_yW8wBOaRYF1JQHENY4w,23
+trainml-0.5.15.dist-info/RECORD,,

tests/integration/projects/test_projects_keys_integration.py

@@ -1,43 +0,0 @@
-import re
-import sys
-import asyncio
-from pytest import mark, fixture
-
-pytestmark = [mark.sdk, mark.integration, mark.projects]
-
-
-@mark.create
-@mark.asyncio
-class ProjectKeysTests:
-    @fixture(scope="class")
-    async def project_key(self, project):
-        project_key = await project.keys.put(
-            type="aws", key_id="ASFHALKF", secret="IUHKLHKAHF"
-        )
-        yield project_key
-        await project.keys.remove(type="aws")
-
-    async def test_list_project_keys(self, project, project_key):
-        keys = await project.keys.list()
-        assert len(keys) > 0
-
-    async def test_project_key_properties(self, project, project_key):
-        assert isinstance(project_key.project_uuid, str)
-        assert isinstance(project_key.type, str)
-        assert isinstance(project_key.key_id, str)
-        assert project_key.type == "aws"
-        assert project.id == project_key.project_uuid
-
-    async def test_project_key_str(self, project_key):
-        string = str(project_key)
-        regex = r"^{.*\"type\": \"" + project_key.type + r"\".*}$"
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    async def test_project_key_repr(self, project_key):
-        string = repr(project_key)
-        regex = (
-            r"^ProjectKey\( trainml , \*\*{.*'type': '" + project_key.type + r"'.*}\)$"
-        )
-        assert isinstance(string, str)
-        assert re.match(regex, string)

tests/unit/cli/projects/test_cli_project_key_unit.py

@@ -1,26 +0,0 @@
-import re
-import json
-import click
-from unittest.mock import AsyncMock, patch, create_autospec
-from pytest import mark, fixture, raises
-
-pytestmark = [mark.cli, mark.unit, mark.projects]
-
-from trainml.cli.project import key as specimen
-from trainml.projects import (
-    Project,
-)
-
-
-def test_list_keys(runner, mock_project_keys):
-    with patch("trainml.cli.TrainML", new=AsyncMock) as mock_trainml:
-        project = create_autospec(Project)
-        mock_trainml.projects = AsyncMock()
-        mock_trainml.projects.get = AsyncMock(return_value=project)
-        mock_trainml.projects.get_current = AsyncMock(return_value=project)
-        project.keys = AsyncMock()
-        project.keys.list = AsyncMock(return_value=mock_project_keys)
-        result = runner.invoke(specimen, ["list"])
-        print(result)
-        assert result.exit_code == 0
-        project.keys.list.assert_called_once()

tests/unit/projects/test_project_keys_unit.py

@@ -1,96 +0,0 @@
-import re
-import json
-import logging
-from unittest.mock import AsyncMock, patch
-from pytest import mark, fixture, raises
-from aiohttp import WSMessage, WSMsgType
-
-import trainml.projects.keys as specimen
-from trainml.exceptions import (
-    ApiError,
-    SpecificationError,
-    TrainMLException,
-)
-
-pytestmark = [mark.sdk, mark.unit, mark.projects]
-
-
-@fixture
-def project_keys(mock_trainml):
-    yield specimen.ProjectKeys(mock_trainml, project_id="1")
-
-
-@fixture
-def project_key(mock_trainml):
-    yield specimen.ProjectKey(
-        mock_trainml, project_uuid="proj-id-1", type="aws", key_id="AIYHGFSDLK"
-    )
-
-
-class ProjectKeysTests:
-    @mark.asyncio
-    async def test_project_keys_list(self, project_keys, mock_trainml):
-        api_response = [
-            {"project_uuid": "proj-id-1", "type": "aws", "key_id": "AIYHGFSDLK"},
-            {"project_uuid": "proj-id-1", "type": "gcp", "key_id": "credentials.json"},
-        ]
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        resp = await project_keys.list()
-        mock_trainml._query.assert_called_once_with("/project/1/keys", "GET", dict())
-        assert len(resp) == 2
-
-    @mark.asyncio
-    async def test_remove_project_key(
-        self,
-        project_keys,
-        mock_trainml,
-    ):
-        api_response = dict()
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        await project_keys.remove("aws")
-        mock_trainml._query.assert_called_once_with(
-            "/project/1/key/aws", "DELETE", dict()
-        )
-
-    @mark.asyncio
-    async def test_put_project_key(self, project_keys, mock_trainml):
-        requested_config = dict(type="aws", key_id="AIUDHADA", secret="ASKHJSLKF")
-        expected_payload = dict(key_id="AIUDHADA", secret="ASKHJSLKF")
-        api_response = {
-            "project_uuid": "project-id-1",
-            "type": "aws",
-            "key_id": "AIUDHADA",
-        }
-
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        response = await project_keys.put(**requested_config)
-        mock_trainml._query.assert_called_once_with(
-            "/project/1/key/aws", "PUT", None, expected_payload
-        )
-        assert response.type == "aws"
-
-
-class ProjectKeyTests:
-    def test_project_key_properties(self, project_key):
-        assert isinstance(project_key.type, str)
-        assert isinstance(project_key.key_id, str)
-        assert isinstance(project_key.project_uuid, str)
-
-    def test_project_key_str(self, project_key):
-        string = str(project_key)
-        regex = r"^{.*\"type\": \"" + project_key.type + r"\".*}$"
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    def test_project_key_repr(self, project_key):
-        string = repr(project_key)
-        regex = (
-            r"^ProjectKey\( trainml , \*\*{.*'type': '" + project_key.type + r"'.*}\)$"
-        )
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    def test_project_key_bool(self, project_key, mock_trainml):
-        empty_project_key = specimen.ProjectKey(mock_trainml)
-        assert bool(project_key)
-        assert not bool(empty_project_key)