Showing logs for experiments createAndStart by default

Author: BartoszCki

paperspace/cli/experiments.py

@@ -235,13 +235,6 @@ def common_experiments_create_single_node_options(f):
     return functools.reduce(lambda x, opt: opt(x), reversed(options), f)
 
 
-show_logs_option = click.option(
-    "--logs/--no-logs",
-    "show_logs",
-    default=False,
-)
-
-
 @create_experiment.command(name="multinode", help="Create multi node experiment")
 @common_experiments_create_options
 @common_experiment_create_multi_node_options
@@ -266,7 +259,14 @@ def create_single_node(api_key, **kwargs):
 @create_and_start_experiment.command(name="multinode", help="Create and start new multi node experiment")
 @common_experiments_create_options
 @common_experiment_create_multi_node_options
-@show_logs_option
+@click.option(
+    "--no-logs",
+    "show_logs",
+    is_flag=True,
+    flag_value=False,
+    default=True,
+    help="Don't show logs. Only create, start and exit",
+)
 @click.pass_context
 def create_and_start_multi_node(ctx, api_key, show_logs, **kwargs):
     del_if_value_is_none(kwargs)
@@ -280,7 +280,14 @@ def create_and_start_multi_node(ctx, api_key, show_logs, **kwargs):
 @create_and_start_experiment.command(name="singlenode", help="Create and start new single node experiment")
 @common_experiments_create_options
 @common_experiments_create_single_node_options
-@show_logs_option
+@click.option(
+    "--no-logs",
+    "show_logs",
+    is_flag=True,
+    flag_value=False,
+    default=True,
+    help="Don't show logs. Only create, start and exit",
+)
 @click.pass_context
 def create_and_start_single_node(ctx, api_key, show_logs, **kwargs):
     kwargs["experimentTypeId"] = constants.ExperimentType.SINGLE_NODE
@@ -295,7 +302,12 @@ def create_and_start_single_node(ctx, api_key, show_logs, **kwargs):
 @experiments.command("start", help="Start experiment")
 @click.argument("experiment-id")
 @api_key_option
-@show_logs_option
+@click.option(
+    "--logs",
+    "show_logs",
+    is_flag=True,
+    help="Show logs",
+)
 @click.pass_context
 def start_experiment(ctx, experiment_id, show_logs, api_key):
     experiments_api = client.API(config.CONFIG_EXPERIMENTS_HOST, api_key=api_key)

tests/functional/test_experiments.py

@@ -263,6 +263,7 @@ class TestExperimentsCreateAndStartSingleNode(TestExperimentsCreateSingleNode):
         "--machineType", "testType",
         "--command", "testCommand",
         "--workspaceUrl", "some-workspace",
+        "--no-logs",
     ]
     FULL_OPTIONS_COMMAND = [
         "experiments", "createAndStart", "singlenode",
@@ -282,6 +283,7 @@ class TestExperimentsCreateAndStartSingleNode(TestExperimentsCreateSingleNode):
         "--registryUsername", "userName",
         "--registryPassword", "passwd",
         "--apiKey", "some_key",
+        "--no-logs",
     ]
     EXPECTED_STDOUT = "New experiment created and started with ID: sadkfhlskdjh\n"
 
@@ -303,6 +305,7 @@ class TestExperimentsCreateAndStartMultiNode(TestExperimentsCreateMultiNode):
         "--parameterServerCount", 2,
         "--workerContainerUser", "usr",
         "--workspaceUrl", "some-workspace",
+        "--no-logs",
     ]
     FULL_OPTIONS_COMMAND = [
         "experiments", "createAndStart", "multinode",
@@ -331,6 +334,7 @@ class TestExperimentsCreateAndStartMultiNode(TestExperimentsCreateMultiNode):
         "--parameterServerRegistryContainerUser", "psrcus",
         "--parameterServerRegistryPassword", "psrpass",
         "--apiKey", "some_key",
+        "--no-logs",
     ]
     EXPECTED_STDOUT = "New experiment created and started with ID: sadkfhlskdjh\n"
 

tests/test_click_commands.py

@@ -126,7 +126,8 @@ def test_should_execute_create_experiment_command_when_cli_create_and_start_sing
               "--machineType testType " \
               "--command testCommand " \
               "--workspaceUrl wUrl " \
-              "--apiKey some_key"
+              "--apiKey some_key " \
+              "--no-logs"
     expected_kwargs = {"name": u"exp1",
                        "projectHandle": u"testHandle",
                        "container": u"testContainer",
@@ -160,7 +161,8 @@ def test_should_execute_create_experiment_command_when_cli_create_and_start_mult
               "--parameterServerMachineType testParameterServerMachineType " \
               "--parameterServerCommand testParameterServerCommand " \
               "--parameterServerCount 3 " \
-              "--workspaceUrl wUrl"
+              "--workspaceUrl wUrl " \
+              "--no-logs"
     expected_kwargs = {"name": u"exp1",
                        "projectHandle": u"testHandle",
                        "experimentTypeId": constants.ExperimentType.MPI_MULTI_NODE,