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

trainml/trainml.py

@@ -10,6 +10,7 @@ from trainml.auth import Auth
 from trainml.datasets import Datasets
 from trainml.models import Models
 from trainml.checkpoints import Checkpoints
+from trainml.volumes import Volumes
 from trainml.jobs import Jobs
 from trainml.gpu_types import GpuTypes
 from trainml.environments import Environments
@@ -66,6 +67,7 @@ class TrainML(object):
         self.datasets = Datasets(self)
         self.models = Models(self)
         self.checkpoints = Checkpoints(self)
+        self.volumes = Volumes(self)
         self.jobs = Jobs(self)
         self.gpu_types = GpuTypes(self)
         self.environments = Environments(self)
@@ -117,9 +119,7 @@ class TrainML(object):
         )
         if params:
             if not isinstance(params, dict):
-                raise TrainMLException(
-                    "Query parameters must be a valid dictionary"
-                )
+                raise TrainMLException("Query parameters must be a valid dictionary")
             params = {
                 k: (str(v).lower() if isinstance(v, bool) else v)
                 for k, v in params.items()
@@ -155,13 +155,9 @@ class TrainML(object):
                     content_type = resp.headers.get("content-type", "")
                     resp.close()
                     if content_type == "application/json":
-                        raise ApiError(
-                            resp.status, json.loads(what.decode("utf8"))
-                        )
+                        raise ApiError(resp.status, json.loads(what.decode("utf8")))
                     else:
-                        raise ApiError(
-                            resp.status, {"message": what.decode("utf8")}
-                        )
+                        raise ApiError(resp.status, {"message": what.decode("utf8")})
                 results = await resp.json()
                 return results
 
@@ -273,15 +269,11 @@ class TrainML(object):
                     logging.debug(f"Websocket Disconnected.  Done? {done}")
                 except Exception as e:
                     connection_tries += 1
-                    logging.debug(
-                        f"Connection error: {traceback.format_exc()}"
-                    )
+                    logging.debug(f"Connection error: {traceback.format_exc()}")
                     if connection_tries == 5:
                         raise ApiError(
                             500,
-                            {
-                                "message": f"Connection error: {traceback.format_exc()}"
-                            },
+                            {"message": f"Connection error: {traceback.format_exc()}"},
                         )
 
     def set_active_project(self, project_uuid):

trainml/volumes.py

@@ -0,0 +1,255 @@
+import json
+import logging
+import math
+import asyncio
+from datetime import datetime
+
+from .exceptions import (
+    VolumeError,
+    ApiError,
+    SpecificationError,
+    TrainMLException,
+)
+from .connections import Connection
+
+
+class Volumes(object):
+    def __init__(self, trainml):
+        self.trainml = trainml
+
+    async def get(self, id, **kwargs):
+        resp = await self.trainml._query(f"/volume/{id}", "GET", kwargs)
+        return Volume(self.trainml, **resp)
+
+    async def list(self, **kwargs):
+        resp = await self.trainml._query(f"/volume", "GET", kwargs)
+        volumes = [Volume(self.trainml, **volume) for volume in resp]
+        return volumes
+
+    async def create(self, name, source_type, source_uri, capacity, **kwargs):
+        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.trainml.active_project,
+        )
+        payload = {k: v for k, v in data.items() if v is not None}
+        logging.info(f"Creating Volume {name}")
+        resp = await self.trainml._query("/volume", "POST", None, payload)
+        volume = Volume(self.trainml, **resp)
+        logging.info(f"Created Volume {name} with id {volume.id}")
+
+        return volume
+
+    async def remove(self, id, **kwargs):
+        await self.trainml._query(f"/volume/{id}", "DELETE", dict(**kwargs, force=True))
+
+
+class Volume:
+    def __init__(self, trainml, **kwargs):
+        self.trainml = trainml
+        self._volume = kwargs
+        self._id = self._volume.get("id", self._volume.get("id"))
+        self._status = self._volume.get("status")
+        self._name = self._volume.get("name")
+        self._capacity = self._volume.get("capacity")
+        self._used_size = self._volume.get("used_size")
+        self._billed_size = self._volume.get("billed_size")
+        self._project_uuid = self._volume.get("project_uuid")
+
+    @property
+    def id(self) -> str:
+        return self._id
+
+    @property
+    def status(self) -> str:
+        return self._status
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    @property
+    def capacity(self) -> str:
+        return self._capacity
+
+    @property
+    def used_size(self) -> int:
+        return self._used_size
+
+    @property
+    def billed_size(self) -> int:
+        return self._billed_size
+
+    def __str__(self):
+        return json.dumps({k: v for k, v in self._volume.items()})
+
+    def __repr__(self):
+        return f"Volume( trainml , **{self._volume.__repr__()})"
+
+    def __bool__(self):
+        return bool(self._id)
+
+    async def get_log_url(self):
+        resp = await self.trainml._query(
+            f"/volume/{self._id}/logs",
+            "GET",
+            dict(project_uuid=self._project_uuid),
+        )
+        return resp
+
+    async def get_details(self):
+        resp = await self.trainml._query(
+            f"/volume/{self._id}/details",
+            "GET",
+            dict(project_uuid=self._project_uuid),
+        )
+        return resp
+
+    async def get_connection_utility_url(self):
+        resp = await self.trainml._query(
+            f"/volume/{self._id}/download",
+            "GET",
+            dict(project_uuid=self._project_uuid),
+        )
+        return resp
+
+    def get_connection_details(self):
+        if self._volume.get("vpn"):
+            details = dict(
+                entity_type="volume",
+                project_uuid=self._volume.get("project_uuid"),
+                cidr=self._volume.get("vpn").get("cidr"),
+                ssh_port=self._volume.get("vpn").get("client").get("ssh_port"),
+                input_path=(
+                    self._volume.get("source_uri")
+                    if self.status in ["new", "downloading"]
+                    else None
+                ),
+                output_path=(
+                    self._volume.get("output_uri")
+                    if self.status == "exporting"
+                    else None
+                ),
+            )
+        else:
+            details = dict()
+        return details
+
+    async def connect(self):
+        if self.status in ["ready", "failed"]:
+            raise SpecificationError(
+                "status",
+                f"You can only connect to downloading or exporting volumes.",
+            )
+        if self.status == "new":
+            await self.wait_for("downloading")
+        connection = Connection(
+            self.trainml, entity_type="volume", id=self.id, entity=self
+        )
+        await connection.start()
+        return connection.status
+
+    async def disconnect(self):
+        connection = Connection(
+            self.trainml, entity_type="volume", id=self.id, entity=self
+        )
+        await connection.stop()
+        return connection.status
+
+    async def remove(self, force=False):
+        await self.trainml._query(
+            f"/volume/{self._id}",
+            "DELETE",
+            dict(project_uuid=self._project_uuid, force=force),
+        )
+
+    async def rename(self, name):
+        resp = await self.trainml._query(
+            f"/volume/{self._id}",
+            "PATCH",
+            dict(project_uuid=self._project_uuid),
+            dict(name=name),
+        )
+        self.__init__(self.trainml, **resp)
+        return self
+
+    async def export(self, output_type, output_uri, output_options=dict()):
+        resp = await self.trainml._query(
+            f"/volume/{self._id}/export",
+            "POST",
+            dict(project_uuid=self._project_uuid),
+            dict(
+                output_type=output_type,
+                output_uri=output_uri,
+                output_options=output_options,
+            ),
+        )
+        self.__init__(self.trainml, **resp)
+        return self
+
+    def _get_msg_handler(self, msg_handler):
+        def handler(data):
+            if data.get("type") == "subscription":
+                if msg_handler:
+                    msg_handler(data)
+                else:
+                    timestamp = datetime.fromtimestamp(int(data.get("time")) / 1000)
+                    print(
+                        f"{timestamp.strftime('%m/%d/%Y, %H:%M:%S')}: {data.get('msg').rstrip()}"
+                    )
+
+        return handler
+
+    async def attach(self, msg_handler=None):
+        await self.refresh()
+        if self.status not in ["ready", "failed"]:
+            await self.trainml._ws_subscribe(
+                "volume",
+                self._project_uuid,
+                self.id,
+                self._get_msg_handler(msg_handler),
+            )
+
+    async def refresh(self):
+        resp = await self.trainml._query(
+            f"/volume/{self.id}",
+            "GET",
+            dict(project_uuid=self._project_uuid),
+        )
+        self.__init__(self.trainml, **resp)
+        return self
+
+    async def wait_for(self, status, timeout=300):
+        valid_statuses = ["downloading", "ready", "archived"]
+        if not status in valid_statuses:
+            raise SpecificationError(
+                "status",
+                f"Invalid wait_for status {status}.  Valid statuses are: {valid_statuses}",
+            )
+        if self.status == status:
+            return
+        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
+            elif self.status == "failed":
+                raise VolumeError(self.status, self)
+            else:
+                count += 1
+                logging.debug(f"self: {self}, retry count {count}")
+
+        raise TrainMLException(f"Timeout waiting for {status}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trainml
-Version: 0.5.4
+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.4.dist-info → trainml-0.5.6.dist-info}/RECORD

