trainml 0.5.5__py3-none-any.whl → 0.5.6__py3-none-any.whl

tests/unit/cli/cloudbender/test_cli_reservation_unit.py

@@ -4,35 +4,31 @@ import click
 from unittest.mock import AsyncMock, patch
 from pytest import mark, fixture, raises
 
-pytestmark = [mark.cli, mark.unit, mark.cloudbender, mark.reservations]
+pytestmark = [mark.cli, mark.unit, mark.cloudbender, mark.services]
 
-from trainml.cli.cloudbender import reservation as specimen
-from trainml.cloudbender.reservations import Reservation
+from trainml.cli.cloudbender import service as specimen
+from trainml.cloudbender.services import Service
 
 
-def test_list(runner, mock_reservations):
+def test_list(runner, mock_services):
     with patch("trainml.cli.TrainML", new=AsyncMock) as mock_trainml:
         mock_trainml.cloudbender = AsyncMock()
-        mock_trainml.cloudbender.reservations = AsyncMock()
-        mock_trainml.cloudbender.reservations.list = AsyncMock(
-            return_value=mock_reservations
-        )
+        mock_trainml.cloudbender.services = AsyncMock()
+        mock_trainml.cloudbender.services.list = AsyncMock(return_value=mock_services)
         result = runner.invoke(
             specimen,
             args=["list", "--provider=prov-id-1", "--region=reg-id-1"],
         )
         assert result.exit_code == 0
