trainml 0.5.4__tar.gz → 0.5.5__tar.gz

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

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

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

@@ -3,9 +3,7 @@ python_files = "test_*"
 python_classes = "*Tests"
 python_functions = "test_*"
 asyncio_mode = "auto"
-testpaths = [
-    "tests",
-]
+testpaths = ["tests"]
 markers = [
     "create: Tests that create resources on the trainml platform",
     "gpu_types: Gpu Type tests",
@@ -13,6 +11,7 @@ markers = [
     "datasets: Datasets tests",
     "models: Models tests",
     "checkpoints: Checkpoints tests",
+    "volumes: Volumes tests",
     "jobs: Jobs tests",
     "connections: Connections tests",
     "projects: Projects tests",
@@ -27,5 +26,5 @@ markers = [
     "unit: All unit tests (no trainML environment required)",
     "integration: All integration tests (trainML environment required)",
     "sdk: All tests of the SDK",
-    "cli: All test of the cli"
-]
+    "cli: All test of the cli",
+]

{trainml-0.5.4 → trainml-0.5.5}/tests/integration/test_checkpoints_integration.py

@@ -54,18 +54,20 @@ class GetCheckpointTests:
 
 @mark.create
 @mark.asyncio
-async def test_checkpoint_aws(trainml, capsys):
+async def test_checkpoint_wasabi(trainml, capsys):
     checkpoint = await trainml.checkpoints.create(
-        name="CLI Automated AWS",
-        source_type="aws",
-        source_uri="s3://trainml-examples/models/mxnet-model.zip",
+        name="CLI Automated Wasabi",
+        source_type="wasabi",
+        source_uri="s3://trainml-example/models/trainml-examples",
+        capacity="10G",
+        source_options=dict(endpoint_url="https://s3.wasabisys.com"),
     )
     checkpoint = await checkpoint.wait_for("ready", 300)
     status = checkpoint.status
     size = checkpoint.size
     await checkpoint.remove()
     assert status == "ready"
-    assert size >= 1000000
+    assert size >= 500000
 
 
 @mark.create

{trainml-0.5.4 → trainml-0.5.5}/tests/integration/test_datasets_integration.py

@@ -13,8 +13,9 @@ class GetDatasetTests:
     async def dataset(self, trainml):
         dataset = await trainml.datasets.create(
             name="CLI Automated",
-            source_type="aws",
-            source_uri="s3://trainml-examples/data/cifar10",
+            source_type="wasabi",
+            source_uri="s3://trainml-example/input/cifar-10/cifar-10-batches-bin",
+            source_options=dict(endpoint_url="https://s3.wasabisys.com"),
         )
         dataset = await dataset.wait_for("ready", 300)
         yield dataset
@@ -48,9 +49,7 @@ class GetDatasetTests:
     async def test_dataset_repr(self, dataset):
         string = repr(dataset)
         regex = (
-            r"^Dataset\( trainml , \*\*{.*'dataset_uuid': '"
-            + dataset.id
-            + r"'.*}\)$"
+            r"^Dataset\( trainml , \*\*{.*'dataset_uuid': '" + dataset.id + r"'.*}\)$"
         )
         assert isinstance(string, str)
         assert re.match(regex, string)

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

@@ -269,7 +269,7 @@ class JobAPIDataValidationTests:
                 ),
             )
         assert (
-            "Invalid Request - Only regional datastore are allowed for Notebook and Endpoint output locations"
+            "Invalid Request - output_type invalid for Notebook and Endpoint jobs"
             in error.value.message
         )
 