@@ -4,18 +4,18 @@ examples/local_storage.py,sha256=w8iAeqr5CLOCOkNrqGzEDtybjDGGY7SQUqeE0ibMUrM,174
 examples/training_inference_pipeline.py,sha256=SNr4RFT9y69F9G9tMD8ONUbJmXRFrq1yxynq-FbfEf8,2334
 tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/integration/conftest.py,sha256=VWWTfofsFcBOdSCXQxNYbMcDEEaErDi2wFFMn--LE4Y,1134
-tests/integration/test_checkpoints_integration.py,sha256=Ev-GxXiBupOi3KduYoEMhb2u-MZFEBTCi-E2zJgQ5AA,3128
-tests/integration/test_datasets_integration.py,sha256=jskX8y9moLvAkZLcQL4iSBrUXSGGuWJ95Vw1JuxxwD8,3424
+tests/integration/test_checkpoints_integration.py,sha256=mLha1BhVZ916OJIDOKF6vah3kxJXQu7pbAsHq7lsNCE,3230
+tests/integration/test_datasets_integration.py,sha256=zdHOevduuMUWvVxaHBslpmH8AdvPdqEJ95MdqCC5_rw,3499
 tests/integration/test_environments_integration.py,sha256=0IckhJvQhd8j4Ouiu0hMq2b7iA1dbZpZYmknyfWjsFM,1403
 tests/integration/test_gpu_types_integration.py,sha256=V2OncokZWWVq_l5FSmKEDM4EsWrmpB-zKiVPt-we0aY,1256
