proximl 0.5.9__py3-none-any.whl → 0.5.11__py3-none-any.whl

tests/unit/conftest.py

@@ -16,16 +16,21 @@ from proximl.connections import Connections
 from proximl.projects import (
     Projects,
     Project,
-    ProjectDatastore,
-    ProjectReservation,
 )
+from proximl.projects.datastores import ProjectDatastores, ProjectDatastore
+from proximl.projects.services import ProjectServices, ProjectService
+from proximl.projects.data_connectors import ProjectDataConnectors, ProjectDataConnector
+from proximl.projects.keys import ProjectKeys, ProjectKey
+from proximl.projects.secrets import ProjectSecrets, ProjectSecret
+
 from proximl.cloudbender import Cloudbender
 from proximl.cloudbender.providers import Provider, Providers
 from proximl.cloudbender.regions import Region, Regions
 from proximl.cloudbender.nodes import Node, Nodes
 from proximl.cloudbender.devices import Device, Devices
 from proximl.cloudbender.datastores import Datastore, Datastores
-from proximl.cloudbender.reservations import Reservation, Reservations
+from proximl.cloudbender.services import Service, Services
+from proximl.cloudbender.data_connectors import DataConnector, DataConnectors
 from proximl.cloudbender.device_configs import DeviceConfig, DeviceConfigs
 
 
@@ -887,27 +892,27 @@ def mock_project_datastores():
 
 
 @fixture(scope="session")