@@ -298,7 +298,45 @@ class JobAPIDataValidationTests:
                 ),
             )
         assert (
-            "Invalid Request - Only regional datastore are allowed for Notebook and Endpoint output locations"
+            "Invalid Request - output_type invalid for Notebook and Endpoint jobs"
+            in error.value.message
+        )
+
+    async def test_invalid_volumes_for_training(self, trainml):
+        with raises(ApiError) as error:
+            await trainml.jobs.create(
+                name="Invalid Volumes for Training",
+                type="training",
+                gpu_types=["rtx3090"],
+                disk_size=10,
+                data=dict(
+                    output_uri="s3://trainml-examples/output/resnet_cifar10",
+                    output_type="aws",
+                    volumes=["volume-id"],
+                ),
+                workers=["python train.py"],
+            )
+        assert (
+            "Invalid Request - Only Notebook and Endpoint job types can use writable volumes"
+            in error.value.message
+        )
+
+    async def test_invalid_volumes_for_inference(self, trainml):
+        with raises(ApiError) as error:
+            await trainml.jobs.create(
+                name="Invalid Volumes for Inference",
+                type="inference",
+                gpu_types=["rtx3090"],
+                disk_size=10,
+                data=dict(
+                    output_uri="s3://trainml-examples/output/resnet_cifar10",
+                    output_type="aws",
+                    volumes=["volume-id"],
+                ),
+                workers=["python predict.py"],
+            )
+        assert (
+            "Invalid Request - Only Notebook and Endpoint job types can use writable volumes"
             in error.value.message
         )
 

{trainml-0.5.4 → trainml-0.5.5}/tests/integration/test_models_integration.py

@@ -43,29 +43,27 @@ class GetModelTests:
 
     async def test_model_repr(self, model):
         string = repr(model)
-        regex = (
-            r"^Model\( trainml , \*\*{.*'model_uuid': '"
-            + model.id
-            + r"'.*}\)$"
-        )
+        regex = r"^Model\( trainml , \*\*{.*'model_uuid': '" + model.id + r"'.*}\)$"
         assert isinstance(string, str)
         assert re.match(regex, string)
 
 
 @mark.create
 @mark.asyncio
-async def test_model_aws(trainml, capsys):
+async def test_model_wasabi(trainml, capsys):
     model = await trainml.models.create(
-        name="CLI Automated AWS",
-        source_type="aws",
-        source_uri="s3://trainml-examples/models/mxnet-model.zip",
+        name="CLI Automated Wasabi",
+        source_type="wasabi",
+        source_uri="s3://trainml-example/models/trainml-examples",
+        capacity="10G",
+        source_options=dict(endpoint_url="https://s3.wasabisys.com"),
     )
     model = await model.wait_for("ready", 300)
     status = model.status
     size = model.size
     await model.remove()
     assert status == "ready"
-    assert size >= 1000000
+    assert size >= 500000
 
 
 @mark.create

{trainml-0.5.4 → trainml-0.5.5}/tests/integration/test_projects_integration.py

@@ -11,9 +11,7 @@ pytestmark = [mark.sdk, mark.integration, mark.projects]
 class GetProjectsTests:
     @fixture(scope="class")
     async def project(self, trainml):
-        project = await trainml.projects.create(
-            name="New Project", copy_keys=False
-        )
+        project = await trainml.projects.create(name="New Project", copy_keys=False)
         yield project
         await project.remove()
 
@@ -41,8 +39,6 @@ class GetProjectsTests:
 
     async 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)

trainml-0.5.5/tests/integration/test_volumes_integration.py

