proximl 0.5.10__tar.gz → 0.5.11__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: proximl
-Version: 0.5.10
+Version: 0.5.11
 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.11}/proximl/__init__.py

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

{proximl-0.5.10 → proximl-0.5.11}/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.data_connector import data_connector
+from proximl.cli.project.datastore import datastore
+from proximl.cli.project.service import service

proximl-0.5.11/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.11/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.11/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.11}/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.11}/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}")

{proximl-0.5.10 → proximl-0.5.11}/proximl/cloudbender/regions.py

@@ -1,5 +1,14 @@
 import json
 import logging
+import asyncio
+import math
+
+from proximl.exceptions import (
+    ApiError,
+    SpecificationError,
+    ProxiMLException,
+    RegionError,
+)
 
 
 class Regions(object):
@@ -111,3 +120,42 @@ class Region:
             None,
             dict(project_uuid=project_uuid, checkpoint_uuid=checkpoint_uuid),
         )
+
+    async def wait_for(self, status, timeout=300):
+        if self.status == status:
+            return
+        valid_statuses = ["healthy", "offline", "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 RegionError(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}")

{proximl-0.5.10 → proximl-0.5.11}/proximl/exceptions.py

@@ -147,3 +147,54 @@ class SpecificationError(ProxiMLException):
 
     def __str__(self):
         return "SpecificationError({self.attribute}, {self.message})".format(self=self)
+
+
+class NodeError(ProxiMLException):
+    def __init__(self, status, data, *args):
+        super().__init__(data, *args)
+        self._status = status
+        self._message = data
+
+    @property
+    def status(self) -> str:
+        return self._status
+
+    def __repr__(self):
+        return "NodeError({self.status}, {self.message})".format(self=self)
+
+    def __str__(self):
+        return "NodeError({self.status}, {self.message})".format(self=self)
+
+
+class ProviderError(ProxiMLException):
+    def __init__(self, status, data, *args):
+        super().__init__(data, *args)
+        self._status = status
+        self._message = data
+
+    @property
+    def status(self) -> str:
+        return self._status
+
+    def __repr__(self):
+        return "ProviderError({self.status}, {self.message})".format(self=self)
+
+    def __str__(self):
+        return "ProviderError({self.status}, {self.message})".format(self=self)
+
+
+class RegionError(ProxiMLException):
+    def __init__(self, status, data, *args):
+        super().__init__(data, *args)
+        self._status = status
+        self._message = data
+
+    @property
+    def status(self) -> str:
+        return self._status
+
+    def __repr__(self):
+        return "RegionError({self.status}, {self.message})".format(self=self)
+
+    def __str__(self):
+        return "RegionError({self.status}, {self.message})".format(self=self)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: proximl
-Version: 0.5.10
+Version: 0.5.11
 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.11}/proximl.egg-info/SOURCES.txt

@@ -44,8 +44,11 @@ proximl/cli/cloudbender/service.py
 proximl/cli/job/__init__.py
 proximl/cli/job/create.py
 proximl/cli/project/__init__.py
+proximl/cli/project/data_connector.py
+proximl/cli/project/datastore.py
 proximl/cli/project/key.py
 proximl/cli/project/secret.py
+proximl/cli/project/service.py
 proximl/cloudbender/__init__.py
 proximl/cloudbender/cloudbender.py
 proximl/cloudbender/data_connectors.py
@@ -76,9 +79,12 @@ tests/integration/cloudbender/__init__.py
 tests/integration/cloudbender/test_providers_integration.py
 tests/integration/projects/__init__.py
 tests/integration/projects/conftest.py
+tests/integration/projects/test_projects_data_connectors_integration.py
+tests/integration/projects/test_projects_datastores_integration.py
 tests/integration/projects/test_projects_integration.py
 tests/integration/projects/test_projects_keys_integration.py
 tests/integration/projects/test_projects_secrets_integration.py
+tests/integration/projects/test_projects_services_integration.py
 tests/unit/__init__.py
 tests/unit/conftest.py
 tests/unit/test_auth_unit.py
@@ -100,7 +106,6 @@ tests/unit/cli/test_cli_environment_unit.py
 tests/unit/cli/test_cli_gpu_unit.py
 tests/unit/cli/test_cli_job_unit.py
 tests/unit/cli/test_cli_model_unit.py
