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

tests/integration/test_jobs_integration.py

@@ -430,7 +430,7 @@ class JobIOTests:
             source_uri="git@github.com:trainML/environment-tests.git",
         )
         await model.wait_for("ready", 300)
-        assert model.size >= 200000
+        assert model.size >= 50000
 
         job = await trainml.jobs.create(
             "CLI Automated Tests - Training With trainML Model Output",

trainml/__init__.py

@@ -13,5 +13,5 @@ logging.basicConfig(
 logger = logging.getLogger(__name__)
 
 
-__version__ = "0.5.2"
+__version__ = "0.5.4"
 __all__ = "TrainML"

trainml/cli/job/create.py

@@ -268,9 +268,7 @@ def notebook(
         options["environment"]["type"] = environment
 
     try:
-        envs = [
-            {"key": e.split("=")[0], "value": e.split("=")[1]} for e in env
-        ]
+        envs = [{"key": e.split("=")[0], "value": e.split("=")[1]} for e in env]
         options["environment"]["env"] = envs
     except IndexError:
         raise click.UsageError(
@@ -284,16 +282,12 @@ def notebook(
         if pip_packages:
             options["environment"]["packages"]["pip"] = pip_packages.split(",")
         if conda_packages:
-            options["environment"]["packages"]["conda"] = conda_packages.split(
-                ","
-            )
+            options["environment"]["packages"]["conda"] = conda_packages.split(",")
 
     if data_dir:
         click.echo("Creating Dataset..", file=config.stdout)
         new_dataset = config.trainml.run(
-            config.trainml.client.datasets.create(
-                f"Job - {name}", "local", data_dir
-            )
+            config.trainml.client.datasets.create(f"Job - {name}", "local", data_dir)
         )
         if attach:
             config.trainml.run(new_dataset.attach(), new_dataset.connect())
@@ -302,9 +296,7 @@ def notebook(
             config.trainml.run(new_dataset.connect())
             config.trainml.run(new_dataset.wait_for("ready"))
             config.trainml.run(new_dataset.disconnect())
-        options["data"]["datasets"].append(
-            dict(id=new_dataset.id, type="existing")
-        )
+        options["data"]["datasets"].append(dict(id=new_dataset.id, type="existing"))
 
     if git_uri:
         options["model"]["source_type"] = "git"
@@ -397,7 +389,8 @@ def notebook(
         ],
         case_sensitive=False,
     ),
-    default="rtx3090",
+    default=["rtx3090"],
+    multiple=True,
     show_default=True,
     help="GPU type.",
 )
@@ -619,21 +612,15 @@ def training(
     if output_type:
         options["data"]["output_type"] = output_type
         options["data"]["output_uri"] = output_uri
-        options["data"]["output_options"] = dict(
-            archive=archive, save_model=save_model
-        )
+        options["data"]["output_options"] = dict(archive=archive, save_model=save_model)
 
     if output_dir:
         options["data"]["output_type"] = "local"
         options["data"]["output_uri"] = output_dir
-        options["data"]["output_options"] = dict(
-            archive=archive, save_model=save_model
-        )
+        options["data"]["output_options"] = dict(archive=archive, save_model=save_model)
 
     try:
-        envs = [
-            {"key": e.split("=")[0], "value": e.split("=")[1]} for e in env
-        ]
+        envs = [{"key": e.split("=")[0], "value": e.split("=")[1]} for e in env]
         options["environment"]["env"] = envs
     except IndexError:
         raise click.UsageError(
@@ -647,16 +634,12 @@ def training(
         if pip_packages:
             options["environment"]["packages"]["pip"] = pip_packages.split(",")
         if conda_packages:
-            options["environment"]["packages"]["conda"] = conda_packages.split(
-                ","
-            )
+            options["environment"]["packages"]["conda"] = conda_packages.split(",")
 
     if data_dir:
         click.echo("Creating Dataset..", file=config.stdout)
         new_dataset = config.trainml.run(
-            config.trainml.client.datasets.create(
-                f"Job - {name}", "local", data_dir
-            )
+            config.trainml.client.datasets.create(f"Job - {name}", "local", data_dir)
         )
         if attach:
             config.trainml.run(new_dataset.attach(), new_dataset.connect())
@@ -665,9 +648,7 @@ def training(
             config.trainml.run(new_dataset.connect())
             config.trainml.run(new_dataset.wait_for("ready"))
             config.trainml.run(new_dataset.disconnect())
-        options["data"]["datasets"].append(
-            dict(id=new_dataset.id, type="existing")
-        )
+        options["data"]["datasets"].append(dict(id=new_dataset.id, type="existing"))
 
     if git_uri:
         options["model"]["source_type"] = "git"
@@ -751,8 +732,9 @@ def training(
         ],
         case_sensitive=False,
     ),
-    default="rtx3090",
+    default=["rtx3090"],
     show_default=True,
+    multiple=True,
     help="GPU type.",
 )
 @click.option(
@@ -975,21 +957,15 @@ def inference(
     if output_type:
         options["data"]["output_type"] = output_type
         options["data"]["output_uri"] = output_uri
-        options["data"]["output_options"] = dict(
-            archive=archive, save_model=save_model
-        )
+        options["data"]["output_options"] = dict(archive=archive, save_model=save_model)
 
     if output_dir:
         options["data"]["output_type"] = "local"
         options["data"]["output_uri"] = output_dir
-        options["data"]["output_options"] = dict(
-            archive=archive, save_model=save_model
-        )
+        options["data"]["output_options"] = dict(archive=archive, save_model=save_model)
 
     try:
-        envs = [
-            {"key": e.split("=")[0], "value": e.split("=")[1]} for e in env
-        ]
+        envs = [{"key": e.split("=")[0], "value": e.split("=")[1]} for e in env]
         options["environment"]["env"] = envs
     except IndexError:
         raise click.UsageError(
@@ -1003,9 +979,7 @@ def inference(
         if pip_packages:
             options["environment"]["packages"]["pip"] = pip_packages.split(",")
         if conda_packages:
-            options["environment"]["packages"]["conda"] = conda_packages.split(
-                ","
-            )
+            options["environment"]["packages"]["conda"] = conda_packages.split(",")
 
     if git_uri:
         options["model"]["source_type"] = "git"
@@ -1125,8 +1099,9 @@ def from_json(config, attach, connect, file):
         ],
         case_sensitive=False,
     ),
-    default="rtx3090",
+    default=["rtx3090"],
     show_default=True,
+    multiple=True,
     help="GPU type.",
 )
 @click.option(
@@ -1296,9 +1271,7 @@ def endpoint(
         options["environment"]["type"] = environment
 
     try:
-        envs = [
-            {"key": e.split("=")[0], "value": e.split("=")[1]} for e in env
-        ]
+        envs = [{"key": e.split("=")[0], "value": e.split("=")[1]} for e in env]
         options["environment"]["env"] = envs
     except IndexError:
         raise click.UsageError(
@@ -1312,9 +1285,7 @@ def endpoint(
         if pip_packages:
             options["environment"]["packages"]["pip"] = pip_packages.split(",")
         if conda_packages:
-            options["environment"]["packages"]["conda"] = conda_packages.split(
-                ","
-            )
+            options["environment"]["packages"]["conda"] = conda_packages.split(",")
 
     if git_uri:
         options["model"]["source_type"] = "git"
@@ -1356,6 +1327,4 @@ def endpoint(
             click.echo("Waiting for job to start...", file=config.stdout)
             config.trainml.run(job.wait_for("running", timeout))
             config.trainml.run(job.refresh())
-            click.echo(
-                f"Endpoint is running at:  {job.url}", file=config.stdout
-            )
+            click.echo(f"Endpoint is running at:  {job.url}", file=config.stdout)

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

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

{trainml-0.5.2.dist-info → trainml-0.5.4.dist-info}/RECORD

@@ -8,7 +8,7 @@ tests/integration/test_checkpoints_integration.py,sha256=Ev-GxXiBupOi3KduYoEMhb2
 tests/integration/test_datasets_integration.py,sha256=jskX8y9moLvAkZLcQL4iSBrUXSGGuWJ95Vw1JuxxwD8,3424
 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=0fMg7kOjQMotEo40XnerAamqhhRbb4pz0ZhmvVrwlb0,23342
+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
@@ -52,7 +52,7 @@ 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=PACqklwvG2CiPJqOAaEZLAgJyM6nllgNp0p12pqDYUc,432
+trainml/__init__.py,sha256=b1pGUEOpzHMAPktJyTxWgK4NQHepd3bMK3V8DomanVg,432
 trainml/__main__.py,sha256=JgErYkiskih8Y6oRwowALtR-rwQhAAdqOYWjQraRIPI,59
 trainml/auth.py,sha256=gruZv27nhttrCbhcVQTH9kZkF2uMm1E06SwA_2pQAHQ,26565
 trainml/checkpoints.py,sha256=726yaeTHzIPvkQ-BhqmvJ6u0s1Oh732N6UAFbuWEv0Q,8274
@@ -84,7 +84,7 @@ trainml/cli/cloudbender/provider.py,sha256=oFjZWKfFQjNY7OtDu7nUdfv-RTmQc_Huuug96
 trainml/cli/cloudbender/region.py,sha256=X6-FYOb-pGpOEazn-NbsYSwa9ergB7FGATFkTe4a8Pk,2892
 trainml/cli/cloudbender/reservation.py,sha256=z2oMYwp-w_Keo1DepKUtuRnwiGz2VscVHDYWEFap1gs,3569
 trainml/cli/job/__init__.py,sha256=ljY-ELeXhXQ7txASbJEKGBom7OXfNyy7sWILz3nxRAE,6545
-trainml/cli/job/create.py,sha256=QDxHTSpiAjdnmGxUhBASwSNbL1pYqGoCV12UnB-c4N4,34655
+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/datastores.py,sha256=biVGifedc3r1DcuxsfCQh-f1Tw4HcJMMJfdgHxPfkKM,3506
@@ -94,9 +94,9 @@ 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.2.dist-info/LICENSE,sha256=s0lpBxhSSUEpMavwde-Vb6K_K7xDCTTvSpNznVqVGR0,1069
-trainml-0.5.2.dist-info/METADATA,sha256=RGNR1MBae8_fsnjuBRWPTi0d2fGR7ctzdSP5YOwC2Og,7345
-trainml-0.5.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-trainml-0.5.2.dist-info/entry_points.txt,sha256=OzBDm2wXby1bSGF02jTVxzRFZLejnbFiLHXhKdW3Bds,63
-trainml-0.5.2.dist-info/top_level.txt,sha256=Y1kLFRWKUW7RG8BX7cvejHF_yW8wBOaRYF1JQHENY4w,23
-trainml-0.5.2.dist-info/RECORD,,
+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,,