WIP: fix AttributeError when --ignoreFiles was used

(cherry picked from commit e900e5b)

Author: BartoszCki

gradient/api_sdk/clients/job_client.py

@@ -41,7 +41,6 @@ def create(
             workspace_archive=None,
             workspace_url=None,
             working_directory=None,
-            ignore_files=None,
             experiment_id=None,
             job_env=None,
             use_dockerfile=None,
@@ -115,8 +114,6 @@ def create(
         :param str workspace_url: url to repo with code to run inside of job.
             (Currently being deprecated in an upcoming version.)
         :param str working_directory: location of code to run. By default ``/paperspace``
-        :param str ignore_files: This field is used with CLI to upload workspace from your computer without specified
-            files. Provide string with comma `,` separated name of files that should be ignored with upload of workspace.
         :param str experiment_id: Id of experiment to which job should be connected. If not provided there will be
             created new experiment for this job.
         :param dict job_env: key value collection of envs that are used in code
@@ -150,7 +147,6 @@ def create(
             workspace_archive=workspace_archive,
             workspace_url=workspace_url,
             working_directory=working_directory,
-            ignore_files=ignore_files,
             experiment_id=experiment_id,
             job_env=job_env,
             use_dockerfile=use_dockerfile,

gradient/api_sdk/models/job.py

@@ -77,7 +77,6 @@ class Job(object):
     workspace = attr.ib(type=str, default=None)
     workspace_archive = attr.ib(type=str, default=None)
     workspace_file_name = attr.ib(type=str, default=None)
-    ignore_files = attr.ib(type=str, default=None)
     use_dockerfile = attr.ib(type=str, default=None)
     rel_dockerfile_path = attr.ib(type=str, default=None)
     registry_username = attr.ib(type=str, default=None)

gradient/api_sdk/serializers/job.py

@@ -81,7 +81,6 @@ class JobSchema(BaseSchema):
     command = marshmallow.fields.Str()
     workspace = marshmallow.fields.Str()
     workspace_archive = marshmallow.fields.Str(dump_to="workspaceArchive", load_from="workspaceArchive")
-    ignore_files = marshmallow.fields.Str(dump_to="ignoreFiles", load_from="ignoreFiles")
     use_dockerfile = marshmallow.fields.Bool(dump_to="useDockerfile", load_from="useDockerfile")
     rel_dockerfile_path = marshmallow.fields.Str(dump_to="relDockerfilePath", load_from="relDockerfilePath")
     registry_username = marshmallow.fields.Str(dump_to="registryUsername", load_from="registryUsername")

gradient/api_sdk/workspace.py

@@ -28,9 +28,6 @@ def __init__(self, workspace_handler, *args, **kwargs):
         self.workspace_handler = workspace_handler
 
     def execute(self, json_, use_vpc=False):
-        if "ignore_files" in json_:
-            json_["ignore_files"] = self._parse_comma_separated_to_list(json_["ignore_files"])
-
         self._handle_workspace(json_)
 
         with halo.Halo(text=self.SPINNER_MESSAGE, spinner="dots"):
@@ -56,14 +53,6 @@ def _handle_workspace(self, instance_dict):
     def _create(self, json_, use_vpc):
         pass
 
-    @staticmethod
-    def _parse_comma_separated_to_list(s):
-        if not s:
-            return []
-
-        list_of_str = [s.strip() for s in s.split(",")]
-        return list_of_str
-
 
 class CreateSingleNodeExperimentCommand(BaseCreateExperimentCommandMixin, BaseExperimentCommand):
     def _create(self, json_, use_vpc=False):

gradient/commands/experiments.py

@@ -194,6 +194,8 @@ def _make_table(self, logs, job_id):
 class CreateJobCommand(BaseCreateJobCommandMixin, BaseJobCommand):
 
     def _create(self, json_, data):
+        # because ignore_files is used by workspace handlers and not needed anymore (will fail if not "popped")
+        json_.pop("ignore_files", None)
         return self.client.create(data=data, **json_)
 
 
@@ -216,7 +218,6 @@ def create(
             workspace_archive=None,
             workspace_url=None,
             working_directory=None,
-            ignore_files=None,
             experiment_id=None,
             job_env=None,
             use_dockerfile=None,
@@ -243,7 +244,6 @@ def create(
             workspace_archive=workspace_archive,
             workspace_url=workspace_url,
             working_directory=working_directory,
-            ignore_files=ignore_files,
             experiment_id=experiment_id,
             job_env=job_env,
             use_dockerfile=use_dockerfile,
@@ -268,7 +268,7 @@ def _get_client(self, api_key, logger_):
             return self.client
 
         http_client_ = http_client.API(config.config.CONFIG_HOST, api_key=api_key, logger=logger_)
-        client = JobRunClient(http_client_, logger_, http_client_)
+        client = JobRunClient(http_client_, api_key=api_key, logger=logger_)
         return client
 
 

gradient/commands/jobs.py

@@ -7,9 +7,9 @@
 from requests_toolbelt.multipart import encoder
 
 from gradient import utils
-from gradient.logger import Logger
 from gradient.exceptions import S3UploadFailedError, ProjectAccessDeniedError, PresignedUrlAccessDeniedError, \
     PresignedUrlUnreachableError, PresignedUrlConnectionError, PresignedUrlMalformedResponseError, PresignedUrlError
+from gradient.logger import Logger
 
 
 class MultipartEncoder(object):

gradient/workspace.py

@@ -433,6 +433,7 @@ class TestExperimentsCreateAndStartSingleNode(TestExperimentsCreateSingleNode):
         "--machineType", "testType",
         "--command", "testCommand",
         "--workspaceUrl", "some-workspace",
+        "--no-logs",
         "--vpc",
     ]
     EXPECTED_STDOUT = "New experiment created and started with ID: sadkfhlskdjh\n"
@@ -512,6 +513,7 @@ class TestExperimentsCreateAndStartMultiNode(TestExperimentsCreateMultiNode):
         "--parameterServerCount", 2,
         "--workerContainerUser", "usr",
         "--workspace", "https://github.com/Paperspace/gradient-cli.git",
+        "--no-logs",
         "--vpc",
     ]
     EXPECTED_STDOUT = "New experiment created and started with ID: sadkfhlskdjh\n"

tests/functional/test_experiments.py

@@ -492,7 +492,6 @@ class TestJobsCreate(object):
         "cluster": "some_cluster_name",
         "startedByUserId": "some_user_id",
         "isPreemptible": True,
-        "ignoreFiles": "file1,file2",
         "container": "some_container",
         "workingDirectory": "/some/path",
         "projectId": "some_project_id",

tests/functional/test_jobs.py

@@ -144,6 +144,5 @@ def test_should_read_options_from_yaml_file(self, workspace_zip_patched, post_pa
                                                 'jobEnv': {'key': 'val'},
                                                 'registryUsername': 'some_registry_username',
                                                 'startedByUserId': 'some_user_id',
-                                                'ignoreFiles': 'file1,file2',
                                                 'ports': '8080,9000:9900',
                                                 'workspaceUrl': 'some.url'})