@@ -0,0 +1,100 @@
+import re
+import sys
+import asyncio
+from pytest import mark, fixture
+
+pytestmark = [mark.sdk, mark.integration, mark.volumes]
+
+
+@mark.create
+@mark.asyncio
+class GetVolumeTests:
+    @fixture(scope="class")
+    async def volume(self, trainml):
+        volume = await trainml.volumes.create(
+            name="CLI Automated",
+            source_type="git",
+            source_uri="git@github.com:trainML/environment-tests.git",
+            capacity="10G",
+        )
+        volume = await volume.wait_for("ready", 120)
+        yield volume
+        await volume.remove()
+        volume = await volume.wait_for("archived", 60)
+
+    async def test_get_volumes(self, trainml, volume):
+        volumes = await trainml.volumes.list()
+        assert len(volumes) > 0
+
+    async def test_get_volume(self, trainml, volume):
+        response = await trainml.volumes.get(volume.id)
+        assert response.id == volume.id
+
+    async def test_volume_properties(self, volume):
+        assert isinstance(volume.id, str)
+        assert isinstance(volume.status, str)
+        assert isinstance(volume.name, str)
+        assert isinstance(volume.capacity, str)
+        assert isinstance(volume.used_size, int)
+        assert isinstance(volume.billed_size, int)
+
+    async def test_volume_str(self, volume):
+        string = str(volume)
+        regex = r"^{.*\"id\": \"" + volume.id + r"\".*}$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+    async def test_volume_repr(self, volume):
+        string = repr(volume)
+        regex = r"^Volume\( trainml , \*\*{.*'id': '" + volume.id + r"'.*}\)$"
+        assert isinstance(string, str)
+        assert re.match(regex, string)
+
+
+@mark.create
+@mark.asyncio
+async def test_volume_wasabi(trainml, capsys):
+    volume = await trainml.volumes.create(
+        name="CLI Automated Wasabi",
+        source_type="wasabi",
+        source_uri="s3://trainml-example/models/trainml-examples",
+        capacity="10G",
+        source_options=dict(endpoint_url="https://s3.wasabisys.com"),
+    )
+    volume = await volume.wait_for("ready", 300)
+    status = volume.status
+    billed_size = volume.billed_size
+    used_size = volume.used_size
+    await volume.remove()
+    assert status == "ready"
+    assert billed_size >= 10000000
+    assert used_size >= 500000
+
+
+@mark.create
+@mark.asyncio
+async def test_volume_local(trainml, capsys):
+    volume = await trainml.volumes.create(
+        name="CLI Automated Local",
+        source_type="local",
+        source_uri="~/tensorflow-model",
+        capacity="10G",
+    )
+    attach_task = asyncio.create_task(volume.attach())
+    connect_task = asyncio.create_task(volume.connect())
+    await asyncio.gather(attach_task, connect_task)
+    await volume.disconnect()
+    await volume.refresh()
+    status = volume.status
+    billed_size = volume.billed_size
+    used_size = volume.used_size
+    await volume.remove()
+    assert status == "ready"
+    assert billed_size >= 10000000
+    assert used_size >= 1000000
+    captured = capsys.readouterr()
+    sys.stdout.write(captured.out)
+    sys.stderr.write(captured.err)
+    assert "Starting data upload from local" in captured.out
+    assert "official/LICENSE  11456 bytes" in captured.out
+    assert "Upload complete" in captured.out

trainml-0.5.5/tests/unit/cli/test_cli_volume_unit.py

@@ -0,0 +1,20 @@
+import re
+import json
+import click
+from unittest.mock import AsyncMock, patch
+from pytest import mark, fixture, raises
+
+pytestmark = [mark.cli, mark.unit, mark.volumes]
+
+from trainml.cli import volume as specimen
+from trainml.volumes import Volume
+
+
+def test_list(runner, mock_my_volumes):
+    with patch("trainml.cli.TrainML", new=AsyncMock) as mock_trainml:
+        mock_trainml.volumes = AsyncMock()
+        mock_trainml.volumes.list = AsyncMock(return_value=mock_my_volumes)
+        result = runner.invoke(specimen, ["list"])
+        print(result)
+        assert result.exit_code == 0
+        mock_trainml.volumes.list.assert_called_once()

{trainml-0.5.4 → trainml-0.5.5}/tests/unit/conftest.py

@@ -7,6 +7,7 @@ from trainml.trainml import TrainML
 from trainml.auth import Auth
 from trainml.datasets import Dataset, Datasets
 from trainml.checkpoints import Checkpoint, Checkpoints
+from trainml.volumes import Volume, Volumes
 from trainml.models import Model, Models
 from trainml.gpu_types import GpuType, GpuTypes
 from trainml.environments import Environment, Environments
@@ -258,6 +259,79 @@ def mock_models():
     ]
 
 