-tests/integration/test_jobs_integration.py,sha256=A70q7QADTeETqUsjEkrHaPAbB13GIYiBecTtWhailwA,23341
-tests/integration/test_models_integration.py,sha256=xJPq_3m0Cf1liMH8e49ON_L3MO5XcPtJIz_MD9plkyU,2848
-tests/integration/test_projects_integration.py,sha256=_tmMRFFBe29WaWWuEy3_0j7SKyJc_60JS99hgJUHTG4,1492
-tests/integration/test_providers_integration.py,sha256=bBVvlSDLCnofSaD36OB21KlinEKeK04gPB--bbHJiP0,1419
+tests/integration/test_jobs_integration.py,sha256=Wpva99kfDWz1IRI-2l8GoHgpLsY-cVIIAWRNj_ik2I8,24730
+tests/integration/test_models_integration.py,sha256=UPRAz0lcpzGihsnDUARoafbd5sZ6OM8TIeh8HNN6Bg0,2902
+tests/integration/test_projects_integration.py,sha256=BX-LqLfzawTQUhtx--5dw7QqR8kl_CJvwSCyNXDUQTw,1446
+tests/integration/test_volumes_integration.py,sha256=gOmZpwwFxqeOAVmfKWSTmuyshx8nb2zu_0xv1RUEepM,3270
 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=AZfqMjB6qXyJdH6cRpxrZK4ciioG6HJTQIIDDkJB2H8,29059
+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,9 +25,9 @@ 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_providers_unit.py,sha256=nEizghnC8pfDubkCw-kMmS_QQOUUWBk3i8D44pnyljo,3700
+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
 tests/unit/cli/conftest.py,sha256=w6p_2URicywJKUCtY79tSD_mx8cwJtxHbK_Lu3grOYs,236
 tests/unit/cli/test_cli_checkpoint_unit.py,sha256=6gO6PWWxNJiL520mhTFkSUJT7p5-dptLwUgDjPeHNrA,702
@@ -36,14 +36,15 @@ 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
 tests/unit/cli/cloudbender/test_cli_device_unit.py,sha256=2BSMyXQ8fOzNKh_-pa_tx7fy_GCdNlGLNvkiA7vuV7s,1342
 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
