Merge remote-tracking branch 'origin/master' into run-restored

Author: kossak

.gitignore

@@ -104,3 +104,5 @@ ENV/
 .vscode/*
 
 .idea
+paperspace-python.zip
+*.env

README.md

@@ -1,7 +1,7 @@
 Paperspace Python
 =================
 
-Release 0.2.0a1
+Release 0.2.0a2
 
 See [releasenotes.md](https://github.com/Paperspace/paperspace-python/blob/master/releasenotes.md) for details on the current release, as well as release history.
 

paperspace/cli/experiments.py

@@ -108,11 +108,11 @@ def common_experiments_create_options(f):
 def common_experiment_create_multi_node_options(f):
     options = [
         click.option(
-            "--experimentTypeId",
-            "experimentTypeId",
+            "--experimentType",
+            "experimentType",
             type=ChoiceType(MULTI_NODE_EXPERIMENT_TYPES_MAP, case_sensitive=False),
             required=True,
-            help="Experiment Type ID",
+            help="Experiment Type",
         ),
         click.option(
             "--workerContainer",
@@ -249,7 +249,7 @@ def create_multi_node(api_key, **kwargs):
 @common_experiments_create_options
 @common_experiments_create_single_node_options
 def create_single_node(api_key, **kwargs):
-    kwargs["experimentTypeId"] = constants.ExperimentType.SINGLE_NODE
+    kwargs["experimentType"] = constants.ExperimentType.SINGLE_NODE
     del_if_value_is_none(kwargs)
     experiments_api = client.API(config.CONFIG_EXPERIMENTS_HOST, api_key=api_key)
     command = experiments_commands.CreateExperimentCommand(api=experiments_api)
@@ -270,7 +270,7 @@ def create_and_start_multi_node(api_key, **kwargs):
 @common_experiments_create_options
 @common_experiments_create_single_node_options
 def create_and_start_single_node(api_key, **kwargs):
-    kwargs["experimentTypeId"] = constants.ExperimentType.SINGLE_NODE
+    kwargs["experimentType"] = constants.ExperimentType.SINGLE_NODE
     del_if_value_is_none(kwargs)
     experiments_api = client.API(config.CONFIG_EXPERIMENTS_HOST, api_key=api_key)
     command = experiments_commands.CreateAndStartExperimentCommand(api=experiments_api)

paperspace/commands/experiments.py

@@ -106,7 +106,7 @@ def _get_objects(self, response, kwargs):
 
 
 def _make_details_table(experiment):
-    if experiment["experimentTypeId"] == constants.ExperimentType.SINGLE_NODE:
+    if experiment["experimentType"] == constants.ExperimentType.SINGLE_NODE:
         data = (
             ("Name", experiment["templateHistory"]["params"].get("name")),
             ("ID", experiment.get("handle")),
@@ -121,7 +121,7 @@ def _make_details_table(experiment):
             ("Model Type", experiment["templateHistory"]["params"].get("modelType")),
             ("Model Path", experiment["templateHistory"]["params"].get("modelPath")),
         )
-    elif experiment["experimentTypeId"] in (constants.ExperimentType.GRPC_MULTI_NODE,
+    elif experiment["experimentType"] in (constants.ExperimentType.GRPC_MULTI_NODE,
                                             constants.ExperimentType.MPI_MULTI_NODE):
         data = (
             ("Name", experiment["templateHistory"]["params"].get("name")),
@@ -131,7 +131,7 @@ def _make_details_table(experiment):
             ("Cluster ID", experiment["templateHistory"]["params"].get("clusterId")),
             ("Experiment Env", experiment["templateHistory"]["params"].get("experimentEnv")),
             ("Experiment Type",
-             constants.ExperimentType.get_type_str(experiment["templateHistory"]["params"].get("experimentTypeId"))),
+             constants.ExperimentType.get_type_str(experiment["templateHistory"]["params"].get("experimentType"))),
             ("Model Type", experiment["templateHistory"]["params"].get("modelType")),
             ("Model Path", experiment["templateHistory"]["params"].get("modelPath")),
             ("Parameter Server Command", experiment["templateHistory"]["params"].get("parameter_server_command")),
@@ -149,7 +149,7 @@ def _make_details_table(experiment):
             ("Workspace URL", experiment["templateHistory"]["params"].get("workspaceUrl")),
         )
     else:
-        raise ValueError("Wrong experiment type: {}".format(experiment["experimentTypeId"]))
+        raise ValueError("Wrong experiment type: {}".format(experiment["experimentType"]))
 
     ascii_table = terminaltables.AsciiTable(data)
     table_string = ascii_table.table

paperspace/version.py

@@ -1 +1 @@
-version = "0.2.0a1"
+version = "0.2.0a2"

releasenotes.md

@@ -1,5 +1,15 @@
 # Paperspace Python Release Notes
 
+# Release Notes for 0.2.0a2
+### New features
+* partial support for hyperparameter tuning
+* prompt for apiKey if not provided
+* deprecate `login` command
+* `--ignoreFiles` option for `experiments create`
+* `--ignoreFiles` and `--workspace none` options for `jobs create`
+### Fixes
+* restore apiKey command
+
 # Release Notes for 0.2.0a1
 ### New features
 * colorful error and help messages