-        mock_trainml.cloudbender.reservations.list.assert_called_once_with(
+        mock_trainml.cloudbender.services.list.assert_called_once_with(
             provider_uuid="prov-id-1", region_uuid="reg-id-1"
         )
 
 
-def test_list_no_provider(runner, mock_reservations):
+def test_list_no_provider(runner, mock_services):
     with patch("trainml.cli.TrainML", new=AsyncMock) as mock_trainml:
         mock_trainml.cloudbender = AsyncMock()
-        mock_trainml.cloudbender.reservations = AsyncMock()
-        mock_trainml.cloudbender.reservations.list = AsyncMock(
-            return_value=mock_reservations
-        )
+        mock_trainml.cloudbender.services = AsyncMock()
+        mock_trainml.cloudbender.services.list = AsyncMock(return_value=mock_services)
         result = runner.invoke(specimen, ["list"])
         assert result.exit_code != 0

tests/unit/cli/test_cli_project_unit.py

@@ -23,9 +23,7 @@ def test_list(runner, mock_projects):
 def test_list_datastores(runner, mock_project_datastores):
     with patch("trainml.cli.TrainML", new=AsyncMock) as mock_trainml:
         mock_project = create_autospec(Project)
-        mock_project.list_datastores = AsyncMock(
-            return_value=mock_project_datastores
-        )
+        mock_project.list_datastores = AsyncMock(return_value=mock_project_datastores)
         mock_trainml.projects.get = AsyncMock(return_value=mock_project)
         result = runner.invoke(specimen, ["list-datastores"])
         print(result)
@@ -33,14 +31,12 @@ def test_list_datastores(runner, mock_project_datastores):
         mock_project.list_datastores.assert_called_once()
 
 
-def test_list_reservations(runner, mock_project_reservations):
+def test_list_services(runner, mock_project_services):
     with patch("trainml.cli.TrainML", new=AsyncMock) as mock_trainml:
         mock_project = create_autospec(Project)
-        mock_project.list_reservations = AsyncMock(
-            return_value=mock_project_reservations
-        )
+        mock_project.list_services = AsyncMock(return_value=mock_project_services)
         mock_trainml.projects.get = AsyncMock(return_value=mock_project)
-        result = runner.invoke(specimen, ["list-reservations"])
+        result = runner.invoke(specimen, ["list-services"])
         print(result)
         assert result.exit_code == 0
-        mock_project.list_reservations.assert_called_once()
+        mock_project.list_services.assert_called_once()

tests/unit/cloudbender/test_services_unit.py

@@ -0,0 +1,161 @@
+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.cloudbender.services as specimen
+from trainml.exceptions import (
+    ApiError,
+    SpecificationError,
+    TrainMLException,
+)
+
+pytestmark = [mark.sdk, mark.unit, mark.cloudbender, mark.services]
+
+
+@fixture
+def services(mock_trainml):
+    yield specimen.Services(mock_trainml)
+
+
+@fixture
+def service(mock_trainml):
+    yield specimen.Service(
+        mock_trainml,
+        provider_uuid="1",
+        region_uuid="a",
+        service_id="x",
+        name="On-Prem Service",
+        public=False,
+        hostname="app1.proximl.cloud",
+    )
+
+
+class RegionsTests:
+    @mark.asyncio
+    async def test_get_service(
+        self,
+        services,
+        mock_trainml,
+    ):
+        api_response = dict()
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        await services.get("1234", "5687", "91011")
+        mock_trainml._query.assert_called_once_with(
+            "/provider/1234/region/5687/service/91011", "GET", {}
+        )
+
+    @mark.asyncio
+    async def test_list_services(
+        self,
+        services,
+        mock_trainml,
+    ):
+        api_response = dict()
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        await services.list("1234", "5687")
+        mock_trainml._query.assert_called_once_with(
+            "/provider/1234/region/5687/service", "GET", {}
+        )
+
+    @mark.asyncio
+    async def test_remove_service(
+        self,
+        services,
+        mock_trainml,
+    ):
+        api_response = dict()
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        await services.remove("1234", "4567", "8910")
+        mock_trainml._query.assert_called_once_with(
+            "/provider/1234/region/4567/service/8910", "DELETE", {}
+        )
+
+    @mark.asyncio
+    async def test_create_service(self, services, mock_trainml):
+        requested_config = dict(
+            provider_uuid="provider-id-1",
+            region_uuid="region-id-1",
+            name="On-Prem Service",
+            public=False,
+        )
+        expected_payload = dict(
+            name="On-Prem Service",
+            public=False,
+        )
+        api_response = {
+            "provider_uuid": "provider-id-1",
+            "region_uuid": "region-id-1",
+            "service_id": "service-id-1",
+            "name": "On-Prem Service",
+            "public": False,
+            "hostname": "app1.proximl.cloud",
+            "createdAt": "2020-12-31T23:59:59.000Z",
+        }
+
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        response = await services.create(**requested_config)
+        mock_trainml._query.assert_called_once_with(
+            "/provider/provider-id-1/region/region-id-1/service",
+            "POST",
+            None,
+            expected_payload,
+        )
+        assert response.id == "service-id-1"
+
+
+class serviceTests:
+    def test_service_properties(self, service):
+        assert isinstance(service.id, str)
+        assert isinstance(service.provider_uuid, str)
+        assert isinstance(service.region_uuid, str)
+        assert isinstance(service.public, bool)
+        assert isinstance(service.name, str)
+        assert isinstance(service.hostname, str)
+
+    def test_service_str(self, service):
+        string = str(service)
+        regex = r"^{.*\"service_id\": \"" + service.id + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    def test_service_repr(self, service):
+        string = repr(service)
+        regex = r"^Service\( trainml , \*\*{.*'service_id': '" + service.id + r"'.*}\)$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    def test_service_bool(self, service, mock_trainml):
+        empty_service = specimen.Service(mock_trainml)
+        assert bool(service)
+        assert not bool(empty_service)
+
+    @mark.asyncio
+    async def test_service_remove(self, service, mock_trainml):
+        api_response = dict()
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        await service.remove()
+        mock_trainml._query.assert_called_once_with(
+            "/provider/1/region/a/service/x", "DELETE"
+        )
+
+    @mark.asyncio
+    async def test_service_refresh(self, service, mock_trainml):
+        api_response = {
+            "provider_uuid": "provider-id-1",
+            "region_uuid": "region-id-1",
+            "service_id": "service-id-1",
+            "name": "On-Prem Service",
+            "public": False,
+            "hostname": "app1.proximl.cloud",
+            "createdAt": "2020-12-31T23:59:59.000Z",
+        }
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        response = await service.refresh()
+        mock_trainml._query.assert_called_once_with(
+            f"/provider/1/region/a/service/x", "GET"
+        )
+        assert service.id == "service-id-1"
+        assert response.id == "service-id-1"

tests/unit/conftest.py

@@ -17,7 +17,7 @@ from trainml.projects import (
     Projects,
     Project,
     ProjectDatastore,
-    ProjectReservation,
+    ProjectService,
 )
 from trainml.cloudbender import Cloudbender
 from trainml.cloudbender.providers import Provider, Providers
@@ -25,7 +25,7 @@ from trainml.cloudbender.regions import Region, Regions
 from trainml.cloudbender.nodes import Node, Nodes
 from trainml.cloudbender.devices import Device, Devices
 from trainml.cloudbender.datastores import Datastore, Datastores
-from trainml.cloudbender.reservations import Reservation, Reservations
+from trainml.cloudbender.services import Service, Services
 from trainml.cloudbender.device_configs import DeviceConfig, DeviceConfigs
 
 
@@ -887,27 +887,27 @@ def mock_project_datastores():
 
 
 @fixture(scope="session")
-def mock_reservations():
+def mock_services():
     trainml = Mock()
     yield [
-        Reservation(
+        Service(
             trainml,
             **{
                 "provider_uuid": "prov-id-1",
                 "region_uuid": "reg-id-1",
-                "reservation_id": "res-id-1",
+                "service_id": "res-id-1",
                 "type": "port",
                 "name": "On-Prem Service A",
                 "resource": "8001",
                 "hostname": "service-a.local",
             },
         ),
-        Reservation(
+        Service(
             trainml,
             **{
                 "provider_uuid": "prov-id-2",
                 "region_uuid": "reg-id-2",
-                "reservation_id": "res-id-2",
+                "service_id": "res-id-2",
                 "type": "port",
                 "name": "Cloud Service B",
                 "resource": "8001",
@@ -918,10 +918,10 @@ def mock_reservations():
 
 
 @fixture(scope="session")
-def mock_project_reservations():
+def mock_project_services():
     trainml = Mock()
     yield [
-        ProjectReservation(
+        ProjectService(
             trainml,
             **{
                 "project_uuid": "proj-id-1",
@@ -933,7 +933,7 @@ def mock_project_reservations():
                 "hostname": "service-a.local",
             },
         ),
-        ProjectReservation(
+        ProjectService(
             trainml,
             **{
                 "project_uuid": "proj-id-1",
@@ -990,7 +990,7 @@ def mock_trainml(
     mock_nodes,
     mock_devices,
     mock_datastores,
-    mock_reservations,
+    mock_services,
     mock_device_configs,
 ):
     trainml = create_autospec(TrainML)
@@ -1028,8 +1028,8 @@ def mock_trainml(
     trainml.cloudbender.devices.list = AsyncMock(return_value=mock_devices)
     trainml.cloudbender.datastores = create_autospec(Datastores)
     trainml.cloudbender.datastores.list = AsyncMock(return_value=mock_datastores)
-    trainml.cloudbender.reservations = create_autospec(Reservations)
-    trainml.cloudbender.reservations.list = AsyncMock(return_value=mock_reservations)
+    trainml.cloudbender.services = create_autospec(Services)
+    trainml.cloudbender.services.list = AsyncMock(return_value=mock_services)
     trainml.cloudbender.device_configs = create_autospec(DeviceConfigs)
     trainml.cloudbender.device_configs.list = AsyncMock(
         return_value=mock_device_configs

tests/unit/test_projects_unit.py

@@ -49,11 +49,11 @@ def project_datastore(mock_trainml):
 
 
 @fixture
-def project_reservation(mock_trainml):
-    yield specimen.ProjectReservation(
+def project_service(mock_trainml):
+    yield specimen.ProjectService(
         mock_trainml,
         id="res-id-1",
-        name="reservation 1",
+        name="service 1",
         project_uuid="proj-id-1",
         region_uuid="reg-id-1",
         type="port",
@@ -72,9 +72,7 @@ class ProjectsTests:
         api_response = dict()
         mock_trainml._query = AsyncMock(return_value=api_response)
         await projects.get("1234")
-        mock_trainml._query.assert_called_once_with(
-            "/project/1234", "GET", dict()
-        )
+        mock_trainml._query.assert_called_once_with("/project/1234", "GET", dict())
 
     @mark.asyncio
     async def test_list_projects(
@@ -96,9 +94,7 @@ class ProjectsTests:
         api_response = dict()
         mock_trainml._query = AsyncMock(return_value=api_response)
         await projects.remove("4567")
-        mock_trainml._query.assert_called_once_with(
-            "/project/4567", "DELETE", dict()
-        )
+        mock_trainml._query.assert_called_once_with("/project/4567", "DELETE", dict())
 
     @mark.asyncio
     async def test_create_project_simple(self, projects, mock_trainml):
@@ -156,36 +152,36 @@ class ProjectDatastoreTests:
         assert not bool(empty_project_datastore)
 
 
-class ProjectReservationTests:
-    def test_project_reservation_properties(self, project_reservation):
-        assert isinstance(project_reservation.id, str)
-        assert isinstance(project_reservation.name, str)
-        assert isinstance(project_reservation.project_uuid, str)
-        assert isinstance(project_reservation.type, str)
-        assert isinstance(project_reservation.hostname, str)
-        assert isinstance(project_reservation.resource, str)
-        assert isinstance(project_reservation.region_uuid, str)
+class ProjectServiceTests:
+    def test_project_service_properties(self, project_service):
+        assert isinstance(project_service.id, str)
+        assert isinstance(project_service.name, str)
+        assert isinstance(project_service.project_uuid, str)
+        assert isinstance(project_service.type, str)
+        assert isinstance(project_service.hostname, str)
+        assert isinstance(project_service.resource, str)
+        assert isinstance(project_service.region_uuid, str)
 
-    def test_project_reservation_str(self, project_reservation):
-        string = str(project_reservation)
-        regex = r"^{.*\"id\": \"" + project_reservation.id + r"\".*}$"
+    def test_project_service_str(self, project_service):
+        string = str(project_service)
+        regex = r"^{.*\"id\": \"" + project_service.id + r"\".*}$"
         assert isinstance(string, str)
         assert re.match(regex, string)
 
-    def test_project_reservation_repr(self, project_reservation):
-        string = repr(project_reservation)
+    def test_project_service_repr(self, project_service):
+        string = repr(project_service)
         regex = (
-            r"^ProjectReservation\( trainml , \*\*{.*'id': '"
-            + project_reservation.id
+            r"^ProjectService\( trainml , \*\*{.*'id': '"
+            + project_service.id
             + r"'.*}\)$"
         )
         assert isinstance(string, str)
         assert re.match(regex, string)
 
-    def test_project_reservation_bool(self, project_reservation, mock_trainml):
-        empty_project_reservation = specimen.ProjectReservation(mock_trainml)
-        assert bool(project_reservation)
-        assert not bool(empty_project_reservation)
+    def test_project_service_bool(self, project_service, mock_trainml):
+        empty_project_service = specimen.ProjectService(mock_trainml)
+        assert bool(project_service)
+        assert not bool(empty_project_service)
 
 
 class ProjectTests:
@@ -203,9 +199,7 @@ class ProjectTests:
 
     def test_project_repr(self, project):
         string = repr(project)
-        regex = (
-            r"^Project\( trainml , \*\*{.*'id': '" + project.id + r"'.*}\)$"
-        )
+        regex = r"^Project\( trainml , \*\*{.*'id': '" + project.id + r"'.*}\)$"
         assert isinstance(string, str)
         assert re.match(regex, string)
 
@@ -226,18 +220,14 @@ class ProjectTests:
         api_response = dict()
         mock_trainml._query = AsyncMock(return_value=api_response)
         await project.refresh_datastores()
-        mock_trainml._query.assert_called_once_with(
-            "/project/1/datastores", "PATCH"
-        )
+        mock_trainml._query.assert_called_once_with("/project/1/datastores", "PATCH")
 
     @mark.asyncio
-    async def test_project_refresh_reservations(self, project, mock_trainml):
+    async def test_project_refresh_services(self, project, mock_trainml):
         api_response = dict()
         mock_trainml._query = AsyncMock(return_value=api_response)
-        await project.refresh_reservations()
-        mock_trainml._query.assert_called_once_with(
-            "/project/1/reservations", "PATCH"
-        )
+        await project.refresh_services()
+        mock_trainml._query.assert_called_once_with("/project/1/services", "PATCH")
 
     @mark.asyncio
     async def test_project_list_datastores(self, project, mock_trainml):
@@ -259,13 +249,11 @@ class ProjectTests:
         ]
         mock_trainml._query = AsyncMock(return_value=api_response)
         resp = await project.list_datastores()
-        mock_trainml._query.assert_called_once_with(
-            "/project/1/datastores", "GET"
-        )
+        mock_trainml._query.assert_called_once_with("/project/1/datastores", "GET")
         assert len(resp) == 2
 
     @mark.asyncio
-    async def test_project_list_reservations(self, project, mock_trainml):
+    async def test_project_list_services(self, project, mock_trainml):
         api_response = [
             {
                 "project_uuid": "proj-id-1",
@@ -287,8 +275,6 @@ class ProjectTests:
             },
         ]
         mock_trainml._query = AsyncMock(return_value=api_response)
-        resp = await project.list_reservations()
-        mock_trainml._query.assert_called_once_with(
-            "/project/1/reservations", "GET"
-        )
+        resp = await project.list_services()
+        mock_trainml._query.assert_called_once_with("/project/1/services", "GET")
         assert len(resp) == 2

trainml/__init__.py

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

trainml/cli/cloudbender/__init__.py

@@ -15,4 +15,4 @@ from trainml.cli.cloudbender.region import region
 from trainml.cli.cloudbender.node import node
 from trainml.cli.cloudbender.device import device
 from trainml.cli.cloudbender.datastore import datastore
-from trainml.cli.cloudbender.reservation import reservation
+from trainml.cli.cloudbender.service import service

trainml/cli/cloudbender/service.py

@@ -0,0 +1,129 @@
+import click
+from trainml.cli import cli, pass_config, search_by_id_name
+from trainml.cli.cloudbender import cloudbender
+
+
+@cloudbender.group()
+@pass_config
+def service(config):
+    """trainML CloudBender service commands."""
+    pass
+
+
+@service.command()
+@click.option(
+    "--provider",
+    "-p",
+    type=click.STRING,
+    required=True,
+    help="The provider ID of the region.",
+)
+@click.option(
+    "--region",
+    "-r",
+    type=click.STRING,
+    required=True,
+    help="The region ID to list services for.",
+)
+@pass_config
+def list(config, provider, region):
+    """List services."""
+    data = [
+        ["ID", "NAME", "HOSTNAME"],
+        [
+            "-" * 80,
+            "-" * 80,
+            "-" * 80,
+        ],
+    ]
+
+    services = config.trainml.run(
+        config.trainml.client.cloudbender.services.list(
+            provider_uuid=provider, region_uuid=region
+        )
+    )
+
+    for service in services:
+        data.append(
+            [
+                service.id,
+                service.name,
+                service.hostname,
+            ]
+        )
+
+    for row in data:
+        click.echo(
+            "{: >25.24} {: >29.28} {: >40.39}" "".format(*row),
+            file=config.stdout,
+        )
+
+
+@service.command()
+@click.option(
+    "--provider",
+    "-p",
+    type=click.STRING,
+    required=True,
+    help="The provider ID of the region.",
+)
+@click.option(
+    "--region",
+    "-r",
+    type=click.STRING,
+    required=True,
+    help="The region ID to create the service in.",
+)
+@click.option(
+    "--public/--no-public",
+    default=True,
+    show_default=True,
+    help="Service should be accessible from the public internet.",
+)
+@click.argument("name", type=click.STRING, required=True)
+@pass_config
+def create(config, provider, region, public, name):
+    """
+    Creates a service.
+    """
+    return config.trainml.run(
+        config.trainml.client.cloudbender.services.create(
+            provider_uuid=provider, region_uuid=region, name=name, public=public
+        )
+    )
+
+
+@service.command()
+@click.option(
+    "--provider",
+    "-p",
+    type=click.STRING,
+    required=True,
+    help="The provider ID of the region.",
+)
+@click.option(
+    "--region",
+    "-r",
+    type=click.STRING,
+    required=True,
+    help="The region ID to remove the service from.",
+)
+@click.argument("service", type=click.STRING)
+@pass_config
+def remove(config, provider, region, service):
+    """
+    Remove a service.
+
+    RESERVATION may be specified by name or ID, but ID is preferred.
+    """
+    services = config.trainml.run(
+        config.trainml.client.cloudbender.services.list(
+            provider_uuid=provider, region_uuid=region
+        )
+    )
+
+    found = search_by_id_name(service, services)
+    if None is found:
+        raise click.UsageError("Cannot find specified service.")
+
+    return config.trainml.run(found.remove())

trainml/cli/project.py

@@ -115,40 +115,35 @@ def list_datastores(config):
 
 @project.command()
 @pass_config
-def list_reservations(config):
-    """List project reservations."""
+def list_services(config):
+    """List project services."""
     data = [
-        ["ID", "NAME", "TYPE", "RESOURCE", "HOSTNAME", "REGION_UUID"],
+        ["ID", "NAME", "HOSTNAME", "REGION_UUID"],
         [
             "-" * 80,
             "-" * 80,
             "-" * 80,
             "-" * 80,
-            "-" * 80,
-            "-" * 80,
         ],
     ]
     project = config.trainml.run(
         config.trainml.client.projects.get(config.trainml.client.project)
     )
 
-    reservations = config.trainml.run(project.list_reservations())
+    services = config.trainml.run(project.list_services())
 
-    for reservation in reservations:
+    for service in services:
         data.append(
             [
-                reservation.id,
-                reservation.name,
-                reservation.type,
-                reservation.resource,
-                reservation.hostname,
-                reservation.region_uuid,
+                service.id,
+                service.name,
+                service.hostname,
+                service.region_uuid,
             ]
         )
 
     for row in data:
         click.echo(
-            "{: >38.36} {: >30.28} {: >8.6} {: >15.13} {: >30.28} {: >38.36}"
-            "".format(*row),
+            "{: >38.36} {: >30.28} {: >30.28} {: >38.36}" "".format(*row),
             file=config.stdout,
         )

trainml/cloudbender/cloudbender.py

@@ -3,7 +3,7 @@ from .regions import Regions
 from .nodes import Nodes
 from .devices import Devices
 from .datastores import Datastores
-from .reservations import Reservations
+from .services import Services
 from .device_configs import DeviceConfigs
 
 
@@ -15,5 +15,5 @@ class Cloudbender(object):
         self.nodes = Nodes(trainml)
         self.devices = Devices(trainml)
         self.datastores = Datastores(trainml)
-        self.reservations = Reservations(trainml)
+        self.services = Services(trainml)
         self.device_configs = DeviceConfigs(trainml)

trainml/cloudbender/services.py

@@ -0,0 +1,115 @@
+import json
+import logging
+
+
+class Services(object):
+    def __init__(self, trainml):
+        self.trainml = trainml
+
+    async def get(self, provider_uuid, region_uuid, id, **kwargs):
+        resp = await self.trainml._query(
+            f"/provider/{provider_uuid}/region/{region_uuid}/service/{id}",
+            "GET",
+            kwargs,
+        )
+        return Service(self.trainml, **resp)
+
+    async def list(self, provider_uuid, region_uuid, **kwargs):
+        resp = await self.trainml._query(
+            f"/provider/{provider_uuid}/region/{region_uuid}/service",
+            "GET",
+            kwargs,
+        )
+        services = [Service(self.trainml, **service) for service in resp]
+        return services
+
+    async def create(
+        self,
+        provider_uuid,
+        region_uuid,
+        name,
+        public,
+        **kwargs,
+    ):
+        logging.info(f"Creating Service {name}")
+        data = dict(
+            name=name,
+            public=public,
+            **kwargs,
+        )
+        payload = {k: v for k, v in data.items() if v is not None}
+        resp = await self.trainml._query(
+            f"/provider/{provider_uuid}/region/{region_uuid}/service",
+            "POST",
+            None,
+            payload,
+        )
+        service = Service(self.trainml, **resp)
+        logging.info(f"Created Service {name} with id {service.id}")
+        return service
+
+    async def remove(self, provider_uuid, region_uuid, id, **kwargs):
+        await self.trainml._query(
+            f"/provider/{provider_uuid}/region/{region_uuid}/service/{id}",
+            "DELETE",
+            kwargs,
+        )
+
+
+class Service:
+    def __init__(self, trainml, **kwargs):
+        self.trainml = trainml
+        self._service = kwargs
+        self._id = self._service.get("service_id")
+        self._provider_uuid = self._service.get("provider_uuid")
+        self._region_uuid = self._service.get("region_uuid")
+        self._public = self._service.get("public")
+        self._name = self._service.get("name")
+        self._hostname = self._service.get("hostname")
+
+    @property
+    def id(self) -> str:
+        return self._id
+
+    @property
+    def provider_uuid(self) -> str:
+        return self._provider_uuid
+
+    @property
+    def region_uuid(self) -> str:
+        return self._region_uuid
+
+    @property
+    def public(self) -> bool:
+        return self._public
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    @property
+    def hostname(self) -> str:
+        return self._hostname
+
+    def __str__(self):
+        return json.dumps({k: v for k, v in self._service.items()})
+
+    def __repr__(self):
+        return f"Service( trainml , **{self._service.__repr__()})"
+
+    def __bool__(self):
+        return bool(self._id)
+
+    async def remove(self):
+        await self.trainml._query(
+            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/service/{self._id}",
+            "DELETE",
+        )
+
+    async def refresh(self):
+        resp = await self.trainml._query(
+            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/service/{self._id}",
+            "GET",
+        )
+        self.__init__(self.trainml, **resp)
+        return self

trainml/projects.py

@@ -72,17 +72,17 @@ class ProjectDatastore:
         return bool(self._id)
 
 
-class ProjectReservation:
+class ProjectService:
     def __init__(self, trainml, **kwargs):
         self.trainml = trainml
-        self._reservation = kwargs
-        self._id = self._reservation.get("id")
-        self._project_uuid = self._reservation.get("project_uuid")
-        self._name = self._reservation.get("name")
-        self._type = self._reservation.get("type")
-        self._hostname = self._reservation.get("hostname")
-        self._resource = self._reservation.get("resource")
-        self._region_uuid = self._reservation.get("region_uuid")
+        self._service = kwargs
+        self._id = self._service.get("id")
+        self._project_uuid = self._service.get("project_uuid")
+        self._name = self._service.get("name")
+        self._type = self._service.get("type")
+        self._hostname = self._service.get("hostname")
+        self._resource = self._service.get("resource")
+        self._region_uuid = self._service.get("region_uuid")
 
     @property
     def id(self) -> str:
@@ -113,12 +113,10 @@ class ProjectReservation:
         return self._region_uuid
 
     def __str__(self):
-        return json.dumps({k: v for k, v in self._reservation.items()})
+        return json.dumps({k: v for k, v in self._service.items()})
 
     def __repr__(self):
-        return (
-            f"ProjectReservation( trainml , **{self._reservation.__repr__()})"
-        )
+        return f"ProjectService( trainml , **{self._service.__repr__()})"
 
     def __bool__(self):
         return bool(self._id)
@@ -162,26 +160,17 @@ class Project:
         await self.trainml._query(f"/project/{self._id}", "DELETE")
 
     async def list_datastores(self):
-        resp = await self.trainml._query(
-            f"/project/{self._id}/datastores", "GET"
-        )
-        datastores = [
-            ProjectDatastore(self.trainml, **datastore) for datastore in resp
-        ]
+        resp = await self.trainml._query(f"/project/{self._id}/datastores", "GET")
+        datastores = [ProjectDatastore(self.trainml, **datastore) for datastore in resp]
         return datastores
 
-    async def list_reservations(self):
-        resp = await self.trainml._query(
-            f"/project/{self._id}/reservations", "GET"
-        )
-        reservations = [
-            ProjectReservation(self.trainml, **reservation)
-            for reservation in resp
-        ]
-        return reservations
+    async def list_services(self):
+        resp = await self.trainml._query(f"/project/{self._id}/services", "GET")
+        services = [ProjectService(self.trainml, **service) for service in resp]
+        return services
 
     async def refresh_datastores(self):
         await self.trainml._query(f"/project/{self._id}/datastores", "PATCH")
 
-    async def refresh_reservations(self):
-        await self.trainml._query(f"/project/{self._id}/reservations", "PATCH")
+    async def refresh_services(self):
+        await self.trainml._query(f"/project/{self._id}/services", "PATCH")

{trainml-0.5.5.dist-info → trainml-0.5.6.dist-info}/METADATA

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

{trainml-0.5.5.dist-info → trainml-0.5.6.dist-info}/RECORD

@@ -15,7 +15,7 @@ tests/integration/test_volumes_integration.py,sha256=gOmZpwwFxqeOAVmfKWSTmuyshx8
 tests/integration/cloudbender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/integration/cloudbender/test_providers_integration.py,sha256=oV8ydFsosDZ_Z1Dkg2IN-ZhWuIl5e_HkHAORMsOsAJc,1473
 tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/unit/conftest.py,sha256=fbID1lG1FZ-bywEjM7kEriyN_SUqPasRJVIhIqqsf98,31197
+tests/unit/conftest.py,sha256=QW9K3c-rEB8epqOW0tUwTGqcfJv14AW0ovLNqdstpAc,31129
 tests/unit/test_auth.py,sha256=nfhlOCR7rUsn_MaD8QQtBc2v0k8pIxqbzGgRAZK1WGc,858
 tests/unit/test_checkpoints_unit.py,sha256=4Add2DXZCuriSZ0atvOXc8fsEGMaEfPhYmT8Q3UgP5E,16008
 tests/unit/test_connections_unit.py,sha256=FzN2ddQxNpjxzNGUsXhjTk0HnD24wSPelPTL4o_r-Ho,5507
@@ -25,7 +25,7 @@ tests/unit/test_exceptions.py,sha256=3tAok6kAU1QRjN7qTNVYuSGWDg7IEoK__OXFLyzLr7k
 tests/unit/test_gpu_types_unit.py,sha256=c9ie6YSYT5onBnlmHvHWON9WgQiJ1eO2C-4Tk-UPQHg,2054
 tests/unit/test_jobs_unit.py,sha256=bZxN9HUfHCyQCjZCZGn6WFIhu8S5FU1z5ZG9sgH2XEg,26835
 tests/unit/test_models_unit.py,sha256=uezWF7FUHGmCSQBtpyyKhBttTnCTRjxU22NsHdJLYYg,15064
-tests/unit/test_projects_unit.py,sha256=iyqYntMj1UivqpL8GUnJeX2p4m9coEG8qL4c0iSfCCA,9530
+tests/unit/test_projects_unit.py,sha256=V7PvCFiXoWI_3dyGJnruBzNbNsolBHdUpaR_1XtHmzI,9238
 tests/unit/test_trainml.py,sha256=8vAKvFD1xYsx_VY4HFVa0b1MUlMoNApY6TO8r7vI-UQ,1701
 tests/unit/test_volumes_unit.py,sha256=KHVmdbQIiX8tEE09U-XsH-vl6wfYGVoRzR_UQJlhOVE,15305
 tests/unit/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -36,7 +36,7 @@ tests/unit/cli/test_cli_environment_unit.py,sha256=7FFKFPVa6yqJqujTXD_tsSUDruW5K
 tests/unit/cli/test_cli_gpu_unit.py,sha256=FIq3tQIDmeD-pvxkhJKMykfnlWcVxho2vRkoCMXgQxE,650
 tests/unit/cli/test_cli_job_unit.py,sha256=xUqkLFDIyI1ExiVVgr-218gQSlFSYCm4RRX_eyipJhY,611
 tests/unit/cli/test_cli_model_unit.py,sha256=fE-CRVg8gbtDlwrKBkf-hc9x7EhFlYeE3jlum1E27EA,629
-tests/unit/cli/test_cli_project_unit.py,sha256=1tEfwXJqnac41bDtvYcN_gpScnb4UY6s5dHfTl-0YoQ,1756
+tests/unit/cli/test_cli_project_unit.py,sha256=pi0N-XVH5wsJQ6idFcRsIofWSAdj8KtK1gwf1J3l2JY,1688
 tests/unit/cli/test_cli_volume_unit.py,sha256=oggGL2eLiaExP6rSdFmQevxLp6nw5o7SKUEqMKBmy_A,644
 tests/unit/cli/cloudbender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/cli/cloudbender/test_cli_datastore_unit.py,sha256=DQWDjqg4viBZRONi00nVzqF9rJ5qKOKRub9pKbTmMWU,1381
@@ -44,7 +44,7 @@ tests/unit/cli/cloudbender/test_cli_device_unit.py,sha256=2BSMyXQ8fOzNKh_-pa_tx7
 tests/unit/cli/cloudbender/test_cli_node_unit.py,sha256=KbK7axJ1L4y4sN7KQRpOVIqphnNpi0aFW4-HlYLtwnI,1316
 tests/unit/cli/cloudbender/test_cli_provider_unit.py,sha256=Rm-tRNPbTTB7ZzkkIpLfDp_pEYfqihjB0ZYk_EPQUfs,781
 tests/unit/cli/cloudbender/test_cli_region_unit.py,sha256=iH5AbrzZ-R2EJ-Bd2HFN7FN2lTpkr3-pCLR59ZVvdQU,1262
-tests/unit/cli/cloudbender/test_cli_reservation_unit.py,sha256=9y4FhcUwti7OzKYaJ23YAgOpx-dBIYj_0i--xaIk8YU,1407
+tests/unit/cli/cloudbender/test_cli_reservation_unit.py,sha256=4LDOJDXygMuho2cdI2K59eq4oyiry9hNaG0avEr0_tw,1311
 tests/unit/cloudbender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/cloudbender/test_datastores_unit.py,sha256=54mPokxhrRjlkBfqpmeA_q-PLml-HUNNit91aQVTpCg,5398
 tests/unit/cloudbender/test_device_configs_unit.py,sha256=lzyCuF7MRoQrtJVTQFL27lqPnRwQFv25htPgJqDuQI8,5714
@@ -53,7 +53,8 @@ tests/unit/cloudbender/test_nodes_unit.py,sha256=BDpfJXCBNNpLt5rhJMk2BVXDQ_4QSmx
 tests/unit/cloudbender/test_providers_unit.py,sha256=OgxifgC1IqLH8DNMKXy1Ne9_7a75ea6kHEOfRSRoQuQ,4373
 tests/unit/cloudbender/test_regions_unit.py,sha256=BbJICLIQmlotpA1UmLD0KTW_H9g2UW0J8ZYzQk1_Xjc,6299
 tests/unit/cloudbender/test_reservations_unit.py,sha256=nWEZ_p9EF2C49nbgL7Dt4NG2Irmyt94ZqJJQDyNfGFI,5624
-trainml/__init__.py,sha256=ZVeJu_28DU8_PtbnRLowX5jQ6IxkuYUpQHov-bC8Bt0,432
+tests/unit/cloudbender/test_services_unit.py,sha256=zhYfCHSaWN6GzLTmt3RuXZCr2bZjptUEakzE4UK4Rw4,5043
+trainml/__init__.py,sha256=VWx1-OcS6OKjpjgZwXYaDSluXSUTDqT-xV9rj07ufnc,432
 trainml/__main__.py,sha256=JgErYkiskih8Y6oRwowALtR-rwQhAAdqOYWjQraRIPI,59
 trainml/auth.py,sha256=gruZv27nhttrCbhcVQTH9kZkF2uMm1E06SwA_2pQAHQ,26565
 trainml/checkpoints.py,sha256=726yaeTHzIPvkQ-BhqmvJ6u0s1Oh732N6UAFbuWEv0Q,8274
@@ -64,7 +65,7 @@ trainml/exceptions.py,sha256=MG1FkcjRacv3HoPuBS1IWLCUk0wGHEQ6DaOzXNymsNI,4094
 trainml/gpu_types.py,sha256=mm-dwfYc02192bmYPIJmzesndyBcoOdkKYBaYZXOUwU,1901
 trainml/jobs.py,sha256=iuSKkZDK908K0JwZjSbEk1G6IzdKp7vGkXsAUfih6R8,17838
 trainml/models.py,sha256=Lqs3OJMuOZXx8cfGFNC3JZ8nVK6l9_jU1xM1Uw1c5UQ,7750
-trainml/projects.py,sha256=Jk-0xhEgBFPIVMAK_Szxp3B-h-tJJSIEtTF8JWAYzo8,5209
+trainml/projects.py,sha256=11as6-XwSabaWrkVc7UqnT2izJYDbp6BdcOdgr3z3Dc,5001
 trainml/trainml.py,sha256=EBnqQ3Q291xrPKYuN6xKm5yt0mJQOJ3b7GAlR-fl8NI,10864
 trainml/volumes.py,sha256=x4_QLPnPCuqEWR9FjwotCVPYFhdiZuWjp4tKKEU-Ne4,8094
 trainml/cli/__init__.py,sha256=Gvj6oGSEtgpb40ACtiVeMD93GM-uy15MG6VlX6rwdwA,4346
@@ -74,19 +75,20 @@ trainml/cli/dataset.py,sha256=Pc00M6t7hGoRzCxznmmkijsWhG4PhIfG7UkrwtwykTY,6871
 trainml/cli/environment.py,sha256=dfm_T8OlCM5M8dLyOQBapJl3eFuVIku2P4JO6V0cYVQ,1019
 trainml/cli/gpu.py,sha256=CMcQyl2qbUgc2bc-gvUVT6X7bq2-sgiCHl3hyZ6kFWM,883
 trainml/cli/model.py,sha256=hR23E6ttRXcLk-RofkPK6wUXMO7OU6sT6jTEHTmUg9Q,6111
-trainml/cli/project.py,sha256=iar4-Aic6k0O6HWfxB5vJ5EtjS4aAaw2g8wW7H-3Bjk,3522
+trainml/cli/project.py,sha256=f772bHs68AVRY60l7dbVKgeDmDC3u2bZjqrz7zm7xvQ,3314
 trainml/cli/volume.py,sha256=kDUss93N78DT-YlLjC6I3jEq5nBWfRNNR5M4tY_F_Zg,6246
-trainml/cli/cloudbender/__init__.py,sha256=ewat7I7PvHQEW0a8zuky28kuMwtjL-gFQOAQmG0mmJA,534
+trainml/cli/cloudbender/__init__.py,sha256=mnHLTfXv3yxgk77rhq9ie7BAkLpXqc3hPlCkOxVfIQ4,526
 trainml/cli/cloudbender/datastore.py,sha256=gJ-comfAq65uiPoONQ35UIDLNVN7QKMf3l_2EcTN6zY,3478
 trainml/cli/cloudbender/device.py,sha256=KGZCFwwvS4tWsWuudrhlvquu_IFtV7LCUAOmCajicic,3453
 trainml/cli/cloudbender/node.py,sha256=iN_WaPCxOhtgDtnSsIFAEMGADG4MKiLjWoez6YSYwZI,3843
 trainml/cli/cloudbender/provider.py,sha256=oFjZWKfFQjNY7OtDu7nUdfv-RTmQc_Huuug963D3BdA,1726
 trainml/cli/cloudbender/region.py,sha256=X6-FYOb-pGpOEazn-NbsYSwa9ergB7FGATFkTe4a8Pk,2892
 trainml/cli/cloudbender/reservation.py,sha256=z2oMYwp-w_Keo1DepKUtuRnwiGz2VscVHDYWEFap1gs,3569
+trainml/cli/cloudbender/service.py,sha256=lHTYkUUtFMtrGgaAPoGAHaRtJq5HuwRKapx5PEl_Slk,2869
 trainml/cli/job/__init__.py,sha256=ljY-ELeXhXQ7txASbJEKGBom7OXfNyy7sWILz3nxRAE,6545
 trainml/cli/job/create.py,sha256=pfOCqs5Vfk4PAI5KZpXHJ1vp3DDe4ccvYzieh0oFexY,34288
 trainml/cloudbender/__init__.py,sha256=iE29obtC0_9f0IhRvHQcG5aY58fVhVYipTakpjAhdss,64
-trainml/cloudbender/cloudbender.py,sha256=rAc93mtMaa3tWLi-NT4tiqO664MCPkhlGG9oNYSmimQ,634
+trainml/cloudbender/cloudbender.py,sha256=7qIClWo5uvXm8U_u0_nrs7rNUIegyj9QzvktX10HxSE,618
 trainml/cloudbender/datastores.py,sha256=biVGifedc3r1DcuxsfCQh-f1Tw4HcJMMJfdgHxPfkKM,3506
 trainml/cloudbender/device_configs.py,sha256=DJWiGFaOE4C4xLE1BLDAiEjeL4T00R3FA_pb1xnSOr4,3399
 trainml/cloudbender/devices.py,sha256=QORNmKdLJoqGZmeWXRnivC1JmNBIw-ebvf4bsoem3r8,5660
@@ -94,9 +96,10 @@ trainml/cloudbender/nodes.py,sha256=7HV2VLmxiUcJ-Kc6AAXS3M8C_XO-HKmaVgJpPdVnBQk,
 trainml/cloudbender/providers.py,sha256=-gkdiTu6Ah2znUuyyc3ZuRALagW8s1-OgqVjtlvc1AU,2036
 trainml/cloudbender/regions.py,sha256=Aqc_MeLVAeEv21e-lR5u8x1eintqUhZT2DBiQG3AcEE,3570
 trainml/cloudbender/reservations.py,sha256=rOrGXWIUHON4ad2aufEcvK4Yv_Mv3dDoScUtLJE8LWw,3586
-trainml-0.5.5.dist-info/LICENSE,sha256=s0lpBxhSSUEpMavwde-Vb6K_K7xDCTTvSpNznVqVGR0,1069
-trainml-0.5.5.dist-info/METADATA,sha256=1yX0kzexWk9MrF3vMdP87PRTbmV34UgsgF-zV-MHAg4,7345
-trainml-0.5.5.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-trainml-0.5.5.dist-info/entry_points.txt,sha256=OzBDm2wXby1bSGF02jTVxzRFZLejnbFiLHXhKdW3Bds,63
-trainml-0.5.5.dist-info/top_level.txt,sha256=Y1kLFRWKUW7RG8BX7cvejHF_yW8wBOaRYF1JQHENY4w,23
-trainml-0.5.5.dist-info/RECORD,,
+trainml/cloudbender/services.py,sha256=mXCdXwWgV1uhPQ05e0qwnqUBrx3gM4sdCnIiiK4j9Ic,3222
+trainml-0.5.6.dist-info/LICENSE,sha256=s0lpBxhSSUEpMavwde-Vb6K_K7xDCTTvSpNznVqVGR0,1069
+trainml-0.5.6.dist-info/METADATA,sha256=TziEO1YevXuR39PH2doZ1rho_6HYgiPUCm0oKXunemU,7345
+trainml-0.5.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+trainml-0.5.6.dist-info/entry_points.txt,sha256=OzBDm2wXby1bSGF02jTVxzRFZLejnbFiLHXhKdW3Bds,63
+trainml-0.5.6.dist-info/top_level.txt,sha256=Y1kLFRWKUW7RG8BX7cvejHF_yW8wBOaRYF1JQHENY4w,23
+trainml-0.5.6.dist-info/RECORD,,