proximl 0.5.10__tar.gz → 0.5.12__tar.gz

{proximl-0.5.10/proximl.egg-info → proximl-0.5.12}/PKG-INFO

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

{proximl-0.5.10 → proximl-0.5.12}/proximl/__init__.py

@@ -13,5 +13,5 @@ logging.basicConfig(
 logger = logging.getLogger(__name__)
 
 
-__version__ = "0.5.10"
+__version__ = "0.5.12"
 __all__ = "ProxiML"

{proximl-0.5.10 → proximl-0.5.12}/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-0.5.10 → proximl-0.5.12}/proximl/cli/project/__init__.py

@@ -77,77 +77,8 @@ def remove(config, project):
     return config.proximl.run(found.remove())
 
 
-@project.command()
-@pass_config
-def list_datastores(config):
-    """List project datastores."""
-    data = [
-        ["ID", "NAME", "TYPE", "REGION_UUID"],
-        [
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-        ],
-    ]
-    project = config.proximl.run(
-        config.proximl.client.projects.get(config.proximl.client.project)
-    )
-
-    datastores = config.proximl.run(project.list_datastores())
-
-    for datastore in datastores:
-        data.append(
-            [
-                datastore.id,
-                datastore.name,
-                datastore.type,
-                datastore.region_uuid,
-            ]
-        )
-
-    for row in data:
-        click.echo(
-            "{: >38.36} {: >30.28} {: >15.13} {: >38.36}" "".format(*row),
-            file=config.stdout,
-        )
-
-
-@project.command()
-@pass_config
-def list_services(config):
-    """List project services."""
-    data = [
-        ["ID", "NAME", "HOSTNAME", "REGION_UUID"],
-        [
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-        ],
-    ]
-    project = config.proximl.run(
-        config.proximl.client.projects.get(config.proximl.client.project)
-    )
-
-    services = config.proximl.run(project.list_services())
-
-    for service in services:
-        data.append(
-            [
-                service.id,
-                service.name,
-                service.hostname,
-                service.region_uuid,
-            ]
-        )
-
-    for row in data:
-        click.echo(
-            "{: >38.36} {: >30.28} {: >30.28} {: >38.36}" "".format(*row),
-            file=config.stdout,
-        )
-
-
 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-0.5.10/proximl/cli/project/key.py → proximl-0.5.12/proximl/cli/project/credential.py

@@ -9,15 +9,15 @@ from proximl.cli.project import project
 
 @project.group()
 @pass_config
-def key(config):
-    """proxiML project key commands."""
+def credential(config):
+    """proxiML project credential commands."""
     pass
 
 
-@key.command()
+@credential.command()
 @pass_config
 def list(config):
-    """List keys."""
+    """List credentials."""
     data = [
         ["TYPE", "KEY ID", "UPDATED AT"],
         [
@@ -27,14 +27,14 @@ def list(config):
         ],
     ]
     project = config.proximl.run(config.proximl.client.projects.get_current())
-    keys = config.proximl.run(project.keys.list())
+    credentials = config.proximl.run(project.credentials.list())
 
-    for key in keys:
+    for credential in credentials:
         data.append(
             [
-                key.type,
-                key.key_id,
-                key.updated_at.isoformat(timespec="seconds"),
+                credential.type,
+                credential.key_id,
+                credential.updated_at.isoformat(timespec="seconds"),
             ]
         )
 
@@ -45,7 +45,7 @@ def list(config):
         )
 
 