-tests/unit/cli/test_cli_project_unit.py
 tests/unit/cli/test_cli_volume_unit.py
 tests/unit/cli/cloudbender/__init__.py
 tests/unit/cli/cloudbender/test_cli_datastore_unit.py
@@ -109,6 +114,13 @@ tests/unit/cli/cloudbender/test_cli_node_unit.py
 tests/unit/cli/cloudbender/test_cli_provider_unit.py
 tests/unit/cli/cloudbender/test_cli_region_unit.py
 tests/unit/cli/cloudbender/test_cli_service_unit.py
+tests/unit/cli/projects/__init__.py
+tests/unit/cli/projects/test_cli_project_data_connector_unit.py
+tests/unit/cli/projects/test_cli_project_datastore_unit.py
+tests/unit/cli/projects/test_cli_project_key_unit.py
+tests/unit/cli/projects/test_cli_project_secret_unit.py
+tests/unit/cli/projects/test_cli_project_service_unit.py
+tests/unit/cli/projects/test_cli_project_unit.py
 tests/unit/cloudbender/__init__.py
 tests/unit/cloudbender/test_data_connectors_unit.py
 tests/unit/cloudbender/test_datastores_unit.py

{proximl-0.5.10 → proximl-0.5.11}/tests/integration/projects/conftest.py

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

proximl-0.5.11/tests/integration/projects/test_projects_data_connectors_integration.py

@@ -0,0 +1,44 @@
+import re
+import sys
+import asyncio
+from pytest import mark, fixture
+
+pytestmark = [mark.sdk, mark.integration, mark.projects]
+
+
+@mark.create
+@mark.asyncio
+class ProjectDataConnectorsTests:
+    @fixture(scope="class")
+    async def project_data_connector(self, project):
+        data_connectors = await project.data_connectors.list()
+        yield data_connectors[0]
+
+    async def test_list_project_data_connectors(self, project, project_data_connector):
+        data_connectors = await project.data_connectors.list()
+        assert len(data_connectors) > 0
+
+    async def test_project_data_connector_properties(
+        self, project, project_data_connector
+    ):
+        assert isinstance(project_data_connector.project_uuid, str)
+        assert isinstance(project_data_connector.type, str)
+        assert isinstance(project_data_connector.name, str)
+        assert isinstance(project_data_connector.region_uuid, str)
+        assert project.id == project_data_connector.project_uuid
+
+    async def test_project_data_connector_str(self, project_data_connector):
+        string = str(project_data_connector)
+        regex = r"^{.*\"name\": \"" + project_data_connector.name + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_project_data_connector_repr(self, project_data_connector):
+        string = repr(project_data_connector)
+        regex = (
+            r"^ProjectDataConnector\( proximl , \*\*{.*'name': '"
+            + project_data_connector.name
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)

proximl-0.5.11/tests/integration/projects/test_projects_datastores_integration.py

@@ -0,0 +1,42 @@
+import re
+import sys
+import asyncio
+from pytest import mark, fixture
+
+pytestmark = [mark.sdk, mark.integration, mark.projects]
+
+
+@mark.create
+@mark.asyncio
+class ProjectDatastoresTests:
+    @fixture(scope="class")
+    async def project_datastore(self, project):
+        datastores = await project.datastores.list()
+        yield datastores[0]
+
+    async def test_list_project_datastores(self, project):
+        datastores = await project.datastores.list()
+        assert len(datastores) > 0
+
+    async def test_project_datastore_properties(self, project, project_datastore):
+        assert isinstance(project_datastore.project_uuid, str)
+        assert isinstance(project_datastore.type, str)
+        assert isinstance(project_datastore.name, str)
+        assert isinstance(project_datastore.region_uuid, str)
+        assert project.id == project_datastore.project_uuid
+
+    async def test_project_datastore_str(self, project_datastore):
+        string = str(project_datastore)
+        regex = r"^{.*\"name\": \"" + project_datastore.name + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_project_datastore_repr(self, project_datastore):
+        string = repr(project_datastore)
+        regex = (
+            r"^ProjectDatastore\( proximl , \*\*{.*'name': '"
+            + project_datastore.name
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)