NGPIris 5.4.2.dev4__tar.gz → 5.4.2.dev5__tar.gz

{ngpiris-5.4.2.dev4 → ngpiris-5.4.2.dev5}/NGPIris/cli/__init__.py

@@ -78,8 +78,14 @@ def cli(context : Context, credentials : str, debug : bool, transfer_config : st
     help = "Simulate the command execution without making actual changes. Useful for testing and verification", 
     is_flag = True
 )
+@click.option(
+    "-su", 
+    "--simple_upload", 
+    help = "Use an upload method that does not use mulitpart. Usefull for times when multipart upload misbehaves", 
+    is_flag = True
+)
 @click.pass_context
-def upload(context : Context, bucket : str, source : str, destination : str, dry_run : bool):
+def upload(context : Context, bucket : str, source : str, destination : str, dry_run : bool, simple_upload : bool):
     """
     Upload files to an HCP bucket/namespace. 
     
@@ -97,14 +103,14 @@ def upload(context : Context, bucket : str, source : str, destination : str, dry
         if dry_run:
             click.echo("This command would have uploaded the folder \"" + source + "\" to \"" + destination + "\"")
         else:
-            hcph.upload_folder(source, destination)
+            hcph.upload_folder(source, destination, use_simple_upload = simple_upload)
     else:
         file_name = Path(source).name
         destination += file_name
         if dry_run:
             click.echo("This command would have uploaded the file \"" + source + "\" to \"" + destination + "\"")
         else:
-            hcph.upload_file(source, destination)
+            hcph.upload_file(source, destination, use_simple_upload = simple_upload)
 
 @cli.command()
 @click.argument("bucket")

{ngpiris-5.4.2.dev4 → ngpiris-5.4.2.dev5}/NGPIris/hcp/hcp.py

@@ -470,7 +470,7 @@ class HCPHandler:
             raise NotADirectory(local_folder_path + " is not a directory")
 
     @check_mounted
-    def upload_file(self, local_file_path : str, key : str = "", show_progress_bar : bool = True) -> None:
+    def upload_file(self, local_file_path : str, key : str = "", show_progress_bar : bool = True, use_simple_upload : bool = False) -> None:
         """
         Upload one file to the mounted bucket
 
@@ -496,10 +496,8 @@ class HCPHandler:
         if "\\" in local_file_path:
             raise RuntimeError("The \"\\\" character is not allowed in the file path")
 
-        #if self.object_exists(key):
-        #    raise ObjectAlreadyExist("The object \"" + key + "\" already exist in the mounted bucket")
-        if False:
-            pass
+        if self.object_exists(key):
+            raise ObjectAlreadyExist("The object \"" + key + "\" already exist in the mounted bucket")
         else:
             if show_progress_bar:
                 file_size : int = stat(local_file_path).st_size
@@ -509,24 +507,39 @@ class HCPHandler:
                     unit_scale = True, 
                     desc = local_file_path
                 ) as pbar:
+                    if use_simple_upload:
+                        self.s3_client.upload_file(
+                            Filename = local_file_path, 
+                            Bucket = self.bucket_name, 
+                            Key = key,
+                            Config = TransferConfig(multipart_chunksize = file_size),
+                            Callback = lambda bytes_transferred : pbar.update(bytes_transferred)
+                        )
+                    else:
+                        self.s3_client.upload_file(
+                            Filename = local_file_path, 
+                            Bucket = self.bucket_name, 
+                            Key = key,
+                            Config = self.transfer_config,
+                            Callback = lambda bytes_transferred : pbar.update(bytes_transferred)
+                        )
+            else:
+                if use_simple_upload:
+                    self.s3_client.upload_file(
+                        Filename = local_file_path, 
+                        Bucket = self.bucket_name, 
+                        Key = key,
+                    )
+                else:
                     self.s3_client.upload_file(
                         Filename = local_file_path, 
                         Bucket = self.bucket_name, 
                         Key = key,
                         Config = self.transfer_config,
-                        Callback = lambda bytes_transferred : pbar.update(bytes_transferred)
                     )
-            else:
-                self.s3_client.upload_file(
-                    Filename = local_file_path, 
-                    Bucket = self.bucket_name, 
-                    Key = key,
-                    Config = self.transfer_config,
-                )
-
 
     @check_mounted
-    def upload_folder(self, local_folder_path : str, key : str = "", show_progress_bar : bool = True) -> None:
+    def upload_folder(self, local_folder_path : str, key : str = "", show_progress_bar : bool = True, use_simple_upload : bool = False) -> None:
         """
         Upload the contents of a folder to the mounted bucket
 
@@ -546,7 +559,12 @@ class HCPHandler:
         filenames = listdir(local_folder_path)
 
         for filename in filenames:
-            self.upload_file(local_folder_path + filename, key + filename, show_progress_bar = show_progress_bar)
+            self.upload_file(
+                local_folder_path + filename, 
+                key + filename, 
+                show_progress_bar = show_progress_bar, 
+                use_simple_upload = use_simple_upload
+            )
 
     @check_mounted
     def delete_objects(self, keys : list[str], verbose : bool = True) -> None:

{ngpiris-5.4.2.dev4 → ngpiris-5.4.2.dev5/NGPIris.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NGPIris
-Version: 5.4.2.dev4
+Version: 5.4.2.dev5
 Author-email: Erik Brink <erik.brink@gu.se>, Isak Sylvin <isak.sylvin@gu.se>
 Description-Content-Type: text/markdown
 License-File: LICENSE

{ngpiris-5.4.2.dev4/NGPIris.egg-info → ngpiris-5.4.2.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NGPIris
-Version: 5.4.2.dev4
+Version: 5.4.2.dev5
 Author-email: Erik Brink <erik.brink@gu.se>, Isak Sylvin <isak.sylvin@gu.se>
 Description-Content-Type: text/markdown
 License-File: LICENSE

{ngpiris-5.4.2.dev4 → ngpiris-5.4.2.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "NGPIris"
-version = "5.4.2.dev4"
+version = "5.4.2.dev5"
 readme = "README.md"
 dependencies = [
     "requests >= 2.31.0",