@@ -52,41 +53,42 @@ 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=b1pGUEOpzHMAPktJyTxWgK4NQHepd3bMK3V8DomanVg,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
 trainml/connections.py,sha256=h-S1NZbOkaXpIlpRStA6q-3eXc_OMlFWOLzF8R9SVG8,20029
 trainml/datasets.py,sha256=5zhxpmK12aA7iXp4n-8bD00Tie7bi3LU0tPNJKdnZlY,7935
 trainml/environments.py,sha256=OH4o08zXZ7IJ2CiA1rPnys2Fl45r8qvQHfM2mCBRAIc,1507
-trainml/exceptions.py,sha256=hhR78fI8rbU3fWQ-kUsgxOLyYP8D2bQcjLjrskqPG0Q,3724
+trainml/exceptions.py,sha256=MG1FkcjRacv3HoPuBS1IWLCUk0wGHEQ6DaOzXNymsNI,4094
 trainml/gpu_types.py,sha256=mm-dwfYc02192bmYPIJmzesndyBcoOdkKYBaYZXOUwU,1901
-trainml/jobs.py,sha256=cUuiMvtJSFSupv2jy7fqAvUOkO8FRLfBDe3RuSZUjfE,17807
+trainml/jobs.py,sha256=iuSKkZDK908K0JwZjSbEk1G6IzdKp7vGkXsAUfih6R8,17838
 trainml/models.py,sha256=Lqs3OJMuOZXx8cfGFNC3JZ8nVK6l9_jU1xM1Uw1c5UQ,7750
-trainml/projects.py,sha256=Jk-0xhEgBFPIVMAK_Szxp3B-h-tJJSIEtTF8JWAYzo8,5209
-trainml/providers.py,sha256=97VegYVSeK0BuYv04hfBY_awNBbGz_GR_mdDrknfO-A,1844
-trainml/trainml.py,sha256=OrDXkJiStA_fTkwl0HX529n-cPCQUTVfdMOX-w0u1Oo,11045
-trainml/cli/__init__.py,sha256=-lA19Djkvqr1I-5PWoONgzHia-Lkg0J45dzt7qbetD8,4338
+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
 trainml/cli/checkpoint.py,sha256=8Rh4bmFwJ4DKlIjHK-FLTeRynABqKCgIUGRtbQhAsX4,7170
 trainml/cli/connection.py,sha256=ELV6bPL30dzttFNxDU7Fb74R8oPL_E70k7TcJEzbwtQ,1700
 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/job.py,sha256=Xh_542a2rjAjhXyq8WG9ZEySboq_MmFQ7sCqYJYRXcM,4302
 trainml/cli/model.py,sha256=hR23E6ttRXcLk-RofkPK6wUXMO7OU6sT6jTEHTmUg9Q,6111
-trainml/cli/project.py,sha256=iar4-Aic6k0O6HWfxB5vJ5EtjS4aAaw2g8wW7H-3Bjk,3522
-trainml/cli/provider.py,sha256=eaklYo0IUOGeyZ0ziZZz6UhOZ50Py4ewaPtWA9UDCqU,1594
-trainml/cli/cloudbender/__init__.py,sha256=ewat7I7PvHQEW0a8zuky28kuMwtjL-gFQOAQmG0mmJA,534
+trainml/cli/project.py,sha256=f772bHs68AVRY60l7dbVKgeDmDC3u2bZjqrz7zm7xvQ,3314
+trainml/cli/volume.py,sha256=kDUss93N78DT-YlLjC6I3jEq5nBWfRNNR5M4tY_F_Zg,6246
+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.4.dist-info/LICENSE,sha256=s0lpBxhSSUEpMavwde-Vb6K_K7xDCTTvSpNznVqVGR0,1069
-trainml-0.5.4.dist-info/METADATA,sha256=wn_jbVRuNQilNHWaiOoAcCXAR02Z1VYBRufLF_56iSU,7345
-trainml-0.5.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-trainml-0.5.4.dist-info/entry_points.txt,sha256=OzBDm2wXby1bSGF02jTVxzRFZLejnbFiLHXhKdW3Bds,63
-trainml-0.5.4.dist-info/top_level.txt,sha256=Y1kLFRWKUW7RG8BX7cvejHF_yW8wBOaRYF1JQHENY4w,23
-trainml-0.5.4.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,,

tests/integration/test_providers_integration.py

