proximl 0.5.9__tar.gz → 0.5.10__tar.gz

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

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

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

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

{proximl-0.5.9 → proximl-0.5.10}/proximl/checkpoints.py

@@ -31,13 +31,24 @@ class Checkpoints(object):
         datasets = [Checkpoint(self.proximl, **dataset) for dataset in resp]
         return datasets
 
-    async def create(self, name, source_type, source_uri, **kwargs):
+    async def create(
+        self,
+        name,
+        source_type,
+        source_uri,
+        type="evefs",
+        project_uuid=None,
+        **kwargs,
+    ):
+        if not project_uuid:
+            project_uuid = self.proximl.active_project
         data = dict(
             name=name,
             source_type=source_type,
             source_uri=source_uri,
-            source_options=kwargs.get("source_options"),
-            project_uuid=kwargs.get("project_uuid") or self.proximl.active_project,
+            project_uuid=project_uuid,
+            type=type,
+            **kwargs,
         )
         payload = {k: v for k, v in data.items() if v is not None}
         logging.info(f"Creating Checkpoint {name}")

{proximl-0.5.9 → proximl-0.5.10}/proximl/cli/cloudbender/datastore.py

@@ -29,13 +29,11 @@ def datastore(config):
 def list(config, provider, region):
     """List datastores."""
     data = [
-        ["ID", "NAME", "TYPE", "URI", "ROOT"],
+        ["ID", "NAME", "TYPE"],
         [
             "-" * 80,
             "-" * 80,
             "-" * 80,
-            "-" * 80,
-            "-" * 80,
         ],
     ]
 
@@ -51,15 +49,12 @@ def list(config, provider, region):
                 datastore.id,
                 datastore.name,
                 datastore.type,
-                datastore.uri,
-                datastore.root,
             ]
         )
 
     for row in data:
         click.echo(
-            "{: >37.36} {: >29.28} {: >9.8} {: >12.11} {: >12.11}"
-            "".format(*row),
+            "{: >37.36} {: >29.28} {: >9.8} " "".format(*row),
             file=config.stdout,
         )
 

{proximl-0.5.9 → proximl-0.5.10}/proximl/cloudbender/data_connectors.py

@@ -1,5 +1,13 @@
 import json
 import logging
+import asyncio
+import math
+
+from proximl.exceptions import (
+    ApiError,
+    SpecificationError,
+    ProxiMLException,
+)
 
 
 class DataConnectors(object):

{proximl-0.5.9 → proximl-0.5.10}/proximl/cloudbender/datastores.py

@@ -1,5 +1,13 @@
 import json
 import logging
+import asyncio
+import math
+
+from proximl.exceptions import (
+    ApiError,
+    SpecificationError,
+    ProxiMLException,
+)
 
 
 class Datastores(object):
@@ -20,9 +28,7 @@ class Datastores(object):
             "GET",
             kwargs,
         )
-        datastores = [
-            Datastore(self.proximl, **datastore) for datastore in resp
-        ]
+        datastores = [Datastore(self.proximl, **datastore) for datastore in resp]
         return datastores
 
     async def create(
@@ -31,18 +37,12 @@ class Datastores(object):
         region_uuid,
         name,
         type,
-        uri,
-        root,
-        options=None,
         **kwargs,
     ):
         logging.info(f"Creating Datastore {name}")
         data = dict(
             name=name,
             type=type,
-            uri=uri,
-            root=root,
-            options=options,
             **kwargs,
         )
         payload = {k: v for k, v in data.items() if v is not None}
@@ -73,8 +73,6 @@ class Datastore:
         self._region_uuid = self._datastore.get("region_uuid")
         self._type = self._datastore.get("type")
         self._name = self._datastore.get("name")
-        self._uri = self._datastore.get("uri")
-        self._root = self._datastore.get("root")
 
     @property
     def id(self) -> str:
@@ -96,14 +94,6 @@ class Datastore:
     def name(self) -> str:
         return self._name
 
-    @property
-    def uri(self) -> str:
-        return self._uri
-
-    @property
-    def root(self) -> str:
-        return self._root
-
     def __str__(self):
         return json.dumps({k: v for k, v in self._datastore.items()})
 

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

@@ -1,5 +1,13 @@
 import json
 import logging
+import asyncio
+import math
+
+from proximl.exceptions import (
+    ApiError,
+    SpecificationError,
+    ProxiMLException,
+)
 
 
 class Nodes(object):
@@ -153,3 +161,40 @@ class Node:
             None,
             dict(command=command),
         )
