NGPIris 5.4.2.dev1__tar.gz → 5.4.2.dev3__tar.gz

{ngpiris-5.4.2.dev1 → ngpiris-5.4.2.dev3}/NGPIris/cli/__init__.py

@@ -41,19 +41,32 @@ def add_trailing_slash(path : str) -> str:
     help = "Get the debug log for running a command",
     is_flag = True
 )
+@click.option(
+    "-tc", 
+    "--transfer_config", 
+    help = "Use a custom transfer config for uploads or downloads", 
+)
 @click.version_option(package_name = "NGPIris")
 @click.pass_context
-def cli(context : Context, credentials : str, debug : bool):
+def cli(context : Context, credentials : str, debug : bool, transfer_config : str):
     """
     NGP Intelligence and Repository Interface Software, IRIS. 
     
     CREDENTIALS refers to the path to the JSON credentials file.
     """
+
+    if transfer_config:
+        context.ensure_object(dict)
+        context.obj["hcph"] = HCPHandler(credentials, custom_config_path = transfer_config)
+    else:    
+        context.ensure_object(dict)
+        context.obj["hcph"] = HCPHandler(credentials)
+
     if debug:
         set_stream_logger(name="")
-        
-    context.ensure_object(dict)
-    context.obj["hcph"] = HCPHandler(credentials)
+        click.echo(
+            context.obj["hcph"].transfer_config.__dict__
+        )
 
 @cli.command()
 @click.argument("bucket")

{ngpiris-5.4.2.dev1 → ngpiris-5.4.2.dev3}/NGPIris/hcp/hcp.py

@@ -507,26 +507,20 @@ class HCPHandler:
                     unit_scale = True, 
                     desc = local_file_path
                 ) as pbar:
-                    try:
-                        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)
-                        )
-                    except Exception as e:
-                        print("Upload failed:", e)
-            else:
-                try:
                     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)
                     )
-                except Exception as e:
-                    print("Upload failed:", e)
+            else:
+                self.s3_client.upload_file(
+                    Filename = local_file_path, 
+                    Bucket = self.bucket_name, 
+                    Key = key,
+                    Config = self.transfer_config,
+                )
 
 
     @check_mounted

{ngpiris-5.4.2.dev1 → ngpiris-5.4.2.dev3}/NGPIris.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NGPIris
-Version: 5.4.2.dev1
+Version: 5.4.2.dev3
 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.dev1 → ngpiris-5.4.2.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NGPIris
-Version: 5.4.2.dev1
+Version: 5.4.2.dev3
 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.dev1 → ngpiris-5.4.2.dev3}/pyproject.toml

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