cluster and node related params added to job creating commands

Author: kossak

paperspace/cli/common.py

@@ -1,5 +1,6 @@
 import functools
 import getpass
+import json
 
 import click
 from click_didyoumean import DYMMixin
@@ -19,6 +20,16 @@ def del_if_value_is_none(dict_):
             del dict_[key]
 
 
+def jsonify_dicts(dict_):
+    json_fields = [
+        "envVars",
+        "nodeAttrs"
+    ]
+    for field in json_fields:
+        if field in dict_:
+            dict_[field] = json.dumps(dict_[field])
+
+
 class ClickGroup(DYMMixin, HelpColorsGroup):
     def group(self, *args, **kwargs):
         aliases = []

paperspace/cli/jobs.py

@@ -5,7 +5,7 @@
 from paperspace import client, config
 from paperspace.cli.cli import cli
 from paperspace.cli.cli_types import json_string
-from paperspace.cli.common import api_key_option, del_if_value_is_none, ClickGroup
+from paperspace.cli.common import api_key_option, del_if_value_is_none, ClickGroup, jsonify_dicts
 from paperspace.commands import jobs as jobs_commands
 
 
@@ -89,6 +89,9 @@ def common_jobs_create_options(f):
         click.option("--relDockerfilePath", "relDockerfilePath", help="Relative path to Dockerfile"),
         click.option("--registryUsername", "registryUsername", help="Docker registry username"),
         click.option("--registryPassword", "registryPassword", help="Docker registry password"),
+        click.option("--cluster", "cluster", help="Cluster name"),
+        click.option("--clusterId", "cluster", help="Cluster id"),
+        click.option("--nodeAttrs", "nodeAttrs", type=json_string, help="Cluster node details"),
     ]
     return functools.reduce(lambda x, opt: opt(x), reversed(options), f)
 
@@ -99,6 +102,8 @@ def common_jobs_create_options(f):
 @click.pass_context
 def create_job(ctx, api_key, **kwargs):
     del_if_value_is_none(kwargs)
+    jsonify_dicts(kwargs)
+
     jobs_api = client.API(config.CONFIG_HOST, api_key=api_key)
     command = jobs_commands.CreateJobCommand(api=jobs_api)
     job = command.execute(kwargs)

paperspace/cli/run.py

@@ -3,7 +3,7 @@
 from paperspace import client, config
 from paperspace.cli import common
 from paperspace.cli.cli import cli
-from paperspace.cli.common import del_if_value_is_none, deprecated
+from paperspace.cli.common import del_if_value_is_none, deprecated, jsonify_dicts
 from paperspace.cli.jobs import common_jobs_create_options
 from paperspace.commands.run import RunCommand
 from paperspace.constants import RunMode
@@ -19,6 +19,8 @@
 @common.api_key_option
 def run(api_key, **kwargs):
     del_if_value_is_none(kwargs)
+    jsonify_dicts(kwargs)
+
     jobs_api = client.API(config.CONFIG_HOST, api_key=api_key)
     command = RunCommand(api=jobs_api)
     command.execute(**kwargs)