-def mock_reservations():
+def mock_services():
     proximl = Mock()
     yield [
-        Reservation(
+        Service(
             proximl,
             **{
                 "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(
             proximl,
             **{
                 "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 +923,10 @@ def mock_reservations():
 
 
 @fixture(scope="session")
-def mock_project_reservations():
+def mock_project_services():
     proximl = Mock()
     yield [
-        ProjectReservation(
+        ProjectService(
             proximl,
             **{
                 "project_uuid": "proj-id-1",
@@ -933,7 +938,7 @@ def mock_project_reservations():
                 "hostname": "service-a.local",
             },
         ),
-        ProjectReservation(
+        ProjectService(
             proximl,
             **{
                 "project_uuid": "proj-id-1",
@@ -948,6 +953,68 @@ def mock_project_reservations():
     ]
 
 
+@fixture(scope="session")
+def mock_data_connectors():
+    proximl = Mock()
+    yield [
+        DataConnector(
+            proximl,
+            **{
+                "provider_uuid": "prov-id-1",
+                "region_uuid": "reg-id-1",
+                "connector_id": "con-id-1",
+                "type": "custom",
+                "name": "On-Prem Connection A",
+                "protocol": "TCP",
+                "port_range": "8000-8099",
+                "cidr": "10.0.3.0/24",
+            },
+        ),
+        DataConnector(
+            proximl,
+            **{
+                "provider_uuid": "prov-id-2",
+                "region_uuid": "reg-id-2",
+                "connector_id": "con-id-2",
+                "type": "custom",
+                "name": "Cloud Connection B",
+                "protocol": "UDP",
+                "port_range": "5000",
+                "cidr": "10.0.2.0/24",
+            },
+        ),
+    ]
+
+
+@fixture(
+    scope="session",
+)
+def mock_project_data_connectors():
+    proximl = Mock()
+    yield [
+        ProjectDataConnector(
+            proximl,
+            **{
+                "project_uuid": "proj-id-1",
+                "region_uuid": "reg-id-1",
+                "id": "con-id-1",
+                "type": "custom",
+                "name": "On-Prem Connection A",
+            },
+        ),
+        ProjectDataConnector(
+            proximl,
+            **{
+                "project_uuid": "proj-id-1",
+                "region_uuid": "reg-id-2",
+                "id": "con-id-2",
+                "type": "custom",
+                "name": "Cloud Connection B",
+            },
+        ),
+    ]
+
+
 @fixture(scope="session")
 def mock_device_configs():
     proximl = Mock()
@@ -973,6 +1040,60 @@ def mock_device_configs():
     ]
 
 
+@fixture(
+    scope="session",
+)
+def mock_project_keys():
+    proximl = Mock()
+    yield [
+        ProjectKey(
+            proximl,
+            **{
+                "project_uuid": "proj-id-1",
+                "type": "aws",
+                "key_id": "AKSHFKHDFS",
+                "updatedAt": "2023-06-02T21:22:40.084Z",
+            },
+        ),
+        ProjectKey(
+            proximl,
+            **{
+                "project_uuid": "proj-id-1",
+                "type": "gcp",
+                "key_id": "credentials.json",
+                "updatedAt": "2023-06-02T21:22:40.084Z",
+            },
+        ),
+    ]
+
+
+@fixture(
+    scope="session",
+)
+def mock_project_secrets():
+    proximl = Mock()
+    yield [
+        ProjectSecret(
+            proximl,
+            **{
+                "project_uuid": "proj-id-1",
+                "name": "super_secret",
+                "created_by": "User",
+                "updatedAt": "2023-06-02T21:22:40.084Z",
+            },
+        ),
+        ProjectSecret(
+            proximl,
+            **{
+                "project_uuid": "proj-id-1",
+                "name": "super_secret_2",
+                "created_by": "User",
+                "updatedAt": "2023-06-02T21:22:40.084Z",
+            },
+        ),
+    ]
+
+
 @fixture(scope="function")
 def mock_proximl(
     mock_my_datasets,
@@ -990,8 +1111,14 @@ def mock_proximl(
     mock_nodes,
     mock_devices,
     mock_datastores,
-    mock_reservations,
+    mock_services,
+    mock_data_connectors,
     mock_device_configs,
+    mock_project_datastores,
+    mock_project_services,
+    mock_project_data_connectors,
+    mock_project_keys,
+    mock_project_secrets,
 ):
     proximl = create_autospec(ProxiML)
     proximl.active_project = "proj-id-1"
@@ -1015,6 +1142,18 @@ def mock_proximl(
     proximl.environments.list = AsyncMock(return_value=mock_environments)
     proximl.jobs.list = AsyncMock(return_value=mock_jobs)
     proximl.projects.list = AsyncMock(return_value=mock_projects)
+    proximl.projects.datastores = create_autospec(ProjectDatastores)
+    proximl.projects.datastores.list = AsyncMock(return_value=mock_project_datastores)
+    proximl.projects.services = create_autospec(ProjectServices)
+    proximl.projects.services.list = AsyncMock(return_value=mock_project_services)
+    proximl.projects.data_connectors = create_autospec(ProjectDataConnectors)
+    proximl.projects.data_connectors.list = AsyncMock(
+        return_value=mock_project_data_connectors
+    )
+    proximl.projects.keys = create_autospec(ProjectKeys)
+    proximl.projects.keys.list = AsyncMock(return_value=mock_project_keys)
+    proximl.projects.secrets = create_autospec(ProjectSecrets)
+    proximl.projects.secrets.list = AsyncMock(return_value=mock_project_secrets)
 
     proximl.cloudbender = create_autospec(Cloudbender)
 
@@ -1024,12 +1163,16 @@ def mock_proximl(
     proximl.cloudbender.regions.list = AsyncMock(return_value=mock_regions)
     proximl.cloudbender.nodes = create_autospec(Nodes)
     proximl.cloudbender.nodes.list = AsyncMock(return_value=mock_nodes)
-    proximl.cloudbender.devices = create_autospec(Nodes)
+    proximl.cloudbender.devices = create_autospec(Devices)
     proximl.cloudbender.devices.list = AsyncMock(return_value=mock_devices)
     proximl.cloudbender.datastores = create_autospec(Datastores)
     proximl.cloudbender.datastores.list = AsyncMock(return_value=mock_datastores)
-    proximl.cloudbender.reservations = create_autospec(Reservations)
-    proximl.cloudbender.reservations.list = AsyncMock(return_value=mock_reservations)
+    proximl.cloudbender.services = create_autospec(Services)
+    proximl.cloudbender.services.list = AsyncMock(return_value=mock_services)
+    proximl.cloudbender.data_connectors = create_autospec(DataConnectors)
+    proximl.cloudbender.data_connectors.list = AsyncMock(
+        return_value=mock_data_connectors
+    )
     proximl.cloudbender.device_configs = create_autospec(DeviceConfigs)
     proximl.cloudbender.device_configs.list = AsyncMock(
         return_value=mock_device_configs

tests/unit/test_checkpoints_unit.py

@@ -44,9 +44,7 @@ class CheckpointsTests:
         api_response = dict()
         mock_proximl._query = AsyncMock(return_value=api_response)
         await checkpoints.get("1234")
-        mock_proximl._query.assert_called_once_with(
-            "/checkpoint/1234", "GET", dict()
-        )
+        mock_proximl._query.assert_called_once_with("/checkpoint/1234", "GET", dict())
 
     @mark.asyncio
     async def test_list_checkpoints(
@@ -57,9 +55,7 @@ class CheckpointsTests:
         api_response = dict()
         mock_proximl._query = AsyncMock(return_value=api_response)
         await checkpoints.list()
-        mock_proximl._query.assert_called_once_with(
-            "/checkpoint", "GET", dict()
-        )
+        mock_proximl._query.assert_called_once_with("/checkpoint", "GET", dict())
 
     @mark.asyncio
     async def test_remove_checkpoint(
@@ -86,11 +82,13 @@ class CheckpointsTests:
             name="new checkpoint",
             source_type="aws",
             source_uri="s3://proximl-examples/checkpoints/resnet50",
+            type="evefs",
         )
         api_response = {
             "project_uuid": "cus-id-1",
             "checkpoint_uuid": "checkpoint-id-1",
             "name": "new checkpoint",
+            "type": "evefs",
             "status": "new",
             "source_type": "aws",
             "source_uri": "s3://proximl-examples/checkpoints/resnet50",
@@ -135,7 +133,9 @@ class CheckpointTests:
 
     @mark.asyncio
     async def test_checkpoint_get_log_url(self, checkpoint, mock_proximl):
-        api_response = "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/logs/first_one.zip"
+        api_response = (
+            "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/logs/first_one.zip"
+        )
         mock_proximl._query = AsyncMock(return_value=api_response)
         response = await checkpoint.get_log_url()
         mock_proximl._query.assert_called_once_with(
@@ -163,7 +163,9 @@ class CheckpointTests:
     async def test_checkpoint_get_connection_utility_url(
         self, checkpoint, mock_proximl
     ):
-        api_response = "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/vpn/first_one.zip"
+        api_response = (
+            "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/vpn/first_one.zip"
+        )
         mock_proximl._query = AsyncMock(return_value=api_response)
         response = await checkpoint.get_connection_utility_url()
         mock_proximl._query.assert_called_once_with(
@@ -338,9 +340,7 @@ class CheckpointTests:
         assert response.id == "data-id-1"
 
     @mark.asyncio
-    async def test_checkpoint_wait_for_successful(
-        self, checkpoint, mock_proximl
-    ):
+    async def test_checkpoint_wait_for_successful(self, checkpoint, mock_proximl):
         api_response = {
             "customer_uuid": "cus-id-1",
             "checkpoint_uuid": "data-id-1",
@@ -373,9 +373,7 @@ class CheckpointTests:
         mock_proximl._query.assert_not_called()
 
     @mark.asyncio
-    async def test_checkpoint_wait_for_incorrect_status(
-        self, checkpoint, mock_proximl
-    ):
+    async def test_checkpoint_wait_for_incorrect_status(self, checkpoint, mock_proximl):
         api_response = None
         mock_proximl._query = AsyncMock(return_value=api_response)
         with raises(SpecificationError):
@@ -383,9 +381,7 @@ class CheckpointTests:
         mock_proximl._query.assert_not_called()
 
     @mark.asyncio
-    async def test_checkpoint_wait_for_with_delay(
-        self, checkpoint, mock_proximl
-    ):
+    async def test_checkpoint_wait_for_with_delay(self, checkpoint, mock_proximl):
         api_response_initial = dict(
             checkpoint_uuid="1",
             name="first one",
@@ -441,9 +437,7 @@ class CheckpointTests:
         self, checkpoint, mock_proximl
     ):
         mock_proximl._query = AsyncMock(
-            side_effect=ApiError(
-                404, dict(errorMessage="Checkpoint Not Found")
-            )
+            side_effect=ApiError(404, dict(errorMessage="Checkpoint Not Found"))
         )
         await checkpoint.wait_for("archived")
         mock_proximl._query.assert_called()
@@ -453,9 +447,7 @@ class CheckpointTests:
         self, checkpoint, mock_proximl
     ):
         mock_proximl._query = AsyncMock(
-            side_effect=ApiError(
-                404, dict(errorMessage="Checkpoint Not Found")
-            )
+            side_effect=ApiError(404, dict(errorMessage="Checkpoint Not Found"))
         )
         with raises(ApiError):
             await checkpoint.wait_for("ready")

tests/unit/test_datasets_unit.py

@@ -28,6 +28,7 @@ def dataset(mock_proximl):
         dataset_uuid="1",
         project_uuid="proj-id-1",
         name="first one",
+        type="evefs",
         status="downloading",
         size=100000,
         createdAt="2020-12-31T23:59:59.000Z",
@@ -103,6 +104,7 @@ class DatasetsTests:
             name="new dataset",
             source_type="aws",
             source_uri="s3://proximl-examples/data/cifar10",
+            type="evefs",
         )
         api_response = {
             "customer_uuid": "cus-id-1",
@@ -110,6 +112,7 @@ class DatasetsTests:
             "dataset_uuid": "data-id-1",
             "name": "new dataset",
             "status": "new",
+            "type": "evefs",
             "source_type": "aws",
             "source_uri": "s3://proximl-examples/data/cifar10",
             "createdAt": "2020-12-20T16:46:23.909Z",
@@ -139,9 +142,7 @@ class DatasetTests:
     def test_dataset_repr(self, dataset):
         string = repr(dataset)
         regex = (
-            r"^Dataset\( proximl , \*\*{.*'dataset_uuid': '"
-            + dataset.id
-            + r"'.*}\)$"
+            r"^Dataset\( proximl , \*\*{.*'dataset_uuid': '" + dataset.id + r"'.*}\)$"
         )
         assert isinstance(string, str)
         assert re.match(regex, string)
@@ -153,7 +154,9 @@ class DatasetTests:
 
     @mark.asyncio
     async def test_dataset_get_log_url(self, dataset, mock_proximl):
-        api_response = "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/logs/first_one.zip"
+        api_response = (
+            "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/logs/first_one.zip"
+        )
         mock_proximl._query = AsyncMock(return_value=api_response)
         response = await dataset.get_log_url()
         mock_proximl._query.assert_called_once_with(
@@ -178,10 +181,10 @@ class DatasetTests:
         assert response == api_response
 
     @mark.asyncio
-    async def test_dataset_get_connection_utility_url(
-        self, dataset, mock_proximl
-    ):
-        api_response = "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/vpn/first_one.zip"
+    async def test_dataset_get_connection_utility_url(self, dataset, mock_proximl):
+        api_response = (
+            "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/vpn/first_one.zip"
+        )
         mock_proximl._query = AsyncMock(return_value=api_response)
         response = await dataset.get_connection_utility_url()
         mock_proximl._query.assert_called_once_with(
@@ -388,9 +391,7 @@ class DatasetTests:
         mock_proximl._query.assert_not_called()
 
     @mark.asyncio
-    async def test_dataset_wait_for_incorrect_status(
-        self, dataset, mock_proximl
-    ):
+    async def test_dataset_wait_for_incorrect_status(self, dataset, mock_proximl):
         api_response = None
         mock_proximl._query = AsyncMock(return_value=api_response)
         with raises(SpecificationError):
@@ -435,9 +436,7 @@ class DatasetTests:
         mock_proximl._query.assert_called()
 
     @mark.asyncio
-    async def test_dataset_wait_for_dataset_failed(
-        self, dataset, mock_proximl
-    ):
+    async def test_dataset_wait_for_dataset_failed(self, dataset, mock_proximl):
         api_response = dict(
             dataset_uuid="1",
             name="first one",
@@ -450,9 +449,7 @@ class DatasetTests:
         mock_proximl._query.assert_called()
 
     @mark.asyncio
-    async def test_dataset_wait_for_archived_succeeded(
-        self, dataset, mock_proximl
-    ):
+    async def test_dataset_wait_for_archived_succeeded(self, dataset, mock_proximl):
         mock_proximl._query = AsyncMock(
             side_effect=ApiError(404, dict(errorMessage="Dataset Not Found"))
         )
@@ -460,9 +457,7 @@ class DatasetTests:
         mock_proximl._query.assert_called()
 
     @mark.asyncio
-    async def test_dataset_wait_for_unexpected_api_error(
-        self, dataset, mock_proximl
-    ):
+    async def test_dataset_wait_for_unexpected_api_error(self, dataset, mock_proximl):
         mock_proximl._query = AsyncMock(
             side_effect=ApiError(404, dict(errorMessage="Dataset Not Found"))
         )

tests/unit/test_models_unit.py

@@ -28,6 +28,7 @@ def model(mock_proximl):
         model_uuid="1",
         project_uuid="proj-id-1",
         name="first one",
+        type="evefs",
         status="downloading",
         size=100000,
         createdAt="2020-12-31T23:59:59.000Z",
@@ -44,9 +45,7 @@ class ModelsTests:
         api_response = dict()
         mock_proximl._query = AsyncMock(return_value=api_response)
         await models.get("1234")
-        mock_proximl._query.assert_called_once_with(
-            "/model/1234", "GET", dict()
-        )
+        mock_proximl._query.assert_called_once_with("/model/1234", "GET", dict())
 
     @mark.asyncio
     async def test_list_models(
@@ -84,12 +83,14 @@ class ModelsTests:
             name="new model",
             source_type="aws",
             source_uri="s3://proximl-examples/models/resnet50",
+            type="evefs",
         )
         api_response = {
             "customer_uuid": "cus-id-1",
             "model_uuid": "model-id-1",
             "name": "new model",
             "status": "new",
+            "type": "evefs",
             "source_type": "aws",
             "source_uri": "s3://proximl-examples/models/resnet50",
             "createdAt": "2020-12-20T16:46:23.909Z",
@@ -118,11 +119,7 @@ class ModelTests:
 
     def test_model_repr(self, model):
         string = repr(model)
-        regex = (
-            r"^Model\( proximl , \*\*{.*'model_uuid': '"
-            + model.id
-            + r"'.*}\)$"
-        )
+        regex = r"^Model\( proximl , \*\*{.*'model_uuid': '" + model.id + r"'.*}\)$"
         assert isinstance(string, str)
         assert re.match(regex, string)
 
@@ -133,7 +130,9 @@ class ModelTests:
 
     @mark.asyncio
     async def test_model_get_log_url(self, model, mock_proximl):
-        api_response = "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/logs/first_one.zip"
+        api_response = (
+            "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/logs/first_one.zip"
+        )
         mock_proximl._query = AsyncMock(return_value=api_response)
         response = await model.get_log_url()
         mock_proximl._query.assert_called_once_with(
@@ -159,7 +158,9 @@ class ModelTests:
 
     @mark.asyncio
     async def test_model_get_connection_utility_url(self, model, mock_proximl):
-        api_response = "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/vpn/first_one.zip"
+        api_response = (
+            "https://trainml-jobs-dev.s3.us-east-2.amazonaws.com/1/vpn/first_one.zip"
+        )
         mock_proximl._query = AsyncMock(return_value=api_response)
         response = await model.get_connection_utility_url()
         mock_proximl._query.assert_called_once_with(
@@ -425,9 +426,7 @@ class ModelTests:
         mock_proximl._query.assert_called()
 
     @mark.asyncio
-    async def test_model_wait_for_archived_succeeded(
-        self, model, mock_proximl
-    ):
+    async def test_model_wait_for_archived_succeeded(self, model, mock_proximl):
         mock_proximl._query = AsyncMock(
             side_effect=ApiError(404, dict(errorMessage="Model Not Found"))
         )
@@ -435,9 +434,7 @@ class ModelTests:
         mock_proximl._query.assert_called()
 
     @mark.asyncio
-    async def test_model_wait_for_unexpected_api_error(
-        self, model, mock_proximl
-    ):
+    async def test_model_wait_for_unexpected_api_error(self, model, mock_proximl):
         mock_proximl._query = AsyncMock(
             side_effect=ApiError(404, dict(errorMessage="Model Not Found"))
         )

tests/unit/test_volumes_unit.py

@@ -26,6 +26,7 @@ def volume(mock_proximl):
     yield specimen.Volume(
         mock_proximl,
         id="1",
+        type="evefs",
         project_uuid="proj-id-1",
         name="first one",
         status="downloading",
@@ -86,12 +87,14 @@ class VolumesTests:
             source_type="aws",
             source_uri="s3://proximl-examples/volumes/resnet50",
             capacity="10G",
+            type="evefs",
         )
         api_response = {
             "project_uuid": "cus-id-1",
             "id": "volume-id-1",
             "name": "new volume",
             "status": "new",
+            "type": "evefs",
             "source_type": "aws",
             "capacity": "10G",
             "source_uri": "s3://proximl-examples/volumes/resnet50",