Merge pull request #238 from Paperspace/PS-12323-Add_--projectId_to_models_upload_command

Add --projectId option to models upload command

Author: mkulaczkowski

gradient/api_sdk/clients/model_client.py

@@ -29,7 +29,7 @@ def delete(self, model_id):
         repository = self.build_repository(repositories.DeleteModel)
         repository.delete(model_id)
 
-    def upload(self, path, name, model_type, model_summary=None, notes=None, tags=None, ):
+    def upload(self, path, name, model_type, model_summary=None, notes=None, tags=None, project_id=None):
         """Upload model
 
         :param file path: path to Model
@@ -38,6 +38,7 @@ def upload(self, path, name, model_type, model_summary=None, notes=None, tags=No
         :param dict|None model_summary: Dictionary describing model parameters like loss, accuracy, etc.
         :param str|None notes: Optional model description
         :param list[str] tags: List of tags
+        :param str|None project_id: ID of a project
 
         :return: ID of new model
         :rtype: str
@@ -48,6 +49,7 @@ def upload(self, path, name, model_type, model_summary=None, notes=None, tags=No
             model_type=model_type,
             summary=json.dumps(model_summary) if model_summary else None,
             notes=notes,
+            project_id=project_id,
         )
 
         repository = self.build_repository(repositories.UploadModel)

gradient/cli/models.py

@@ -81,6 +81,12 @@ def delete_model(api_key, model_id, options_file):
     help="Model type",
     cls=common.GradientOption,
 )
+@click.option(
+    "--projectId",
+    "project_id",
+    help="ID of a project",
+    cls=common.GradientOption,
+)
 @click.option(
     "--modelSummary",
     "model_summary",
@@ -109,10 +115,10 @@ def delete_model(api_key, model_id, options_file):
 )
 @common.api_key_option
 @common.options_file
-def upload_model(path, name, model_type, model_summary, notes, api_key, options_file, **kwargs):
-    kwargs["tags"] = validate_comma_split_option(kwargs.pop("tags_comma"), kwargs.pop("tags"))
+def upload_model(api_key, options_file, **model):
+    model["tags"] = validate_comma_split_option(model.pop("tags_comma"), model.pop("tags"))
     command = models_commands.UploadModel(api_key=api_key)
-    command.execute(path, name, model_type, model_summary, notes, **kwargs)
+    command.execute(**model)
 
 
 @models_group.command("details", help="Show model details")

gradient/commands/models.py

@@ -54,9 +54,9 @@ def execute(self, model_id, *args, **kwargs):
 class UploadModel(GetModelsClientMixin, BaseCommand):
     SPINNER_MESSAGE = "Uploading model"
 
-    def execute(self, path, name, model_type, model_summary, notes, **kwargs):
+    def execute(self, **kwargs):
         with halo.Halo(text=self.SPINNER_MESSAGE, spinner="dots"):
-            model_id = self.client.upload(path, name, model_type, model_summary, notes, **kwargs)
+            model_id = self.client.upload(**kwargs)
 
         self.logger.log("Model uploaded with ID: {}".format(model_id))
 

tests/config_files/models_upload.yaml

@@ -5,3 +5,4 @@ modelSummary:
 modelType: Tensorflow
 name: some_name
 notes: some notes
+projectId: some_project_id

tests/functional/test_models.py

@@ -4,7 +4,6 @@
 
 import mock
 from click.testing import CliRunner
-
 from gradient.api_sdk.clients.http_client import default_headers
 from gradient.cli import cli
 from tests import example_responses, MockResponse
@@ -269,12 +268,14 @@ class TestModelUpload(object):
         "--modelType", "tensorflow",
         "--modelSummary", """{"key": "value"}""",
         "--notes", "some notes",
+        "--projectId", "some_project_id",
     ]
     ALL_OPTIONS_PARAMS = {
         "name": "some_name",
         "modelType": "Tensorflow",
         "summary": """{"key": "value"}""",
         "notes": "some notes",
+        "projectId": "some_project_id",
     }
 
     COMMAND_WITH_API_KEY_PARAMETER_USED = [
@@ -284,6 +285,7 @@ class TestModelUpload(object):
         "--modelType", "tensorflow",
         "--modelSummary", """{"key": "value"}""",
         "--notes", "some notes",
+        "--projectId", "some_project_id",
         "--apiKey", "some_key",
     ]
     COMMAND_WITH_OPTIONS_FILE = ["models", "upload", "--optionsFile", ]  # path added in test