+@fixture(scope="session")
+def mock_my_volumes():
+    trainml = Mock()
+    yield [
+        Volume(
+            trainml,
+            id="1",
+            project_uuid="proj-id-1",
+            name="first one",
+            status="ready",
+            capacity="10G",
+            used_size=100000000,
+            billed_size=100000000,
+            createdAt="2020-12-31T23:59:59.000Z",
+        ),
+        Volume(
+            trainml,
+            id="2",
+            project_uuid="proj-id-1",
+            name="second one",
+            status="ready",
+            capacity="10G",
+            used_size=100000000,
+            billed_size=100000000,
+            createdAt="2021-01-01T00:00:01.000Z",
+        ),
+        Volume(
+            trainml,
+            id="3",
+            project_uuid="proj-id-1",
+            name="first one",
+            status="ready",
+            capacity="10G",
+            used_size=100000000,
+            billed_size=100000000,
+            createdAt="2021-01-01T00:00:01.000Z",
+        ),
+        Volume(
+            trainml,
+            id="4",
+            project_uuid="proj-id-1",
+            name="other one",
+            status="ready",
+            capacity="10G",
+            used_size=100000000,
+            billed_size=100000000,
+            createdAt="2020-12-31T23:59:59.000Z",
+        ),
+        Volume(
+            trainml,
+            id="5",
+            project_uuid="proj-id-1",
+            name="not ready",
+            status="new",
+            capacity="10G",
+            used_size=100000000,
+            billed_size=100000000,
+            createdAt="2021-01-01T00:00:01.000Z",
+        ),
+        Volume(
+            trainml,
+            id="6",
+            project_uuid="proj-id-1",
+            name="failed",
+            status="failed",
+            capacity="10G",
+            used_size=100000000,
+            billed_size=100000000,
+            createdAt="2021-01-01T00:00:01.000Z",
+        ),
+    ]
+
+
 @fixture(scope="session")
 def mock_gpu_types():
     trainml = Mock()
@@ -903,6 +977,9 @@ def mock_device_configs():
 def mock_trainml(
     mock_my_datasets,
     mock_public_datasets,
+    mock_my_checkpoints,
+    mock_public_checkpoints,
+    mock_my_volumes,
     mock_models,
     mock_gpu_types,
     mock_environments,
@@ -921,6 +998,7 @@ def mock_trainml(
     trainml.project = "proj-id-1"
     trainml.datasets = create_autospec(Datasets)
     trainml.checkpoints = create_autospec(Checkpoints)
+    trainml.volumes = create_autospec(Volumes)
     trainml.models = create_autospec(Models)
     trainml.gpu_types = create_autospec(GpuTypes)
     trainml.environments = create_autospec(Environments)
@@ -930,10 +1008,9 @@ def mock_trainml(
     trainml.datasets.list = AsyncMock(return_value=mock_my_datasets)
     trainml.datasets.list_public = AsyncMock(return_value=mock_public_datasets)
     trainml.checkpoints.list = AsyncMock(return_value=mock_my_checkpoints)
-    trainml.checkpoints.list_public = AsyncMock(
-        return_value=mock_public_checkpoints
-    )
+    trainml.checkpoints.list_public = AsyncMock(return_value=mock_public_checkpoints)
     trainml.models.list = AsyncMock(return_value=mock_models)
+    trainml.volumes.list = AsyncMock(return_value=mock_my_volumes)
     trainml.gpu_types.list = AsyncMock(return_value=mock_gpu_types)
     trainml.environments.list = AsyncMock(return_value=mock_environments)
     trainml.jobs.list = AsyncMock(return_value=mock_jobs)
@@ -950,13 +1027,9 @@ def mock_trainml(
     trainml.cloudbender.devices = create_autospec(Nodes)
     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.datastores.list = AsyncMock(return_value=mock_datastores)
     trainml.cloudbender.reservations = create_autospec(Reservations)
-    trainml.cloudbender.reservations.list = AsyncMock(
-        return_value=mock_reservations
-    )
+    trainml.cloudbender.reservations.list = AsyncMock(return_value=mock_reservations)
     trainml.cloudbender.device_configs = create_autospec(DeviceConfigs)
     trainml.cloudbender.device_configs.list = AsyncMock(
         return_value=mock_device_configs