trainml 0.5.5__tar.gz → 0.5.7__tar.gz

{trainml-0.5.5/trainml.egg-info → trainml-0.5.7}/PKG-INFO

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

{trainml-0.5.5 → trainml-0.5.7}/pyproject.toml

@@ -21,7 +21,8 @@ markers = [
     "nodes: Nodes tests",
     "devices: Devices tests",
     "datastores: Datastores tests",
-    "reservations: Reservations tests",
+    "data_connectors: Data Connector tests",
+    "services: Services tests",
     "device_configs: DeviceConfigs tests",
     "unit: All unit tests (no trainML environment required)",
     "integration: All integration tests (trainML environment required)",

{trainml-0.5.5 → trainml-0.5.7}/tests/integration/test_jobs_integration.py

@@ -6,10 +6,19 @@ import asyncio
 import aiohttp
 from pytest import mark, fixture, raises
 from trainml.exceptions import ApiError
+from urllib.parse import urlparse
 
 pytestmark = [mark.sdk, mark.integration, mark.jobs]
 
 
+def extract_domain_suffix(hostname):
+    parts = hostname.split(".")
+    if len(parts) >= 2:
+        return ".".join(parts[-2:])
+    else:
+        return None
+
+
 @fixture(scope="class")
 async def job(trainml):
     job = await trainml.jobs.create(
@@ -34,6 +43,8 @@ class JobLifeCycleTests:
         assert job.status != "running"
         job = await job.wait_for("running")
         assert job.status == "running"
+        assert job.url
+        assert extract_domain_suffix(urlparse(job.url).hostname) == "proximl.cloud"
 
     async def test_stop_job(self, job):
         assert job.status == "running"
@@ -518,6 +529,7 @@ class JobIOTests:
 @mark.asyncio
 class JobTypeTests:
     async def test_endpoint(self, trainml):
+
         job = await trainml.jobs.create(
             "CLI Automated Tests - Endpoint",
             type="endpoint",
@@ -544,6 +556,7 @@ class JobTypeTests:
         await job.wait_for("running")
         await job.refresh()
         assert job.url
+        assert extract_domain_suffix(urlparse(job.url).hostname) == "proximl.cloud"
         tries = 0
         await asyncio.sleep(30)
         async with aiohttp.ClientSession() as session:

trainml-0.5.7/tests/unit/cli/cloudbender/test_cli_service_unit.py

@@ -0,0 +1,34 @@
+import re
+import json
+import click
+from unittest.mock import AsyncMock, patch
+from pytest import mark, fixture, raises
+
+pytestmark = [mark.cli, mark.unit, mark.cloudbender, mark.services]
+
+from trainml.cli.cloudbender import service as specimen
+from trainml.cloudbender.services import Service
+
+
+def test_list(runner, mock_services):
+    with patch("trainml.cli.TrainML", new=AsyncMock) as mock_trainml:
+        mock_trainml.cloudbender = AsyncMock()
+        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.services.list.assert_called_once_with(
+            provider_uuid="prov-id-1", region_uuid="reg-id-1"
+        )
+
+
+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.services = AsyncMock()
+        mock_trainml.cloudbender.services.list = AsyncMock(return_value=mock_services)
+        result = runner.invoke(specimen, ["list"])
+        assert result.exit_code != 0

{trainml-0.5.5 → trainml-0.5.7}/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()

trainml-0.5.7/tests/unit/cloudbender/test_data_connectors_unit.py

@@ -0,0 +1,176 @@
+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.data_connectors as specimen
+from trainml.exceptions import (
+    ApiError,
+    SpecificationError,
+    TrainMLException,
+)
+
+pytestmark = [mark.sdk, mark.unit, mark.cloudbender, mark.data_connectors]
+
+
+@fixture
+def data_connectors(mock_trainml):
+    yield specimen.DataConnectors(mock_trainml)
+
+
+@fixture
+def data_connector(mock_trainml):
+    yield specimen.DataConnector(
+        mock_trainml,
+        provider_uuid="1",
+        region_uuid="a",
+        connector_id="x",
+        name="On-Prem Data Connector",
+        type="custom",
+        cidr="192.168.0.50/32",
+        port="443",
+        protocol="tcp",
+    )
+
+
+class RegionsTests:
+    @mark.asyncio
+    async def test_get_data_connector(
+        self,
+        data_connectors,
+        mock_trainml,
+    ):
+        api_response = dict()
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        await data_connectors.get("1234", "5687", "91011")
+        mock_trainml._query.assert_called_once_with(
+            "/provider/1234/region/5687/data_connector/91011", "GET", {}
+        )
+
+    @mark.asyncio
+    async def test_list_data_connectors(
+        self,
+        data_connectors,
+        mock_trainml,
+    ):
+        api_response = dict()
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        await data_connectors.list("1234", "5687")
+        mock_trainml._query.assert_called_once_with(
+            "/provider/1234/region/5687/data_connector", "GET", {}
+        )
+
+    @mark.asyncio
+    async def test_remove_data_connector(
+        self,
+        data_connectors,
+        mock_trainml,
+    ):
+        api_response = dict()
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        await data_connectors.remove("1234", "4567", "8910")
+        mock_trainml._query.assert_called_once_with(
+            "/provider/1234/region/4567/data_connector/8910", "DELETE", {}
+        )
+
+    @mark.asyncio
+    async def test_create_data_connector(self, data_connectors, mock_trainml):
+        requested_config = dict(
+            provider_uuid="provider-id-1",
+            region_uuid="region-id-1",
+            name="On-Prem DataConnector",
+            type="custom",
+            cidr="192.168.0.50/32",
+            port="443",
+            protocol="tcp",
+        )
+        expected_payload = dict(
+            name="On-Prem DataConnector",
+            type="custom",
+            cidr="192.168.0.50/32",
+            port="443",
+            protocol="tcp",
+        )
+        api_response = {
+            "provider_uuid": "provider-id-1",
+            "region_uuid": "region-id-1",
+            "connector_id": "connector-id-1",
+            "name": "On-Prem DataConnector",
+            "type": "custom",
+            "cidr": "192.168.0.50/32",
+            "port": "443",
+            "protocol": "tcp",
+            "createdAt": "2020-12-31T23:59:59.000Z",
+        }
+
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        response = await data_connectors.create(**requested_config)
+        mock_trainml._query.assert_called_once_with(
+            "/provider/provider-id-1/region/region-id-1/data_connector",
+            "POST",
+            None,
+            expected_payload,
+        )
+        assert response.id == "connector-id-1"
+
+
+class DataConnectorTests:
+    def test_data_connector_properties(self, data_connector):
+        assert isinstance(data_connector.id, str)
+        assert isinstance(data_connector.provider_uuid, str)
+        assert isinstance(data_connector.region_uuid, str)
+        assert isinstance(data_connector.type, str)
+        assert isinstance(data_connector.name, str)
+
+    def test_data_connector_str(self, data_connector):
+        string = str(data_connector)
+        regex = r"^{.*\"connector_id\": \"" + data_connector.id + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    def test_data_connector_repr(self, data_connector):
+        string = repr(data_connector)
+        regex = (
+            r"^DataConnector\( trainml , \*\*{.*'connector_id': '"
+            + data_connector.id
+            + r"'.*}\)$"
+        )
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    def test_data_connector_bool(self, data_connector, mock_trainml):
+        empty_data_connector = specimen.DataConnector(mock_trainml)
+        assert bool(data_connector)
+        assert not bool(empty_data_connector)
+
+    @mark.asyncio
+    async def test_data_connector_remove(self, data_connector, mock_trainml):
+        api_response = dict()
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        await data_connector.remove()
+        mock_trainml._query.assert_called_once_with(
+            "/provider/1/region/a/data_connector/x", "DELETE"
+        )
+
+    @mark.asyncio
+    async def test_data_connector_refresh(self, data_connector, mock_trainml):
+        api_response = {
+            "provider_uuid": "provider-id-1",
+            "region_uuid": "region-id-1",
+            "connector_id": "connector-id-1",
+            "name": "On-Prem DataConnector",
+            "type": "custom",
+            "cidr": "192.168.0.50/32",
+            "port": "443",
+            "protocol": "tcp",
+            "createdAt": "2020-12-31T23:59:59.000Z",
+        }
+        mock_trainml._query = AsyncMock(return_value=api_response)
+        response = await data_connector.refresh()
+        mock_trainml._query.assert_called_once_with(
+            f"/provider/1/region/a/data_connector/x", "GET"
+        )
+        assert data_connector.id == "connector-id-1"
+        assert response.id == "connector-id-1"

trainml-0.5.7/tests/unit/cloudbender/test_services_unit.py

@@ -0,0 +1,167 @@
+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",
+        type="https",
+        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",
+            type="https",
+            public=False,
+        )
+        expected_payload = dict(
+            name="On-Prem Service",
+            type="https",
+            public=False,
+        )
+        api_response = {
+            "provider_uuid": "provider-id-1",
+            "region_uuid": "region-id-1",
+            "service_id": "service-id-1",
+            "name": "On-Prem Service",
+            "type": "https",
+            "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)
+        assert isinstance(service.type, 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",
+            "type": "https",
+            "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"

{trainml-0.5.5 → trainml-0.5.7}/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