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

proximl/__init__.py

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

proximl/cli/job/create.py

@@ -172,12 +172,12 @@ def create(config):
     help="Conda packages to install as a comma separated list 'p1,\"p2=v2\",p3'",
 )
 @click.option(
-    "--key",
+    "--credential",
     type=click.Choice(
         ["aws", "gcp", "kaggle", "azure", "wasabi"],
         case_sensitive=False,
     ),
-    help="Third Party Keys to add to the job environment",
+    help="Third Party Credentials to add to the job environment",
     multiple=True,
 )
 @click.option(
@@ -221,7 +221,7 @@ def notebook(
     environment,
     custom_image,
     env,
-    key,
+    credential,
     apt_packages,
     pip_packages,
     conda_packages,
@@ -254,7 +254,7 @@ def notebook(
         data=dict(datasets=datasets),
         model=dict(checkpoints=checkpoints),
         environment=dict(
-            worker_key_types=[k for k in key],
+            credentials=[k for k in credential],
         ),
     )
 
@@ -500,12 +500,12 @@ def notebook(
     multiple=True,
 )
 @click.option(
-    "--key",
+    "--credential",
     type=click.Choice(
         ["aws", "gcp", "kaggle", "azure", "wasabi"],
         case_sensitive=False,
     ),
-    help="Third Party Keys to add to the job environment",
+    help="Third Party Credentials to add to the job environment",
     multiple=True,
 )
 @click.option(
@@ -563,7 +563,7 @@ def training(
     environment,
     custom_image,
     env,
-    key,
+    credential,
     apt_packages,
     pip_packages,
     conda_packages,
@@ -596,7 +596,7 @@ def training(
         data=dict(datasets=datasets),
         model=dict(checkpoints=checkpoints),
         environment=dict(
-            worker_key_types=[k for k in key],
+            credentials=[k for k in credential],
         ),
     )
 
@@ -844,12 +844,12 @@ def training(
     multiple=True,
 )
 @click.option(
-    "--key",
+    "--credential",
     type=click.Choice(
         ["aws", "gcp", "kaggle", "azure", "wasabi"],
         case_sensitive=False,
     ),
-    help="Third Party Keys to add to the job environment",
+    help="Third Party Credentials to add to the job environment",
     multiple=True,
 )
 @click.option(
@@ -907,7 +907,7 @@ def inference(
     environment,
     custom_image,
     env,
-    key,
+    credential,
     apt_packages,
     pip_packages,
     conda_packages,
@@ -933,7 +933,7 @@ def inference(
         data=dict(datasets=[]),
         model=dict(checkpoints=checkpoints),
         environment=dict(
-            worker_key_types=[k for k in key],
+            credentials=[k for k in credential],
         ),
     )
 
@@ -1163,12 +1163,12 @@ def from_json(config, attach, connect, file):
     multiple=True,
 )
 @click.option(
-    "--key",
+    "--credential",
     type=click.Choice(
         ["aws", "gcp", "kaggle", "azure", "wasabi"],
         case_sensitive=False,
     ),
-    help="Third Party Keys to add to the job environment",
+    help="Third Party Credentials to add to the job environment",
     multiple=True,
 )
 @click.option(
@@ -1230,7 +1230,7 @@ def endpoint(
     environment,
     custom_image,
     env,
-    key,
+    credential,
     apt_packages,
     pip_packages,
     conda_packages,
@@ -1257,7 +1257,7 @@ def endpoint(
         max_price=max_price,
         model=dict(checkpoints=checkpoints),
         environment=dict(
-            worker_key_types=[k for k in key],
+            credentials=[k for k in credential],
         ),
     )
 

proximl/cli/project/__init__.py

@@ -78,7 +78,7 @@ def remove(config, project):
 
 
 from proximl.cli.project.secret import secret
-from proximl.cli.project.key import key
+from proximl.cli.project.credential import credential
 from proximl.cli.project.data_connector import data_connector
 from proximl.cli.project.datastore import datastore
 from proximl.cli.project.service import service

proximl/cli/project/secret.py

@@ -1,4 +1,5 @@
 import click
+import os
 from proximl.cli import pass_config
 from proximl.cli.project import project
 
@@ -42,17 +43,25 @@ def list(config):
 
 
 @secret.command()
+@click.option(
+    "--file",
+    type=click.Path(exists=True, file_okay=True, dir_okay=False, resolve_path=True),
+    help="Load the secret value from the file at the provided path",
+)
 @click.argument("name", type=click.STRING)
 @pass_config
-def put(config, name):
+def put(config, file, name):
     """
     Set a secret value.
 
     Secret is created with the specified NAME.
     """
     project = config.proximl.run(config.proximl.client.projects.get_current())
-
-    value = click.prompt("Enter the secret value", type=str, hide_input=True)
+    if file:
+        with open(os.path.expanduser(file)) as f:
+            value = f.read()
+    else:
+        value = click.prompt("Enter the secret value", type=str, hide_input=True)
 
     return config.proximl.run(project.secrets.put(name=name, value=value))
 

proximl/projects/data_connectors.py

@@ -7,6 +7,12 @@ class ProjectDataConnectors(object):
         self.proximl = proximl
         self.project_id = project_id
 
+    async def get(self, id, **kwargs):
+        resp = await self.proximl._query(
+            f"/project/{self.project_id}/data_connectors/{id}", "GET", kwargs
+        )
+        return ProjectDataConnector(self.proximl, **resp)
+
     async def list(self, **kwargs):
         resp = await self.proximl._query(
             f"/project/{self.project_id}/data_connectors", "GET", kwargs
@@ -61,3 +67,13 @@ class ProjectDataConnector:
 
     def __bool__(self):
         return bool(self._id)
+
+    async def enable(self):
+        await self.proximl._query(
+            f"/project/{self._project_uuid}/data_connectors/{self._id}/enable", "PATCH"
+        )
+
+    async def disable(self):
+        await self.proximl._query(
+            f"/project/{self._project_uuid}/data_connectors/{self._id}/disable", "PATCH"
+        )

proximl/projects/datastores.py

@@ -7,6 +7,12 @@ class ProjectDatastores(object):
         self.proximl = proximl
         self.project_id = project_id
 
+    async def get(self, id, **kwargs):
+        resp = await self.proximl._query(
+            f"/project/{self.project_id}/datastores/{id}", "GET", kwargs
+        )
+        return ProjectDatastore(self.proximl, **resp)
+
     async def list(self, **kwargs):
         resp = await self.proximl._query(
             f"/project/{self.project_id}/datastores", "GET", kwargs
@@ -56,3 +62,13 @@ class ProjectDatastore:
 
     def __bool__(self):
         return bool(self._id)
+
+    async def enable(self):
+        await self.proximl._query(
+            f"/project/{self._project_uuid}/datastores/{self._id}/enable", "PATCH"
+        )
+
+    async def disable(self):
+        await self.proximl._query(
+            f"/project/{self._project_uuid}/datastores/{self._id}/disable", "PATCH"
+        )

proximl/projects/projects.py

@@ -3,7 +3,7 @@ import logging
 from .datastores import ProjectDatastores
 from .data_connectors import ProjectDataConnectors
 from .services import ProjectServices
-from .keys import ProjectKeys
+from .credentials import ProjectCredentials
 from .secrets import ProjectSecrets
 
 
@@ -26,8 +26,11 @@ class Projects(object):
         projects = [Project(self.proximl, **project) for project in resp]
         return projects
 
-    async def create(self, name, copy_keys=False, copy_secrets=False, **kwargs):
-        data = dict(name=name, copy_keys=copy_keys, copy_secrets=copy_secrets)
+    async def create(self, name, copy_credentials=False, **kwargs):
+        data = dict(
+            name=name,
+            copy_credentials=copy_credentials,
+        )
         payload = {k: v for k, v in data.items() if v is not None}
         logging.info(f"Creating Project {name}")
         resp = await self.proximl._query("/project", "POST", None, payload)
@@ -51,7 +54,7 @@ class Project:
         self.datastores = ProjectDatastores(self.proximl, self._id)
         self.data_connectors = ProjectDataConnectors(self.proximl, self._id)
         self.services = ProjectServices(self.proximl, self._id)
-        self.keys = ProjectKeys(self.proximl, self._id)
+        self.credentials = ProjectCredentials(self.proximl, self._id)
         self.secrets = ProjectSecrets(self.proximl, self._id)
 
     @property

proximl/projects/secrets.py

@@ -24,7 +24,7 @@ class ProjectSecrets(object):
             f"/project/{self.project_id}/secret/{name}", "PUT", None, payload
         )
         secret = ProjectSecret(self.proximl, **resp)
-        logging.info(f"Created Project Key {name} in project {self.project_id}")
+        logging.info(f"Created Project Secret {name} in project {self.project_id}")
         return secret
 
     async def remove(self, name, **kwargs):

proximl/projects/services.py

@@ -7,6 +7,12 @@ class ProjectServices(object):
         self.proximl = proximl
         self.project_id = project_id
 
+    async def get(self, id, **kwargs):
+        resp = await self.proximl._query(
+            f"/project/{self.project_id}/services/{id}", "GET", kwargs
+        )
+        return ProjectService(self.proximl, **resp)
+
     async def list(self, **kwargs):
         resp = await self.proximl._query(
             f"/project/{self.project_id}/services", "GET", kwargs
@@ -61,3 +67,13 @@ class ProjectService:
 
     def __bool__(self):
         return bool(self._id)
+
+    async def enable(self):
+        await self.proximl._query(
+            f"/project/{self._project_uuid}/services/{self._id}/enable", "PATCH"
+        )
+
+    async def disable(self):
+        await self.proximl._query(
+            f"/project/{self._project_uuid}/services/{self._id}/disable", "PATCH"
+        )

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

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

{proximl-0.5.13.dist-info → proximl-0.5.13.post1.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=V_dfFciJOujLG1RbQZrhWik3nYhzhU0V6c28qHJpOCk,433
+proximl/__init__.py,sha256=H24uX4w44gBopXgz6-IQz2EmtKokV3dNMKqD9KEsAKM,439
 proximl/__main__.py,sha256=JgErYkiskih8Y6oRwowALtR-rwQhAAdqOYWjQraRIPI,59
 proximl/auth.py,sha256=LacGBDAVel5HcJx7JXp1wVn3s0gZc7nf--vDfSFOXYU,26565
 proximl/checkpoints.py,sha256=Ezpiab9Wfcmd2h5Slm9U5lekZGXiPzvhDKxXXgla1yo,8790
@@ -32,13 +32,12 @@ 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=sGvbenY0yxvxHo-FZVbdw8FaZx5D4ekTCjD7P4YHG4g,34288
-proximl/cli/project/__init__.py,sha256=nSU_qBNVPezVA_Uu54ha37PAfCmTsIclXptEvIwiRME,1904
+proximl/cli/job/create.py,sha256=0EsICgLxP5EniWxN-eTKnJtMoKJJXcfgB5myfNzcDrs,34380
+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
 proximl/cli/project/datastore.py,sha256=YusrUTKY_qIwEOBN2gXOUoKCUp2qbWTKzquKc0DcUsE,1336
-proximl/cli/project/key.py,sha256=23ugcWOAxNJvC8VzG3FsEUWJ1_FZANnhq66cO04ZEVY,3203
-proximl/cli/project/secret.py,sha256=uys2FsXuO_8_EoolQNuOZ9btX4I0LXBeKG8dGx6StMM,1621
+proximl/cli/project/secret.py,sha256=jWj9SNcx4jNKX1E84Fjkj0hRzF1XU0CrdYqNtxYuTpI,1927
 proximl/cli/project/service.py,sha256=06UoGbAWbPPh3kBdH3QXBTzj_k7AfKcD_bAyWGpYeDE,1310
 proximl/cloudbender/__init__.py,sha256=iE29obtC0_9f0IhRvHQcG5aY58fVhVYipTakpjAhdss,64
 proximl/cloudbender/cloudbender.py,sha256=k9Naj_le32YZotM7PRrhml3DxjqRetsHcgg5J4RtJ_4,717
@@ -52,34 +51,32 @@ proximl/cloudbender/regions.py,sha256=6doBdfMXIQI-uexzvwmNg2ATDzruatw-ixviZSMjon
 proximl/cloudbender/services.py,sha256=km3KcIgaRRVb3iuZEIn6ONIekuyXhBgk_brAFJcMMl4,5126
 proximl/projects/__init__.py,sha256=6NKCcHtQMeGB1IyU-djANphfnDX6MEkrXUM5Fyq9fWg,75
 proximl/projects/credentials.py,sha256=hWz6EUEAgltkAQMDjQVsFlVvfWUbZfY3KoWpldnCrXY,2255
-proximl/projects/data_connectors.py,sha256=559yJ-9qmva2JcNReuCyUQxdrSRIEROcGX5BDVr8ySs,1662
-proximl/projects/datastores.py,sha256=zAmKX9CibeS7PSXVvExk0SVrEo9Zq83kz6CQw0GoHck,1560
-proximl/projects/keys.py,sha256=yT5pgv1mGm50CaORf-HnsbDULad69G9I_QpVMN0zcuE,2157
-proximl/projects/projects.py,sha256=3aEGHxOMYbO9FaLSzSAA94A5ZGzljq-fBJk1QcSidCE,2755
-proximl/projects/secrets.py,sha256=NxjP1_CR9UQUMazeS-esin3zH54xZ4b4R11YNSU4hsI,2157
-proximl/projects/services.py,sha256=Jian2RHV9u3pHQKa7AsHKj25DrR4DstB-JaIDhSu7Tw,1679
+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/secrets.py,sha256=xlfzRONjT2ySJDcq8FYRQmSU2ZJMdPLS8NbePWYNCeM,2160
+proximl/projects/services.py,sha256=C1YUxixkio8n4AlgmGqZJ93hP3VKOoTXVXTNCkRVd9Y,2206
 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/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=pivsSH_wOgyf7X9KODmJR0kAQhY9RLFsRZ7RogCvaXc,25117
+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/cloudbender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/integration/cloudbender/test_providers_integration.py,sha256=gFqPQom-Cn1iZC50_ChQ2us2_f4tIPATQSAUcWdf7ss,1473
 tests/integration/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/projects/conftest.py,sha256=o7rBOFGvcmZ3q0fy7jCIm2CBqn_ULojPP1XFBBUPEVQ,242
+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_keys_integration.py,sha256=cLvka_XlQHCYAFX4-gsH57KzhnpQZOGRvk9Q-HZEYbI,1423
-tests/integration/projects/test_projects_secrets_integration.py,sha256=Q8GEJkBE4X38F36sJza3VRo1pWdF9qEEr2kuADqgBB8,1478
+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/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/unit/conftest.py,sha256=VKpgpCDnWvDBqns7ENOe0eS_cCz_RIol5X3ybS4ePiQ,35521
+tests/unit/conftest.py,sha256=11Z49O4mKXtm6xl18kWPomZvbZJQpqdaDYeJHFQbO1A,35588
 tests/unit/test_auth_unit.py,sha256=IJZHT5CZLNfu3MybTdEWIsKlvxNfFYpZ6oWYzbS856g,858
 tests/unit/test_checkpoints_unit.py,sha256=FbBM8Ffqy8JGTpWq2zWAWle2CI8A0MB_zABL_9Mezbk,15965
 tests/unit/test_connections_unit.py,sha256=LFAZzlrvL9oM8rZJTiC1oA9quw1KA2vMUCc3LV6SjXs,5507
@@ -111,7 +108,6 @@ tests/unit/cli/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 tests/unit/cli/projects/test_cli_project_credential_unit.py,sha256=wehwquMGwUzwc8iH0bWletS3-kwIXKshoOuXHhJxRUc,943
 tests/unit/cli/projects/test_cli_project_data_connector_unit.py,sha256=RlqgHOUkFv3bmc19pUtGNVD0W1UWBJSDfaI_lzN0ZEA,993
 tests/unit/cli/projects/test_cli_project_datastore_unit.py,sha256=6UMgFwqxBtH65VeWTzXzaXhVfCRoG3Tef6aflqcDlV4,936
-tests/unit/cli/projects/test_cli_project_key_unit.py,sha256=Xb-O4cltVMNvHpSoPtIdfY4hmXUiMv-z5ixY49FKKyM,894
 tests/unit/cli/projects/test_cli_project_secret_unit.py,sha256=tygmgNOOf7C1J5Flo-YRo1-QLI0He5Yc_4Wx50ssC4o,915
 tests/unit/cli/projects/test_cli_project_service_unit.py,sha256=P-u_2-Gpbu0P_MjH6niAMDzj5M8oJYJ5adWcfU4LNpA,922
 tests/unit/cli/projects/test_cli_project_unit.py,sha256=64tR6ae-dQHVEE86N8tDrxOQypvyk8gANXGg6SBEUUI,627
@@ -128,13 +124,12 @@ 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_keys_unit.py,sha256=n5Y2rKaenHA6JQFlViE1_dZ00FZ0PhM3C7rQtkuiRGM,3161
 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=lTGdKOCN2bjzGORhaDVVlnzJBuEItUDGN36MsyQjDo4,3823
-proximl-0.5.13.dist-info/LICENSE,sha256=ADFxLEZDxKY0j4MdyUd5GNuhQ18rnWH5rOz1ZG7yiOA,1069
-proximl-0.5.13.dist-info/METADATA,sha256=jXM8TcsMbQr7eM5gZCwWm_hfxhGA3Y30v6el6LD0rn4,7345
-proximl-0.5.13.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-proximl-0.5.13.dist-info/entry_points.txt,sha256=HmI311IIabkZReMCXu-nGbvIEW-KfaduAOyfiSqt5SY,63
-proximl-0.5.13.dist-info/top_level.txt,sha256=-TWqc9tAaxmWmW4c7uYsmzPEYUIoh6z02xxqPbv7Kys,23
-proximl-0.5.13.dist-info/RECORD,,
+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,,

tests/integration/projects/conftest.py

@@ -4,7 +4,7 @@ from pytest import fixture
 @fixture(scope="module")
 async def project(proximl):
     project = await proximl.projects.create(
-        name="New Project", copy_keys=False, copy_secrets=False
+        name="New Project", copy_credentials=False, copy_secrets=False
     )
     yield project
     await project.remove()

tests/integration/projects/test_projects_secrets_integration.py

@@ -17,7 +17,7 @@ class ProjectSecretsTests:
         yield project_secret
         await project.secrets.remove(name="secret_value")
 
-    async def test_list_project_keys(self, project, project_secret):
+    async def test_list_project_secrets(self, project, project_secret):
         secrets = await project.secrets.list()
         assert len(secrets) > 0
 

tests/integration/test_jobs_integration.py

@@ -175,7 +175,7 @@ class JobAPIResourceValidationTests:
                 disk_size=10,
             )
         assert (
-            "Invalid Request - None (CPU Only) may be not be combined with other GPU Types"
+            "Invalid Request - CPU Only may be not be combined with other GPU Types"
             in error.value.message
         )
 

tests/unit/conftest.py

@@ -20,7 +20,7 @@ from proximl.projects import (
 from proximl.projects.datastores import ProjectDatastores, ProjectDatastore
 from proximl.projects.services import ProjectServices, ProjectService
 from proximl.projects.data_connectors import ProjectDataConnectors, ProjectDataConnector
-from proximl.projects.keys import ProjectKeys, ProjectKey
+from proximl.projects.credentials import ProjectCredentials, ProjectCredential
 from proximl.projects.secrets import ProjectSecrets, ProjectSecret
 
 from proximl.cloudbender import Cloudbender
@@ -532,7 +532,7 @@ def mock_jobs():
                         {"value": "env1val", "key": "env1"},
                         {"value": "env2val", "key": "env2"},
                     ],
-                    "worker_key_types": ["aws", "gcp"],
+                    "credentials": ["aws", "gcp"],
                     "status": "new",
                 },
                 "vpn": {
@@ -609,7 +609,7 @@ def mock_jobs():
                     "type": "DEEPLEARNING_PY37",
                     "image_size": 39656398629,
                     "env": [],
-                    "worker_key_types": [],
+                    "credentials": [],
                     "status": "ready",
                 },
                 "vpn": {
@@ -1043,10 +1043,10 @@ def mock_device_configs():
 @fixture(
     scope="session",
 )
-def mock_project_keys():
+def mock_project_credentials():
     proximl = Mock()
     yield [
-        ProjectKey(
+        ProjectCredential(
             proximl,
             **{
                 "project_uuid": "proj-id-1",
@@ -1055,7 +1055,7 @@ def mock_project_keys():
                 "updatedAt": "2023-06-02T21:22:40.084Z",
             },
         ),
-        ProjectKey(
+        ProjectCredential(
             proximl,
             **{
                 "project_uuid": "proj-id-1",
@@ -1117,7 +1117,7 @@ def mock_proximl(
     mock_project_datastores,
     mock_project_services,
     mock_project_data_connectors,
-    mock_project_keys,
+    mock_project_credentials,
     mock_project_secrets,
 ):
     proximl = create_autospec(ProxiML)
@@ -1150,8 +1150,8 @@ def mock_proximl(
     proximl.projects.data_connectors.list = AsyncMock(
         return_value=mock_project_data_connectors
     )
-    proximl.projects.keys = create_autospec(ProjectKeys)
-    proximl.projects.keys.list = AsyncMock(return_value=mock_project_keys)
+    proximl.projects.credentials = create_autospec(ProjectCredentials)
+    proximl.projects.credentials.list = AsyncMock(return_value=mock_project_credentials)
     proximl.projects.secrets = create_autospec(ProjectSecrets)
     proximl.projects.secrets.list = AsyncMock(return_value=mock_project_secrets)
 

tests/unit/projects/test_projects_unit.py

@@ -75,7 +75,7 @@ class ProjectsTests:
         requested_config = dict(
             name="new project",
         )
-        expected_payload = dict(name="new project", copy_keys=False, copy_secrets=False)
+        expected_payload = dict(name="new project", copy_credentials=False)
         api_response = {
             "id": "project-id-1",
             "name": "new project",

proximl/cli/project/key.py

@@ -1,124 +0,0 @@
-import click
-import os
-import json
-import base64
-from pathlib import Path
-from proximl.cli import pass_config
-from proximl.cli.project import project
-
-
-@project.group()
-@pass_config
-def key(config):
-    """proxiML project key commands."""
-    pass
-
-
-@key.command()
-@pass_config
-def list(config):
-    """List keys."""
-    data = [
-        ["TYPE", "KEY ID", "UPDATED AT"],
-        [
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-        ],
-    ]
-    project = config.proximl.run(config.proximl.client.projects.get_current())
-    keys = config.proximl.run(project.keys.list())
-
-    for key in keys:
-        data.append(
-            [
-                key.type,
-                key.key_id,
-                key.updated_at.isoformat(timespec="seconds"),
-            ]
-        )
-
-    for row in data:
-        click.echo(
-            "{: >13.11} {: >37.35} {: >28.26}" "".format(*row),
-            file=config.stdout,
-        )
-
-
-@key.command()
-@click.argument(
-    "type",
-    type=click.Choice(
-        [
-            "aws",
-            "azure",
-            "docker",
-            "gcp",
-            "huggingface",
-            "kaggle",
-            "ngc",
-            "wasabi",
-        ],
-        case_sensitive=False,
-    ),
-)
-@pass_config
-def put(config, type):
-    """
-    Set a key.
-
-    A key is uploaded.
-    """
-    project = config.proximl.run(config.proximl.client.projects.get_current())
-
-    tenant = None
-
-    if type in ["aws", "wasabi"]:
-        key_id = click.prompt("Enter the key ID", type=str, hide_input=False)
-        secret = click.prompt("Enter the secret key", type=str, hide_input=True)
-    elif type == "azure":
-        key_id = click.prompt(
-            "Enter the Application (client) ID", type=str, hide_input=False
-        )
-        tenant = click.prompt(
-            "Enter the Directory (tenant) ley", type=str, hide_input=False
-        )
-        secret = click.prompt("Enter the client secret", type=str, hide_input=True)
-    elif type in ["docker", "huggingface"]:
-        key_id = click.prompt("Enter the username", type=str, hide_input=False)
-        secret = click.prompt("Enter the access token", type=str, hide_input=True)
-    elif type in ["gcp", "kaggle"]:
-        file_name = click.prompt(
-            "Enter the path of the credentials file",
-            type=click.Path(
-                exists=True, file_okay=True, dir_okay=False, resolve_path=True
-            ),
-            hide_input=False,
-        )
-        key_id = os.path.basename(file_name)
-        with open(file_name) as f:
-            secret = json.load(f)
-        secret = json.dumps(secret)
-    elif type == "ngc":
-        key_id = "$oauthtoken"
-        secret = click.prompt("Enter the access token", type=str, hide_input=True)
-    else:
-        raise click.UsageError("Unsupported key type")
-
-    return config.proximl.run(
-        project.keys.put(type=type, key_id=key_id, secret=secret, tenant=tenant)
-    )
-
-
-@key.command()
-@click.argument("name", type=click.STRING)
-@pass_config
-def remove(config, name):
-    """
-    Remove a key.
-
-
-    """
-    project = config.proximl.run(config.proximl.client.projects.get_current())
-
-    return config.proximl.run(project.key.remove(name))

proximl/projects/keys.py

@@ -1,71 +0,0 @@
-import json
-import logging
-from datetime import datetime
-from dateutil import parser, tz
-
-
-class ProjectKeys(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}/keys", "GET", kwargs
-        )
-        keys = [ProjectKey(self.proximl, **service) for service in resp]
-        return keys
-
-    async def put(self, type, key_id, secret, tenant=None, **kwargs):
-        data = dict(key_id=key_id, secret=secret, tenant=tenant)
-        payload = {k: v for k, v in data.items() if v is not None}
-        logging.info(f"Creating Project Key {type}")
-        resp = await self.proximl._query(
-            f"/project/{self.project_id}/key/{type}", "PUT", None, payload
-        )
-        key = ProjectKey(self.proximl, **resp)
-        logging.info(f"Created Project Key {type} in project {self.project_id}")
-
-        return key
-
-    async def remove(self, type, **kwargs):
-        await self.proximl._query(
-            f"/project/{self.project_id}/key/{type}", "DELETE", kwargs
-        )
-
-
-class ProjectKey:
-    def __init__(self, proximl, **kwargs):
-        self.proximl = proximl
-        self._entity = kwargs
-        self._type = self._entity.get("type")
-        self._project_uuid = self._entity.get("project_uuid")
-        self._key_id = self._entity.get("key_id")
-        self._updated_at = self._entity.get("updatedAt")
-
-    @property
-    def type(self) -> str:
-        return self._type
-
-    @property
-    def project_uuid(self) -> str:
-        return self._project_uuid
-
-    @property
-    def key_id(self) -> str:
-        return self._key_id
-
-    @property
-    def updated_at(self) -> datetime:
-        timestamp = parser.isoparse(self._updated_at)
-        timezone = tz.tzlocal()
-        return timestamp.astimezone(timezone)
-
-    def __str__(self):
-        return json.dumps({k: v for k, v in self._entity.items()})
-
-    def __repr__(self):
-        return f"ProjectKey( proximl , **{self._entity.__repr__()})"
-
-    def __bool__(self):
-        return bool(self._type)

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\( proximl , \*\*{.*'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 proximl.cli.project import key as specimen
-from proximl.projects import (
-    Project,
-)
-
-
-def test_list_keys(runner, mock_project_keys):
-    with patch("proximl.cli.ProxiML", new=AsyncMock) as mock_proximl:
-        project = create_autospec(Project)
-        mock_proximl.projects = AsyncMock()
-        mock_proximl.projects.get = AsyncMock(return_value=project)
-        mock_proximl.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 proximl.projects.keys as specimen
-from proximl.exceptions import (
-    ApiError,
-    SpecificationError,
-    ProxiMLException,
-)
-
-pytestmark = [mark.sdk, mark.unit, mark.projects]
-
-
-@fixture
-def project_keys(mock_proximl):
-    yield specimen.ProjectKeys(mock_proximl, project_id="1")
-
-
-@fixture
-def project_key(mock_proximl):
-    yield specimen.ProjectKey(
-        mock_proximl, project_uuid="proj-id-1", type="aws", key_id="AIYHGFSDLK"
-    )
-
-
-class ProjectKeysTests:
-    @mark.asyncio
-    async def test_project_keys_list(self, project_keys, mock_proximl):
-        api_response = [
-            {"project_uuid": "proj-id-1", "type": "aws", "key_id": "AIYHGFSDLK"},
-            {"project_uuid": "proj-id-1", "type": "gcp", "key_id": "credentials.json"},
-        ]
-        mock_proximl._query = AsyncMock(return_value=api_response)
-        resp = await project_keys.list()
-        mock_proximl._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_proximl,
-    ):
-        api_response = dict()
-        mock_proximl._query = AsyncMock(return_value=api_response)
-        await project_keys.remove("aws")
-        mock_proximl._query.assert_called_once_with(
-            "/project/1/key/aws", "DELETE", dict()
-        )
-
-    @mark.asyncio
-    async def test_put_project_key(self, project_keys, mock_proximl):
-        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_proximl._query = AsyncMock(return_value=api_response)
-        response = await project_keys.put(**requested_config)
-        mock_proximl._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\( proximl , \*\*{.*'type': '" + project_key.type + r"'.*}\)$"
-        )
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    def test_project_key_bool(self, project_key, mock_proximl):
-        empty_project_key = specimen.ProjectKey(mock_proximl)
-        assert bool(project_key)
-        assert not bool(empty_project_key)