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

tests/integration/projects/conftest.py

@@ -4,7 +4,7 @@ from pytest import fixture
 @fixture(scope="module")
 async def project(trainml):
     project = await trainml.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_credentials_integration.py

@@ -0,0 +1,45 @@
+import re
+import sys
+import asyncio
+from pytest import mark, fixture
+
+pytestmark = [mark.sdk, mark.integration, mark.projects]
+
+
+@mark.create
+@mark.asyncio
+class ProjectCredentialsTests:
+    @fixture(scope="class")
+    async def project_credential(self, project):
+        project_credential = await project.credentials.put(
+            type="aws", key_id="ASFHALKF", secret="IUHKLHKAHF"
+        )
+        yield project_credential
+        await project.credentials.remove(type="aws")
+
+    async def test_list_project_credentials(self, project, project_credential):
+        credentials = await project.credentials.list()
+        assert len(credentials) > 0
+
+    async def test_project_credential_properties(self, project, project_credential):
+        assert isinstance(project_credential.project_uuid, str)
+        assert isinstance(project_credential.type, str)
+        assert isinstance(project_credential.key_id, str)
+        assert project_credential.type == "aws"
+        assert project.id == project_credential.project_uuid
+
+    async def test_project_credential_str(self, project_credential):
+        string = str(project_credential)
+        regex = r"^{.*\"type\": \"" + project_credential.type + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_project_credential_repr(self, project_credential):
+        string = repr(project_credential)
+        regex = (
+            r"^ProjectCredential\( trainml , \*\*{.*'type': '"
+            + project_credential.type
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)

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/cli/projects/test_cli_project_credential_unit.py

@@ -0,0 +1,26 @@
+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 credential as specimen
+from trainml.projects import (
+    Project,
+)
+
+
+def test_list_credentials(runner, mock_project_credentials):
+    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.credentials = AsyncMock()
+        project.credentials.list = AsyncMock(return_value=mock_project_credentials)
+        result = runner.invoke(specimen, ["list"])
+        print(result)
+        assert result.exit_code == 0
+        project.credentials.list.assert_called_once()

tests/unit/conftest.py