@@ -1,46 +0,0 @@
-import re
-import sys
-import asyncio
-from pytest import mark, fixture
-
-pytestmark = [mark.sdk, mark.integration, mark.providers]
-
-
-@mark.create
-@mark.asyncio
-class GetProvidersTests:
-    @fixture(scope="class")
-    async def provider(self, trainml):
-        provider = await trainml.providers.enable(type="test")
-        yield provider
-        await provider.remove()
-
-    async def test_get_providers(self, trainml):
-        providers = await trainml.providers.list()
-        assert len(providers) > 0
-
-    async def test_get_provider(self, trainml, provider):
-        response = await trainml.providers.get(provider.id)
-        assert response.id == provider.id
-
-    async def test_provider_properties(self, provider):
-        assert isinstance(provider.id, str)
-        assert isinstance(provider.type, str)
-        assert provider.type == "test"
-        assert provider.credits == 0
-
-    async def test_provider_str(self, provider):
-        string = str(provider)
-        regex = r"^{.*\"provider_uuid\": \"" + provider.id + r"\".*}$"
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    async def test_provider_repr(self, provider):
-        string = repr(provider)
-        regex = (
-            r"^Provider\( trainml , \*\*{.*'provider_uuid': '"
-            + provider.id
-            + r"'.*}\)$"
-        )
-        assert isinstance(string, str)
-        assert re.match(regex, string)

tests/unit/test_providers_unit.py

@@ -1,125 +0,0 @@
-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.providers as specimen
-from trainml.exceptions import (
-    ApiError,
-    SpecificationError,
-    TrainMLException,
-)
-
-pytestmark = [mark.sdk, mark.unit, mark.providers]
-
-
-@fixture
-def providers(mock_trainml):
-    yield specimen.Providers(mock_trainml)
-
-
-@fixture
-def provider(mock_trainml):
-    yield specimen.Provider(
-        mock_trainml,
-        customer_uuid="a",
-        provider_uuid="1",
-        type="physical",
-        payment_mode="credits",
-        createdAt="2020-12-31T23:59:59.000Z",
-        credits=0.0,
-    )
-
-
-class ProvidersTests:
-    @mark.asyncio
-    async def test_get_provider(
-        self,
-        providers,
-        mock_trainml,
-    ):
-        api_response = dict()
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        await providers.get("1234")
-        mock_trainml._query.assert_called_once_with("/provider/1234", "GET")
-
-    @mark.asyncio
-    async def test_list_providers(
-        self,
-        providers,
-        mock_trainml,
-    ):
-        api_response = dict()
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        await providers.list()
-        mock_trainml._query.assert_called_once_with("/provider", "GET")
-
-    @mark.asyncio
-    async def test_remove_provider(
-        self,
-        providers,
-        mock_trainml,
-    ):
-        api_response = dict()
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        await providers.remove("4567")
-        mock_trainml._query.assert_called_once_with("/provider/4567", "DELETE")
-
-    @mark.asyncio
-    async def test_enable_provider_simple(self, providers, mock_trainml):
-        requested_config = dict(
-            type="physical",
-        )
-        expected_payload = dict(type="physical")
-        api_response = {
-            "customer_uuid": "cust-id-1",
-            "provider_uuid": "provider-id-1",
-            "type": "new provider",
-            "credits": 0.0,
-            "payment_mode": "credits",
-            "createdAt": "2020-12-31T23:59:59.000Z",
-        }
-
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        response = await providers.enable(**requested_config)
-        mock_trainml._query.assert_called_once_with(
-            "/provider", "POST", None, expected_payload
-        )
-        assert response.id == "provider-id-1"
-
-
-class providerTests:
-    def test_provider_properties(self, provider):
-        assert isinstance(provider.id, str)
-        assert isinstance(provider.type, str)
-        assert isinstance(provider.credits, float)
-
-    def test_provider_str(self, provider):
-        string = str(provider)
-        regex = r"^{.*\"provider_uuid\": \"" + provider.id + r"\".*}$"
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    def test_provider_repr(self, provider):
-        string = repr(provider)
-        regex = (
-            r"^Provider\( trainml , \*\*{.*'provider_uuid': '"
-            + provider.id
-            + r"'.*}\)$"
-        )
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    def test_provider_bool(self, provider, mock_trainml):
-        empty_provider = specimen.Provider(mock_trainml)
-        assert bool(provider)
-        assert not bool(empty_provider)
-
-    @mark.asyncio
-    async def test_provider_remove(self, provider, mock_trainml):
-        api_response = dict()
-        mock_trainml._query = AsyncMock(return_value=api_response)
-        await provider.remove()
-        mock_trainml._query.assert_called_once_with("/provider/1", "DELETE")