-@key.command()
+@credential.command()
 @click.argument(
     "type",
     type=click.Choice(
@@ -65,19 +65,21 @@ def list(config):
 @pass_config
 def put(config, type):
     """
-    Set a key.
+    Set a credential.
 
-    A key is uploaded.
+    A credential 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)
+        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":
-        key_id = click.prompt(
+        credential_id = click.prompt(
             "Enter the Application (client) ID", type=str, hide_input=False
         )
         tenant = click.prompt(
@@ -85,7 +87,7 @@ def put(config, type):
         )
         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)
+        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(
@@ -95,30 +97,32 @@ def put(config, type):
             ),
             hide_input=False,
         )
-        key_id = os.path.basename(file_name)
+        credential_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"
+        credential_id = "$oauthtoken"
         secret = click.prompt("Enter the access token", type=str, hide_input=True)
     else:
-        raise click.UsageError("Unsupported key type")
+        raise click.UsageError("Unsupported credential type")
 
     return config.proximl.run(
-        project.keys.put(type=type, key_id=key_id, secret=secret, tenant=tenant)
+        project.credentials.put(
+            type=type, credential_id=credential_id, secret=secret, tenant=tenant
+        )
     )
 
 
-@key.command()
+@credential.command()
 @click.argument("name", type=click.STRING)
 @pass_config
 def remove(config, name):
     """
-    Remove a key.
+    Remove a credential.
 
 
     """
     project = config.proximl.run(config.proximl.client.projects.get_current())
 
-    return config.proximl.run(project.key.remove(name))
+    return config.proximl.run(project.credential.remove(name))

proximl-0.5.12/proximl/cli/project/data_connector.py

@@ -0,0 +1,61 @@
+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 data_connector(config):
+    """proxiML project data_connector commands."""
+    pass
+
+
+@data_connector.command()
+@pass_config
+def list(config):
+    """List project data_connectors."""
+    data = [
+        ["ID", "NAME", "TYPE", "REGION_UUID"],
+        [
+            "-" * 80,
+            "-" * 80,
+            "-" * 80,
+            "-" * 80,
+        ],
+    ]
+    project = config.proximl.run(
+        config.proximl.client.projects.get(config.proximl.client.project)
+    )
+
+    data_connectors = config.proximl.run(project.data_connectors.list())
+
+    for data_connector in data_connectors:
+        data.append(
+            [
+                data_connector.id,
+                data_connector.name,
+                data_connector.type,
+                data_connector.region_uuid,
+            ]
+        )
+
+    for row in data:
+        click.echo(
+            "{: >38.36} {: >30.28} {: >15.13} {: >38.36}" "".format(*row),
+            file=config.stdout,
+        )
+
+
+@data_connector.command()
+@pass_config
+def refresh(config):
+    """
+    Refresh project data_connector list.
+    """
+    project = config.proximl.run(config.proximl.client.projects.get_current())
+
+    return config.proximl.run(project.data_connectors.refresh())

proximl-0.5.12/proximl/cli/project/datastore.py

@@ -0,0 +1,61 @@
+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 datastore(config):
+    """proxiML project datastore commands."""
+    pass
+
+
+@datastore.command()
+@pass_config
+def list(config):
+    """List project datastores."""
+    data = [
+        ["ID", "NAME", "TYPE", "REGION_UUID"],
+        [
+            "-" * 80,
+            "-" * 80,
+            "-" * 80,
+            "-" * 80,
+        ],
+    ]
+    project = config.proximl.run(
+        config.proximl.client.projects.get(config.proximl.client.project)
+    )
+
+    datastores = config.proximl.run(project.datastores.list())
+
+    for datastore in datastores:
+        data.append(
+            [
+                datastore.id,
+                datastore.name,
+                datastore.type,
+                datastore.region_uuid,
+            ]
+        )
+
+    for row in data:
+        click.echo(
+            "{: >38.36} {: >30.28} {: >15.13} {: >38.36}" "".format(*row),
+            file=config.stdout,
+        )
+
+
+@datastore.command()
+@pass_config
+def refresh(config):
+    """
+    Refresh project datastore list.
+    """
+    project = config.proximl.run(config.proximl.client.projects.get_current())
+
+    return config.proximl.run(project.datastores.refresh())

{proximl-0.5.10 → proximl-0.5.12}/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-0.5.12/proximl/cli/project/service.py

@@ -0,0 +1,61 @@
+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 service(config):
+    """proxiML project service commands."""
+    pass
+
+
+@service.command()
+@pass_config
+def list(config):
+    """List project services."""
+    data = [
+        ["ID", "NAME", "TYPE", "REGION_UUID"],
+        [
+            "-" * 80,
+            "-" * 80,
+            "-" * 80,
+            "-" * 80,
+        ],
+    ]
+    project = config.proximl.run(
+        config.proximl.client.projects.get(config.proximl.client.project)
+    )
+
+    services = config.proximl.run(project.services.list())
+
+    for service in services:
+        data.append(
+            [
+                service.id,
+                service.name,
+                service.hostname,
+                service.region_uuid,
+            ]
+        )
+
+    for row in data:
+        click.echo(
+            "{: >38.36} {: >30.28} {: >15.13} {: >38.36}" "".format(*row),
+            file=config.stdout,
+        )
+
+
+@service.command()
+@pass_config
+def refresh(config):
+    """
+    Refresh project service list.
+    """
+    project = config.proximl.run(config.proximl.client.projects.get_current())
+
+    return config.proximl.run(project.services.refresh())

{proximl-0.5.10 → proximl-0.5.12}/proximl/cloudbender/nodes.py

@@ -3,11 +3,7 @@ import logging
 import asyncio
 import math
 
-from proximl.exceptions import (
-    ApiError,
-    SpecificationError,
-    ProxiMLException,
-)
+from proximl.exceptions import ApiError, SpecificationError, ProxiMLException, NodeError
 
 
 class Nodes(object):
@@ -37,7 +33,7 @@ class Nodes(object):
         region_uuid,
         friendly_name,
         hostname,
-        minion_id,
+        minion_id=None,
         type="permanent",
         service="compute",
         **kwargs,
@@ -191,6 +187,8 @@ class Node:
                 if status == "archived" and e.status == 404:
                     return
                 raise e
+            if self.status in ["errored", "failed"]:
+                raise NodeError(self.status, self)
             if self.status == status:
                 return self
             else:

{proximl-0.5.10 → proximl-0.5.12}/proximl/cloudbender/providers.py

@@ -1,7 +1,16 @@
 import json
 import logging
+import asyncio
+import math
 from datetime import datetime
 
+from proximl.exceptions import (
+    ApiError,
+    SpecificationError,
+    ProxiMLException,
+    ProviderError,
+)
+
 
 class Providers(object):
     def __init__(self, proximl):
@@ -36,6 +45,7 @@ class Provider:
         self._provider = kwargs
         self._id = self._provider.get("provider_uuid")
         self._type = self._provider.get("type")
+        self._status = self._provider.get("status")
         self._credits = self._provider.get("credits")
 
     @property
@@ -46,6 +56,10 @@ class Provider:
     def type(self) -> str:
         return self._type
 
+    @property
+    def status(self) -> str:
+        return self._status
+
     @property
     def credits(self) -> float:
         return self._credits
@@ -69,3 +83,42 @@ class Provider:
         )
         self.__init__(self.proximl, **resp)
         return self
+
+    async def wait_for(self, status, timeout=300):
+        if self.status == status:
+            return
+        valid_statuses = ["ready", "archived"]
+        if not status in valid_statuses:
+            raise SpecificationError(
+                "status",
+                f"Invalid wait_for status {status}.  Valid statuses are: {valid_statuses}",
+            )
+        MAX_TIMEOUT = 24 * 60 * 60
+        if timeout > MAX_TIMEOUT:
+            raise SpecificationError(
+                "timeout",
+                f"timeout must be less than {MAX_TIMEOUT} seconds.",
+            )
+
+        POLL_INTERVAL_MIN = 5
+        POLL_INTERVAL_MAX = 60
+        POLL_INTERVAL = max(min(timeout / 60, POLL_INTERVAL_MAX), POLL_INTERVAL_MIN)
+        retry_count = math.ceil(timeout / POLL_INTERVAL)
+        count = 0
+        while count < retry_count:
+            await asyncio.sleep(POLL_INTERVAL)
+            try:
+                await self.refresh()
+            except ApiError as e:
+                if status == "archived" and e.status == 404:
+                    return
+                raise e
+            if self.status in ["errored", "failed"]:
+                raise ProviderError(self.status, self)
+            if self.status == status:
+                return self
+            else:
+                count += 1
+                logging.debug(f"self: {self}, retry count {count}")
+
+        raise ProxiMLException(f"Timeout waiting for {status}")