creating job + bug fixes

Author: kossak

paperspace/cli/cli.py

@@ -58,8 +58,13 @@ def common_experiments_create_options(f):
             "--workspace",
             "workspace",
             required=False,
-            help="Path to workspace directory or archive",
-            default="."
+            help="Path to workspace directory",
+        ),
+        click.option(
+            "--workspaceArchive",
+            "workspaceArchive",
+            required=False,
+            help="Path to workspace .zip archive",
         ),
         click.option(
             "--workspaceUrl",

paperspace/cli/jobs.py

@@ -2,6 +2,7 @@
 
 from paperspace import client, config
 from paperspace.cli import common
+from paperspace.cli.common import del_if_value_is_none
 from paperspace.commands import jobs as jobs_commands
 
 
@@ -63,8 +64,29 @@ def list_jobs(api_key, **filters):
 
 
 @jobs_group.command("create", help="Create job")
+@click.option("--name", "name", help="Job name", required=True)
+@click.option('--machineType', 'machineType', help="Virtual machine type")
+@click.option('--container', 'container', help="Docker container")
+@click.option('--command', 'command', help="Job command/entrypoint")
+@click.option('--ports', 'ports', help="Mapped ports")
+@click.option('--isPublic', 'isPublic', help="Flag: is job public")
+@click.option("--workspace", "workspace", required=False, help="Path to workspace directory")
+@click.option("--workspaceArchive", "workspaceArchive", required=False, help="Path to workspace archive")
+@click.option("--workspaceUrl", "workspaceUrl", required=False, help="Project git repository url")
+@click.option("--workingDirectory", "workingDirectory", help="Working directory for the experiment", )
+@click.option('--experimentId', 'experimentId', help="Experiment Id")
+# @click.option('--envVars', 'envVars', help="Environmental variables ")  # TODO
+@click.option('--useDockerfile', 'useDockerfile', help="Flag: using Dockerfile")
+@click.option('--isPreemptible', 'isPreemptible', help="Flag: isPreemptible")
+@click.option('--project', 'project', help="Project name")
+@click.option('--projectHandle', '--projectId', 'projectId', help="Project handle", required=True)
+@click.option('--startedByUserId', 'startedByUserId', help="User ID")
+@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")
 @common.api_key_option
 def create_job(api_key, **kwargs):
+    del_if_value_is_none(kwargs)
     jobs_api = client.API(config.CONFIG_HOST, api_key=api_key)
     command = jobs_commands.CreateJobCommand(api=jobs_api)
     command.execute(kwargs)

paperspace/commands/experiments.py

@@ -14,7 +14,7 @@
 class ExperimentCommand(CommandBase):
     def __init__(self, workspace_handler=None, **kwargs):
         super(ExperimentCommand, self).__init__(**kwargs)
-        self._workspace_handler = workspace_handler or S3WorkspaceHandler(api=self.api, logger=self.logger)
+        self._workspace_handler = workspace_handler or S3WorkspaceHandler(experiments_api=self.api, logger=self.logger)
 
     def _log_create_experiment(self, response, success_msg_template, error_msg):
         if response.ok:

paperspace/commands/jobs.py

@@ -2,6 +2,7 @@
 
 import terminaltables
 
+from paperspace import config, client
 from paperspace.commands import CommandBase
 from paperspace.utils import get_terminal_lines
 from paperspace.workspace import S3WorkspaceHandler
@@ -88,10 +89,17 @@ def _make_table(jobs):
 class CreateJobCommand(JobsCommandBase):
     def __init__(self, workspace_handler=None, **kwargs):
         super(CreateJobCommand, self).__init__(**kwargs)
-        self.workspace_handler = workspace_handler or S3WorkspaceHandler(api=self.api, logger=self.logger)
+        experiments_api = client.API(config.CONFIG_EXPERIMENTS_HOST, api_key=kwargs.get('api_key'))
+        self._workspace_handler = workspace_handler or S3WorkspaceHandler(experiments_api=experiments_api,
+                                                                          logger=self.logger)
 
     def execute(self, json_):
         url = "/jobs/createJob/"
+
+        workspace_url = self._workspace_handler.upload_workspace(json_)
+        if workspace_url:
+            json_['workspaceFileName'] = workspace_url
+
         response = self.api.post(url, json_)
         self._log_message(response,
                           "Job created",

paperspace/workspace.py

@@ -13,8 +13,8 @@
 
 
 class S3WorkspaceHandler:
-    def __init__(self, api, logger=None):
-        self.api = api
+    def __init__(self, experiments_api, logger=None):
+        self.experiments_api = experiments_api
         self.logger = logger or logging.getLogger()
 
     def _retrieve_file_paths(self, dirName):
@@ -78,13 +78,13 @@ def callback(monitor):
 
     def upload_workspace(self, input_data):
         workspace_url = input_data.get('workspaceUrl')
-        workspace_path = input_data.get('workspacePath')
+        workspace_path = input_data.get('workspace')
         workspace_archive = input_data.get('workspaceArchive')
         if (workspace_archive and workspace_path) or (workspace_archive and workspace_url) or (
                 workspace_path and workspace_url):
             raise click.UsageError("Use either:\n\t--workspaceUrl to point repository URL"
-                                   "\n\t--workspacePath to point on project directory"
-                                   "\n\t--workspaceArchive to point on project ZIP archive"
+                                   "\n\t--workspace to point on project directory"
+                                   "\n\t--workspaceArchive to point on project .zip archive"
                                    "\n or neither to use current directory")
 
         if workspace_url:
@@ -115,7 +115,7 @@ def upload_workspace(self, input_data):
         return 's3://{}/{}'.format(bucket_name, file_name)
 
     def _get_upload_data(self, file_name):
-        response = self.api.get("/workspace/get_presigned_url", params={'workspaceName': file_name})
+        response = self.experiments_api.get("/workspace/get_presigned_url", params={'workspaceName': file_name})
         if response.status_code == 404:
             raise PresignedUrlUnreachableException
         if response.status_code == 403: