merge and post-merge fixes

Author: kossak

paperspace/commands/jobs.py

@@ -157,7 +157,7 @@ def execute(self, json_):
             if self._workspace_handler.archive_path:
                 data = self._get_multipart_data(json_)
             else:
-                data["workspaceFileName"] = workspace_url
+                json_["workspaceFileName"] = workspace_url
 
         self.logger.log("Creating job...")
         response = self.api.post(url, params=json_, data=data)
@@ -168,12 +168,16 @@ def execute(self, json_):
     def _get_multipart_data(self, json_):
         archive_basename = self._workspace_handler.archive_basename
         json_["workspaceFileName"] = archive_basename
-        job_data = {'file': (archive_basename, open(self._workspace_handler.archive_path, 'rb'), 'text/plain')}
+        job_data = self._get_files_dict(archive_basename)
         monitor = MultipartEncoder(job_data).get_monitor()
         self.api.headers["Content-Type"] = monitor.content_type
         data = monitor
         return data
 
+    def _get_files_dict(self, archive_basename):
+        job_data = {'file': (archive_basename, open(self._workspace_handler.archive_path, 'rb'), 'text/plain')}
+        return job_data
+
     @staticmethod
     def set_project(json_):
         if json_.get("projectId"):

paperspace/workspace.py

@@ -30,6 +30,7 @@ def callback(monitor):
                 bar.finish()
             else:
                 bar.update(monitor.bytes_read)
+
         return callback
 
 
@@ -103,7 +104,7 @@ def handle(self, input_data):
         ignore_files = input_data.get('ignore_files')
 
         if workspace_url:
-            return  # nothing to do
+            return workspace_url  # nothing to do
 
         # Should be removed as soon it won't be necessary by PS_API
         if workspace_path == 'none':
@@ -112,7 +113,7 @@ def handle(self, input_data):
             archive_path = os.path.abspath(workspace_archive)
         else:
             self.logger.log('Archiving your working directory for upload as your experiment workspace...'
-             '(See https://docs.paperspace.com/gradient/experiments/run-experiments for more information.)')
+                            '(See https://docs.paperspace.com/gradient/experiments/run-experiments for more information.)')
             archive_path = self._zip_workspace(workspace_path, ignore_files)
         self.archive_path = archive_path
         self.archive_basename = os.path.basename(archive_path)

tests/functional/test_jobs.py

@@ -407,6 +407,7 @@ class TestJobsCreate(object):
         "machineType": u"testType",
         "command": u"testCommand",
         "workspaceUrl": u"some-workspace",
+        "workspaceFileName": u"some-workspace",
     }
     FULL_OPTIONS_REQUEST = {
         "name": u"exp1",

tests/functional/test_run.py

@@ -17,27 +17,32 @@ class TestRunCommand(object):
 
     @mock.patch("paperspace.client.requests.post")
     @mock.patch("paperspace.workspace.WorkspaceHandler._zip_workspace")
+    @mock.patch("paperspace.workspace.MultipartEncoder.get_monitor")
     @mock.patch("paperspace.commands.jobs.CreateJobCommand._get_files_dict")
-    def test_run_simple_file_with_args(self, get_files_patched, workspace_zip_patched, post_patched):
+    def test_run_simple_file_with_args(self, get_files_patched, get_moniror_patched, workspace_zip_patched, post_patched):
         get_files_patched.return_value = mock.MagicMock()
         workspace_zip_patched.return_value = '/foo/bar'
         post_patched.return_value = MockResponse(status_code=200)
 
+        mock_monitor = mock.MagicMock()
+        mock_monitor.content_type = "mock/multipart"
+
+        get_moniror_patched.return_value = mock_monitor
+
         runner = CliRunner()
         result = runner.invoke(cli.cli, [self.command_name] + self.common_commands + ["/myscript.py", "a", "b"])
 
         expected_headers = self.headers.copy()
         expected_headers.update({
-            'Content-Type': "multipart/form-data"
+            'Content-Type': "mock/multipart"
         })
         post_patched.assert_called_with(self.url,
                                         params={'name': u'test', 'projectId': u'projectId',
                                                 'workspaceFileName': 'bar',
                                                 'command': 'python{} myscript.py a b'.format(str(sys.version_info[0])),
-                                                'projectHandle': u'projectId',
                                                 'container': u'paperspace/tensorflow-python'},
-                                        data=None,
-                                        files=mock.ANY,
+                                        data=mock.ANY,
+                                        files=None,
                                         headers=expected_headers,
                                         json=None)
 
@@ -55,7 +60,6 @@ def test_run_python_command_with_args_and_no_workspace(self, post_patched):
                                                 'workspaceFileName': 'none',
                                                 'workspace': 'none',
                                                 'command': 'python{} -c print(foo)'.format(str(sys.version_info[0])),
-                                                'projectHandle': u'projectId',
                                                 'container': u'paperspace/tensorflow-python'},
                                         data=None,
                                         files=None,
@@ -79,7 +83,6 @@ def test_run_shell_command_with_args_with_s3_workspace(self, workspace_zip_patch
                                                 'workspaceFileName': 's3://bucket/object',
                                                 'workspaceUrl': 's3://bucket/object',
                                                 'command': 'echo foo',
-                                                'projectHandle': u'projectId',
                                                 'container': u'paperspace/tensorflow-python'},
                                         data=None,
                                         files=None,