@@ -20,7 +20,7 @@ from trainml.projects import (
 from trainml.projects.datastores import ProjectDatastores, ProjectDatastore
 from trainml.projects.services import ProjectServices, ProjectService
 from trainml.projects.data_connectors import ProjectDataConnectors, ProjectDataConnector
-from trainml.projects.keys import ProjectKeys, ProjectKey
+from trainml.projects.credentials import ProjectCredentials, ProjectCredential
 from trainml.projects.secrets import ProjectSecrets, ProjectSecret
 
 from trainml.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():
     trainml = Mock()
     yield [
-        ProjectKey(
+        ProjectCredential(
             trainml,
             **{
                 "project_uuid": "proj-id-1",
@@ -1055,7 +1055,7 @@ def mock_project_keys():
                 "updatedAt": "2023-06-02T21:22:40.084Z",
             },
         ),
-        ProjectKey(
+        ProjectCredential(
             trainml,
             **{
                 "project_uuid": "proj-id-1",
@@ -1117,7 +1117,7 @@ def mock_trainml(
     mock_project_datastores,
     mock_project_services,
     mock_project_data_connectors,
-    mock_project_keys,
+    mock_project_credentials,
     mock_project_secrets,
 ):
     trainml = create_autospec(TrainML)
@@ -1150,8 +1150,8 @@ def mock_trainml(
     trainml.projects.data_connectors.list = AsyncMock(
         return_value=mock_project_data_connectors
     )
-    trainml.projects.keys = create_autospec(ProjectKeys)
-    trainml.projects.keys.list = AsyncMock(return_value=mock_project_keys)
+    trainml.projects.credentials = create_autospec(ProjectCredentials)
+    trainml.projects.credentials.list = AsyncMock(return_value=mock_project_credentials)
     trainml.projects.secrets = create_autospec(ProjectSecrets)
     trainml.projects.secrets.list = AsyncMock(return_value=mock_project_secrets)
 

tests/unit/projects/test_project_credentials_unit.py

@@ -0,0 +1,100 @@
+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.credentials as specimen
+from trainml.exceptions import (
+    ApiError,
+    SpecificationError,
+    TrainMLException,
+)
+
+pytestmark = [mark.sdk, mark.unit, mark.projects]
+
+
+@fixture
+def project_credentials(mock_trainml):
+    yield specimen.ProjectCredentials(mock_trainml, project_id="1")
+
+
+@fixture
+def project_credential(mock_trainml):
+    yield specimen.ProjectCredential(
+        mock_trainml, project_uuid="proj-id-1", type="aws", key_id="AIYHGFSDLK"
+    )
+
+
+class ProjectCredentialsTests:
+    @mark.asyncio
+    async def test_project_credentials_list(self, project_credentials, 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_credentials.list()
+        mock_trainml._query.assert_called_once_with(
+            "/project/1/credentials", "GET", dict()
+        )
+        assert len(resp) == 2
+
+    @mark.asyncio
+    async def test_remove_project_credential(
+        self,
+        project_credentials,
+        mock_trainml,
+    ):
+        api_response = dict()
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        await project_credentials.remove("aws")
+        mock_trainml._query.assert_called_once_with(
+            "/project/1/credential/aws", "DELETE", dict()
+        )
+
+    @mark.asyncio
+    async def test_put_project_credential(self, project_credentials, 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_credentials.put(**requested_config)
+        mock_trainml._query.assert_called_once_with(
+            "/project/1/credential/aws", "PUT", None, expected_payload
+        )
+        assert response.type == "aws"
+
+
+class ProjectCredentialTests:
+    def test_project_credential_properties(self, project_credential):
+        assert isinstance(project_credential.type, str)
+        assert isinstance(project_credential.key_id, str)
+        assert isinstance(project_credential.project_uuid, str)
+
+    def test_project_credential_str(self, project_credential):
+        string = str(project_credential)
+        regex = r"^{.*\"type\": \"" + project_credential.type + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    def test_project_credential_repr(self, project_credential):
+        string = repr(project_credential)
+        regex = (
+            r"^ProjectCredential\( trainml , \*\*{.*'type': '"
+            + project_credential.type
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    def test_project_credential_bool(self, project_credential, mock_trainml):
+        empty_project_credential = specimen.ProjectCredential(mock_trainml)
+        assert bool(project_credential)
+        assert not bool(empty_project_credential)

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",

trainml/__init__.py

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

trainml/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],
         ),
     )
 

trainml/cli/project/__init__.py

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

trainml/cli/project/credential.py

@@ -0,0 +1,128 @@
+import click
+import os
+import json
+import base64
+from pathlib import Path
+from trainml.cli import pass_config
+from trainml.cli.project import project
+
+
+@project.group()
+@pass_config
+def credential(config):
+    """trainML project credential commands."""
+    pass
+
+
+@credential.command()
+@pass_config
+def list(config):
+    """List credentials."""
+    data = [
+        ["TYPE", "KEY ID", "UPDATED AT"],
+        [
+            "-" * 80,
+            "-" * 80,
+            "-" * 80,
+        ],
+    ]
+    project = config.trainml.run(config.trainml.client.projects.get_current())
+    credentials = config.trainml.run(project.credentials.list())
+
+    for credential in credentials:
+        data.append(
+            [
+                credential.type,
+                credential.key_id,
+                credential.updated_at.isoformat(timespec="seconds"),
+            ]
+        )
+
+    for row in data:
+        click.echo(
+            "{: >13.11} {: >37.35} {: >28.26}" "".format(*row),
+            file=config.stdout,
+        )
+
+
+@credential.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 credential.
+
+    A credential is uploaded.
+    """
+    project = config.trainml.run(config.trainml.client.projects.get_current())
+
+    tenant = None
+
+    if type in ["aws", "wasabi"]:
+        credential_id = click.prompt(
+            "Enter the credential ID", type=str, hide_input=False
+        )
+        secret = click.prompt("Enter the secret credential", type=str, hide_input=True)
+    elif type == "azure":
+        credential_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"]:
+        credential_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,
+        )
+        credential_id = os.path.basename(file_name)
+        with open(file_name) as f:
+            secret = json.load(f)
+        secret = json.dumps(secret)
+    elif type == "ngc":
+        credential_id = "$oauthtoken"
+        secret = click.prompt("Enter the access token", type=str, hide_input=True)
+    else:
+        raise click.UsageError("Unsupported credential type")
+
+    return config.trainml.run(
+        project.credentials.put(
+            type=type, credential_id=credential_id, secret=secret, tenant=tenant
+        )
+    )
+
+
+@credential.command()
+@click.argument("name", type=click.STRING)
+@pass_config
+def remove(config, name):
+    """
+    Remove a credential.
+
+
+    """
+    project = config.trainml.run(config.trainml.client.projects.get_current())
+
+    return config.trainml.run(project.credential.remove(name))

trainml/cli/project/secret.py

@@ -1,4 +1,5 @@
 import click
+import os
 from trainml.cli import pass_config
 from trainml.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.trainml.run(config.trainml.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.trainml.run(project.secrets.put(name=name, value=value))
 

trainml/projects/credentials.py

@@ -0,0 +1,71 @@
+import json
+import logging
+from datetime import datetime
+from dateutil import parser, tz
+
+
+class ProjectCredentials(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}/credentials", "GET", kwargs
+        )
+        credentials = [ProjectCredential(self.trainml, **service) for service in resp]
+        return credentials
+
+    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 Credential {type}")
+        resp = await self.trainml._query(
+            f"/project/{self.project_id}/credential/{type}", "PUT", None, payload
+        )
+        credential = ProjectCredential(self.trainml, **resp)
+        logging.info(f"Created Project Credential {type} in project {self.project_id}")
+
+        return credential
+
+    async def remove(self, type, **kwargs):
+        await self.trainml._query(
+            f"/project/{self.project_id}/credential/{type}", "DELETE", kwargs
+        )
+
+
+class ProjectCredential:
+    def __init__(self, trainml, **kwargs):
+        self.trainml = trainml
+        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"ProjectCredential( trainml , **{self._entity.__repr__()})"
+
+    def __bool__(self):
+        return bool(self._type)

trainml/projects/data_connectors.py

@@ -7,6 +7,12 @@ class ProjectDataConnectors(object):
         self.trainml = trainml
         self.project_id = project_id
 
+    async def get(self, id, **kwargs):
+        resp = await self.trainml._query(
+            f"/project/{self.project_id}/data_connectors/{id}", "GET", kwargs
+        )
+        return ProjectDataConnector(self.trainml, **resp)
+
     async def list(self, **kwargs):
         resp = await self.trainml._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.trainml._query(
+            f"/project/{self._project_uuid}/data_connectors/{self._id}/enable", "PATCH"
+        )
+
+    async def disable(self):
+        await self.trainml._query(
+            f"/project/{self._project_uuid}/data_connectors/{self._id}/disable", "PATCH"
+        )

trainml/projects/datastores.py

@@ -7,6 +7,12 @@ class ProjectDatastores(object):
         self.trainml = trainml
         self.project_id = project_id
 
+    async def get(self, id, **kwargs):
+        resp = await self.trainml._query(
+            f"/project/{self.project_id}/datastores/{id}", "GET", kwargs
+        )
+        return ProjectDatastore(self.trainml, **resp)
+
     async def list(self, **kwargs):
         resp = await self.trainml._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.trainml._query(
+            f"/project/{self._project_uuid}/datastores/{self._id}/enable", "PATCH"
+        )
+
+    async def disable(self):
+        await self.trainml._query(
+            f"/project/{self._project_uuid}/datastores/{self._id}/disable", "PATCH"
+        )

trainml/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.trainml, **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.trainml._query("/project", "POST", None, payload)
@@ -51,7 +54,7 @@ class Project:
         self.datastores = ProjectDatastores(self.trainml, self._id)
         self.data_connectors = ProjectDataConnectors(self.trainml, self._id)
         self.services = ProjectServices(self.trainml, self._id)
-        self.keys = ProjectKeys(self.trainml, self._id)
+        self.credentials = ProjectCredentials(self.trainml, self._id)
         self.secrets = ProjectSecrets(self.trainml, self._id)
 
     @property

trainml/projects/secrets.py

@@ -24,7 +24,7 @@ class ProjectSecrets(object):
             f"/project/{self.project_id}/secret/{name}", "PUT", None, payload
         )
         secret = ProjectSecret(self.trainml, **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):

trainml/projects/services.py

@@ -7,6 +7,12 @@ class ProjectServices(object):
         self.trainml = trainml
         self.project_id = project_id
 
+    async def get(self, id, **kwargs):
+        resp = await self.trainml._query(
+            f"/project/{self.project_id}/services/{id}", "GET", kwargs
+        )
+        return ProjectService(self.trainml, **resp)
+
     async def list(self, **kwargs):
         resp = await self.trainml._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.trainml._query(
+            f"/project/{self._project_uuid}/services/{self._id}/enable", "PATCH"
+        )
+
+    async def disable(self):
+        await self.trainml._query(
+            f"/project/{self._project_uuid}/services/{self._id}/disable", "PATCH"
+        )

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

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

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

@@ -8,21 +8,22 @@ tests/integration/test_checkpoints_integration.py,sha256=Giy5Z6WyselfXzskDGR7Z0k
 tests/integration/test_datasets_integration.py,sha256=zdHOevduuMUWvVxaHBslpmH8AdvPdqEJ95MdqCC5_rw,3499
 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=N2peEQGYHteGMd0J7NK4gJaaTyps5jjuiKq2ENnD8SY,25117
+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/cloudbender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/integration/cloudbender/test_providers_integration.py,sha256=oV8ydFsosDZ_Z1Dkg2IN-ZhWuIl5e_HkHAORMsOsAJc,1473
 tests/integration/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/projects/conftest.py,sha256=IaCvq3G_2uBm-DAfqTUF2K_km06af711bzmp-OMwZBs,242
+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=XMMov60dVyklZH0FzcHgVKOu5zpNH4z7GriOp-wawgI,1478
+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/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/unit/conftest.py,sha256=IIdY88sGlvFuH2ZZHysWi3QCZ1-oAZ1yG6npKMRjCzI,35521
+tests/unit/conftest.py,sha256=hLfECgT0w4pVZABrpK4UUUeaX1aDzQvj8-erWTGBjHA,35588
 tests/unit/test_auth_unit.py,sha256=nfhlOCR7rUsn_MaD8QQtBc2v0k8pIxqbzGgRAZK1WGc,858
 tests/unit/test_checkpoints_unit.py,sha256=7bgpEnjkfETgbEHmYApyD_htEWAUVZdposyYVClU3tQ,15965
 tests/unit/test_connections_unit.py,sha256=FzN2ddQxNpjxzNGUsXhjTk0HnD24wSPelPTL4o_r-Ho,5507
@@ -51,6 +52,7 @@ tests/unit/cli/cloudbender/test_cli_provider_unit.py,sha256=Rm-tRNPbTTB7ZzkkIpLf
 tests/unit/cli/cloudbender/test_cli_region_unit.py,sha256=iH5AbrzZ-R2EJ-Bd2HFN7FN2lTpkr3-pCLR59ZVvdQU,1262
 tests/unit/cli/cloudbender/test_cli_service_unit.py,sha256=4LDOJDXygMuho2cdI2K59eq4oyiry9hNaG0avEr0_tw,1311
 tests/unit/cli/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+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
@@ -67,13 +69,14 @@ tests/unit/cloudbender/test_providers_unit.py,sha256=OgxifgC1IqLH8DNMKXy1Ne9_7a7
 tests/unit/cloudbender/test_regions_unit.py,sha256=BbJICLIQmlotpA1UmLD0KTW_H9g2UW0J8ZYzQk1_Xjc,6299
 tests/unit/cloudbender/test_services_unit.py,sha256=fYJx-W89HD-EYkO32_v33X40VxipUfWQCy13FZO2fcA,5220
 tests/unit/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+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_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=4Jczapaj5pZOYKmRYN8MEygzyNwULCaOyYSyiNUBsq8,3823
-trainml/__init__.py,sha256=vzWg68mF2ggaSj8F_z_riREX-rzGbJcPhGIDE1jG3yE,433
+tests/unit/projects/test_projects_unit.py,sha256=8rJ40bJ7YszEsoL6D02Muey-sgRjqFmMoR-R3IiP_Ig,3810
+trainml/__init__.py,sha256=KVgJtJhufpHLxSIxc6VgC9rtBlScxurtZsM8FibfA3o,433
 trainml/__main__.py,sha256=JgErYkiskih8Y6oRwowALtR-rwQhAAdqOYWjQraRIPI,59
 trainml/auth.py,sha256=gruZv27nhttrCbhcVQTH9kZkF2uMm1E06SwA_2pQAHQ,26565
 trainml/checkpoints.py,sha256=Hg3_Si7ohzsv4_8JIjoj9pMRpHNZRWKC5R2gtgmp01s,8790
@@ -103,12 +106,13 @@ 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=pfOCqs5Vfk4PAI5KZpXHJ1vp3DDe4ccvYzieh0oFexY,34288
-trainml/cli/project/__init__.py,sha256=XOBLQMQqlkzMUNoUejXXIP7bY5ebSWKlUn5XGkQVbPw,1904
+trainml/cli/job/create.py,sha256=1YGHgl0bN0LC7EtMStukHT6RvnBheaaOnkqoKsAxuco,34380
+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=LdEd6qJwfRs3JIjoOaNxkDcDuCdYB9GPKHW_vcOBal8,1621
+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
 trainml/cloudbender/cloudbender.py,sha256=ekJZHSQ1F4HF8y0sAJ3MDB_hiC8QxPv9-O7U24z_RR4,717
@@ -121,15 +125,16 @@ trainml/cloudbender/providers.py,sha256=22ymUl1KLC8UlyoWMsIrOKhUDOwnhklhHQ3EZ_V6
 trainml/cloudbender/regions.py,sha256=nfSY9fIWp_AaRE_1Y0qwXX6WVSyPKxpji-zUfM3BNUo,5157
 trainml/cloudbender/services.py,sha256=KC3VcyljvnazUUG-Tzwm6Ab6d0--yuccXjOaMgYB5uA,5126
 trainml/projects/__init__.py,sha256=6NKCcHtQMeGB1IyU-djANphfnDX6MEkrXUM5Fyq9fWg,75
-trainml/projects/data_connectors.py,sha256=Y8lJNF9K5JZlwfKTtN9gh7eSRAivgiPWe_lx05pGM2U,1662
-trainml/projects/datastores.py,sha256=oyRffW8L7Z1tdqspl58Zf1ces0p-Stk0EbnMRaenkUw,1560
+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=mxMGmBppoFbwebMitczZjeNEODrzt0AuNm1LGNegyPo,2755
-trainml/projects/secrets.py,sha256=5qNPWITH8qtlXKkPWnFOzH0HPU7Z0K1OeW-9p7haOzM,2157
-trainml/projects/services.py,sha256=ZP-6CDXktIe6p89Hshgs91HLWXQPNWeU7VFtoKUPHXo,1679
-trainml-0.5.11.dist-info/LICENSE,sha256=s0lpBxhSSUEpMavwde-Vb6K_K7xDCTTvSpNznVqVGR0,1069
-trainml-0.5.11.dist-info/METADATA,sha256=z5-C7kUq2eL3_WS_uLwEIILAIBF0FAAErmoI1EYKaiw,7346
-trainml-0.5.11.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-trainml-0.5.11.dist-info/entry_points.txt,sha256=OzBDm2wXby1bSGF02jTVxzRFZLejnbFiLHXhKdW3Bds,63
-trainml-0.5.11.dist-info/top_level.txt,sha256=Y1kLFRWKUW7RG8BX7cvejHF_yW8wBOaRYF1JQHENY4w,23
-trainml-0.5.11.dist-info/RECORD,,
+trainml/projects/projects.py,sha256=0ZghShqjbs5swfn3BsLrMW2NzrdBXpf_M-nyzwYPjpM,2792
+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,,