fix(deployments): pass clusterid to getPresignedDeploymentUrl ps-14880 (#318)

* pass clusterid to getPresignedDeploymentUrl

* fix(deployments): able to upload file/directory to s3 when creating a deployment PS-14880

* fix(deployments): upload with the same 'contentType' that psapi is using

* Revert "fix(deployments): upload with the same 'contentType' that psapi is using"

This reverts commit c3980f9.

* fix(models): unbreak upload to model

* fix(deployments): typo for data.content_type

* refactor(deployments): pass 'file_path' into upload() instead of pulling it out from 'data.encoder.fields'

* test(s3): change assert 'post' to 'put' request

* test(uploaders): asset 'put' instead of 'post' request

* test(experiments): assert 'put' instead of 'post' request

* test(experiments): param position

* test(experiments): param position

* fix(uploads): model/deployment/experiment upload all works

* test(experiments): revert the changes to test_experiments.py

* test(upload): revert test_uploaders.py and test_archiver_class.py

Co-authored-by: Robert Chen <[email protected]>

Author: e-r-i-k-a

gradient/api_sdk/s3_uploader.py

@@ -305,7 +305,7 @@ class DeploymentWorkspaceDirectoryUploader(object):
     def __init__(self, api_key, uploader=None, logger=None, ps_client_name=None):
         """
         :param str api_key:
-        :param S3FileUploader uploader:
+        :param S3PutFileUploader uploader:
         :param Logger logger:
         """
         self.logger = logger or MuteLogger()
@@ -315,13 +315,14 @@ def __init__(self, api_key, uploader=None, logger=None, ps_client_name=None):
             logger=self.logger,
             ps_client_name=ps_client_name,
         )
-        self.uploader = uploader or S3PutFileUploader(logger=self.logger, ps_client_name=ps_client_name)
+        self.uploader = S3PutFileUploader(logger=self.logger, ps_client_name=ps_client_name)
 
-    def _get_upload_data(self, file_path, project_id):
+    def _get_upload_data(self, file_path, project_id, cluster_id=None):
         """Ask API for data required to upload deployment workspace a file to S3
 
         :param str file_path:
         :param str project_id:
+        :param str cluster_id:
 
         :rtype: str
         :return: URL to which send the file, name of the bucket and a dictionary required by S3 service
@@ -333,6 +334,8 @@ def _get_upload_data(self, file_path, project_id):
         }
         if project_id:
             params['projectId'] = project_id
+        if cluster_id:
+            params['clusterHandle'] = cluster_id
         response = self.ps_api_client.get("/deployments/getPresignedDeploymentUrl", params=params)
         if not response.ok:
             raise sdk_exceptions.PresignedUrlConnectionError(response.reason)
@@ -347,15 +350,16 @@ def _get_upload_data(self, file_path, project_id):
 
         return presigned_url, bucket_name, workspace_url
 
-    def upload(self, file_path, project_id=None, **kwargs):
+    def upload(self, file_path, project_id=None, cluster_id=None, **kwargs):
         """Upload file to S3 bucket for a project
 
         :param str file_path:
         :param str project_id:
+        :param str cluster_id:
 
         :rtype: str
         :return: S3 bucket's URL
         """
-        url, bucket_name, workspace_url = self._get_upload_data(file_path, project_id)
+        url, bucket_name, workspace_url = self._get_upload_data(file_path, project_id, cluster_id)
         self.uploader.upload(file_path, url)
         return workspace_url