+
+    async def wait_for(self, status, timeout=300):
+        if self.status == status:
+            return
+        valid_statuses = ["active", "maintenance", "offline", "stopped", "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 == status:
+                return self
+            else:
+                count += 1
+                logging.debug(f"self: {self}, retry count {count}")
+
+        raise ProxiMLException(f"Timeout waiting for {status}")

{proximl-0.5.9 → proximl-0.5.10}/proximl/datasets.py

@@ -31,13 +31,24 @@ class Datasets(object):
         datasets = [Dataset(self.proximl, **dataset) for dataset in resp]
         return datasets
 
-    async def create(self, name, source_type, source_uri, **kwargs):
+    async def create(
+        self,
+        name,
+        source_type,
+        source_uri,
+        type="evefs",
+        project_uuid=None,
+        **kwargs,
+    ):
+        if not project_uuid:
+            project_uuid = self.proximl.active_project
         data = dict(
             name=name,
             source_type=source_type,
             source_uri=source_uri,
-            source_options=kwargs.get("source_options"),
-            project_uuid=kwargs.get("project_uuid") or self.proximl.active_project,
+            project_uuid=project_uuid,
+            type=type,
+            **kwargs,
         )
         payload = {k: v for k, v in data.items() if v is not None}
         logging.info(f"Creating Dataset {name}")

{proximl-0.5.9 → proximl-0.5.10}/proximl/jobs.py

@@ -476,7 +476,6 @@ class Job:
             return
         valid_statuses = [
             "waiting for data/model download",
-            "waiting for GPUs",
             "waiting for resources",
             "running",
             "stopped",
@@ -488,11 +487,6 @@ class Job:
                 "status",
                 f"Invalid wait_for status {status}.  Valid statuses are: {valid_statuses}",
             )
-        if status == "waiting for GPUs":
-            warnings.warn(
-                "'waiting for GPUs' status is deprecated, use 'waiting for resources' instead.",
-                DeprecationWarning,
-            )
         if (self.type == "training") and status == "stopped":
             warnings.warn(
                 "'stopped' status is deprecated for training jobs, use 'finished' instead.",
@@ -523,12 +517,8 @@ class Job:
                 self.status == status
                 or (
                     status
-                    in [
-                        "waiting for GPUs",
-                        "waiting for resources",
-                    ]  ## this status could be very short and the polling could miss it
-                    and self.status
-                    not in ["new", "waiting for GPUs", "waiting for resources"]
+                    == "waiting for resources"  ## this status could be very short and the polling could miss it
+                    and self.status not in ["new", "waiting for resources"]
                 )
                 or (
                     status
@@ -536,7 +526,6 @@ class Job:
                     and self.status
                     not in [
                         "new",
-                        "waiting for GPUs",
                         "waiting for resources",
                         "waiting for data/model download",
                     ]

{proximl-0.5.9 → proximl-0.5.10}/proximl/models.py

@@ -26,13 +26,24 @@ class Models(object):
         models = [Model(self.proximl, **model) for model in resp]
         return models
 
-    async def create(self, name, source_type, source_uri, **kwargs):
+    async def create(
+        self,
+        name,
+        source_type,
+        source_uri,
+        type="evefs",
+        project_uuid=None,
+        **kwargs,
+    ):
+        if not project_uuid:
+            project_uuid = self.proximl.active_project
         data = dict(
             name=name,
             source_type=source_type,
             source_uri=source_uri,
-            source_options=kwargs.get("source_options"),
-            project_uuid=kwargs.get("project_uuid") or self.proximl.active_project,
+            project_uuid=project_uuid,
+            type=type,
+            **kwargs,
         )
         payload = {k: v for k, v in data.items() if v is not None}
         logging.info(f"Creating Model {name}")

{proximl-0.5.9 → proximl-0.5.10}/proximl/volumes.py

@@ -26,14 +26,26 @@ class Volumes(object):
         volumes = [Volume(self.proximl, **volume) for volume in resp]
         return volumes
 
-    async def create(self, name, source_type, source_uri, capacity, **kwargs):
+    async def create(
+        self,
+        name,
+        source_type,
+        source_uri,
+        capacity,
+        type="evefs",
+        project_uuid=None,
+        **kwargs,
+    ):
+        if not project_uuid:
+            project_uuid = self.proximl.active_project
         data = dict(
             name=name,
             source_type=source_type,
             source_uri=source_uri,
             capacity=capacity,
-            source_options=kwargs.get("source_options"),
-            project_uuid=kwargs.get("project_uuid") or self.proximl.active_project,
+            project_uuid=project_uuid,
+            type=type,
+            **kwargs,
         )
         payload = {k: v for k, v in data.items() if v is not None}
         logging.info(f"Creating Volume {name}")

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

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

{proximl-0.5.9 → proximl-0.5.10}/tests/integration/test_checkpoints_integration.py

@@ -59,7 +59,6 @@ async def test_checkpoint_wasabi(proximl, capsys):
         name="CLI Automated Wasabi",
         source_type="wasabi",
         source_uri="s3://proximl-example/models/proximl-examples",
-        capacity="10G",
         source_options=dict(endpoint_url="https://s3.wasabisys.com"),
     )
     checkpoint = await checkpoint.wait_for("ready", 300)

{proximl-0.5.9 → proximl-0.5.10}/tests/integration/test_models_integration.py

@@ -55,7 +55,6 @@ async def test_model_wasabi(proximl, capsys):
         name="CLI Automated Wasabi",
         source_type="wasabi",
         source_uri="s3://proximl-example/models/proximl-examples",
-        capacity="10G",
         source_options=dict(endpoint_url="https://s3.wasabisys.com"),
     )
     model = await model.wait_for("ready", 300)

{proximl-0.5.9 → proximl-0.5.10}/tests/unit/cloudbender/test_datastores_unit.py

@@ -119,8 +119,6 @@ class datastoreTests:
         assert isinstance(datastore.region_uuid, str)
         assert isinstance(datastore.type, str)
         assert isinstance(datastore.name, str)
-        assert isinstance(datastore.uri, str)
-        assert isinstance(datastore.root, str)
 
     def test_datastore_str(self, datastore):
         string = str(datastore)
@@ -131,9 +129,7 @@ class datastoreTests:
     def test_datastore_repr(self, datastore):
         string = repr(datastore)
         regex = (
-            r"^Datastore\( proximl , \*\*{.*'store_id': '"
-            + datastore.id
-            + r"'.*}\)$"
+            r"^Datastore\( proximl , \*\*{.*'store_id': '" + datastore.id + r"'.*}\)$"
         )
         assert isinstance(string, str)
         assert re.match(regex, string)

{proximl-0.5.9 → proximl-0.5.10}/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")

{proximl-0.5.9 → proximl-0.5.10}/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"))
         )

{proximl-0.5.9 → proximl-0.5.10}/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"))
         )

{proximl-0.5.9 → proximl-0.5.10}/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",