Upload object names - next step towards decentralized file storage

Author: whoseoyster

unboxapi/__init__.py

@@ -411,7 +411,12 @@ def add_model(
                         trainSampleLabelColumnName=train_sample_label_column_name,
                     )
                     print("Uploading model to Unbox...")
-                    modeldata = self.upload(endpoint, tarfile_path, payload)
+                    modeldata = self.upload(
+                        endpoint=endpoint,
+                        file_path=tarfile_path,
+                        object_name="tarfile",
+                        body=payload,
+                    )
         os.remove("template_model.py")
         return Model(modeldata)
 
@@ -560,6 +565,7 @@ def add_dataset(
         >>> dataset.to_dict()
         """
         file_path = os.path.expanduser(file_path)
+        object_name = "original.csv"
         if not os.path.isfile(file_path):
             raise UnboxException("File path does not exist.")
         if label_column_name in feature_names:
@@ -611,7 +617,14 @@ def add_dataset(
             featureNames=feature_names,
             categoricalFeaturesMap=categorical_features_map,
         )
-        return Dataset(self.upload(endpoint, file_path, payload))
+        return Dataset(
+            self.upload(
+                endpoint=endpoint,
+                file_path=file_path,
+                object_name=object_name,
+                body=payload,
+            )
+        )
 
     def add_dataframe(
         self,

unboxapi/api.py

@@ -143,7 +143,9 @@ def put_request(self, endpoint: str, body=None, files=None, data=None):
             data=data,
         )
 
-    def upload_blob_s3(self, endpoint: str, file_path: str, body=None):
+    def upload_blob_s3(
+        self, endpoint: str, file_path: str, object_name: str, body=None
+    ):
         """Generic method to upload data to S3 storage and create the appropriate resource
         in the backend.
         """
@@ -189,7 +191,7 @@ def upload_blob_gcs(self, endpoint: str, file_path: str, body=None):
         else:
             self._raise_on_respose(res)
 
-    def transfer_blob(self, endpoint: str, file_path: str, body=None):
+    def transfer_blob(self, endpoint: str, file_path: str, object_name: str, body=None):
         """Generic method to transfer data to the unbox folder and create the appropriate
         resource in the backend when using a local deployment.
         """
@@ -199,6 +201,6 @@ def transfer_blob(self, endpoint: str, file_path: str, body=None):
             os.makedirs(blob_path, exist_ok=True)
         except OSError as _:
             raise UnboxException(f"Directory {blob_path} cannot be created")
-        shutil.copyfile(file_path, f"{blob_path}/{id}")
-        body["storagePath"] = f"local://{blob_path}/{id}"
+        shutil.copyfile(file_path, f"{blob_path}/{object_name}")
+        body["storagePath"] = f"local://{blob_path}"
         return self.post_request(f"{endpoint}/{id}", body=body)