workspaces tweak, some minor renamings

Author: kossak

paperspace/client.py

@@ -30,8 +30,8 @@ def get_path(self, url):
 
     def post(self, url, json=None, params=None, files=None, data=None):
         path = self.get_path(url)
-        logger.debug("POST request sent to: {} \n\theaders: {}\n\tjson: {}\n\tparams: {}\n\tdata: {}"
-                     .format(path, self.headers, json, params, data))
+        logger.debug("POST request sent to: {} \n\theaders: {}\n\tjson: {}\n\tparams: {}\n\tfiles: {}\n\tdata: {}"
+                     .format(path, self.headers, json, params, files, data))
         response = requests.post(path, json=json, params=params, headers=self.headers, files=files, data=data)
         logger.debug("Response status code: {}".format(response.status_code))
         logger.debug("Response content: {}".format(response.content))

paperspace/commands/jobs.py

@@ -3,11 +3,10 @@
 import terminaltables
 from click import style
 
-from paperspace import config, client
 from paperspace.commands import common
 from paperspace.exceptions import BadResponseError
 from paperspace.utils import get_terminal_lines
-from paperspace.workspace import S3WorkspaceHandler, WorkspaceHandler
+from paperspace.workspace import WorkspaceHandler
 
 
 class JobsCommandBase(common.CommandBase):
@@ -144,6 +143,7 @@ def execute(self, json_):
 
         self.set_project(json_)
 
+        self.logger.log("Creating job...")
         response = self.api.post(url, params=json_, files=files)
         self._log_message(response,
                           "Job created",

paperspace/workspace.py

@@ -15,8 +15,8 @@
 
 class MultipartEncoder(object):
     def __init__(self, fields):
-        s3_encoder = encoder.MultipartEncoder(fields=fields)
-        self.monitor = encoder.MultipartEncoderMonitor(s3_encoder, callback=self._create_callback(s3_encoder))
+        mp_encoder = encoder.MultipartEncoder(fields=fields)
+        self.monitor = encoder.MultipartEncoderMonitor(mp_encoder, callback=self._create_callback(mp_encoder))
 
     def get_monitor(self):
         return self.monitor
@@ -103,9 +103,14 @@ def handle(self, input_data):
         if workspace_url:
             return  # nothing to do
 
+        # Should be removed as soon it won't be necessary by PS_API
+        if workspace_path == 'none':
+            return 'none'
         if workspace_archive:
             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.)')
             archive_path = self._zip_workspace(workspace_path, ignore_files)
         self.archive_path = archive_path
         self.archive_basename = os.path.basename(archive_path)
@@ -137,21 +142,9 @@ def __init__(self, experiments_api, logger=None):
         self.experiments_api = experiments_api
 
     def handle(self, input_data):
-        workspace_archive, workspace_path, workspace_url = self._validate_input(input_data)
-        ignore_files = input_data.get('ignore_files')
-
-        if workspace_url:
-            return  # nothing to do
-
-        # Should be removed as soon it won't be necessary by PS_API
-        if workspace_path == 'none':
-            return 'none'
-        if workspace_archive:
-            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.)')
-            archive_path = self._zip_workspace(workspace_path, ignore_files)
+        archive_path = super(S3WorkspaceHandler, self).handle(input_data)
+        if archive_path in ['none', None]:
+            return archive_path
 
         file_name = os.path.basename(archive_path)
         project_handle = input_data['projectHandle']