NGPIris 5.2.2.dev2__tar.gz → 5.2.2.dev4__tar.gz

{ngpiris-5.2.2.dev2 → ngpiris-5.2.2.dev4}/NGPIris/cli/__init__.py

@@ -95,7 +95,6 @@ def upload(context : Context, bucket : str, source : str, destination : str):
     hcph : HCPHandler = get_HCPHandler(context)
     hcph.mount_bucket(bucket)
     destination = add_trailing_slash(destination)
-    click.echo("CWD: " + str(Path.cwd()))
     if Path(source).is_dir():
         source = add_trailing_slash(source)
         hcph.upload_folder(source, destination)

{ngpiris-5.2.2.dev2 → ngpiris-5.2.2.dev4}/NGPIris/hcp/hcp.py

@@ -148,7 +148,7 @@ class HCPHandler:
         else:
             self.transfer_config = TransferConfig(
                 multipart_threshold = 10 * _MB,
-                max_concurrency = 60,
+                max_concurrency = 30,
                 multipart_chunksize = 40 * _MB,
                 use_threads = True
             )
@@ -284,6 +284,11 @@ class HCPHandler:
 
         pages_filtered = pages.search(filter_string)
         for object in pages_filtered:
+            # If there are no objects in the bucket, then `object` will be None,
+            # which means that we should break out of the for loop
+            if not object:
+                break
+
             # Split the object key by "/"
             split_object = object["Key"].split("/")
             # Check if the object is within the specified path_key depth

{ngpiris-5.2.2.dev2 → ngpiris-5.2.2.dev4}/NGPIris/hcp/helpers.py

@@ -1,5 +1,5 @@
 
-from pathlib import Path
+from os import path as p
 from typing import Callable, TypeVar, ParamSpec
 
 from NGPIris.hcp.exceptions import NoBucketMounted
@@ -23,9 +23,7 @@ def create_access_control_policy(user_ID_permissions : dict[str, str]) -> dict:
     return access_control_policy
 
 def raise_path_error(path : str):
-    if Path(path).is_mount():
-        return "Is mounted"
-    if not Path(path).exists():
+    if not p.exists(path):
         raise FileNotFoundError("\"" + path + "\"" + " does not exist")
 
 # Decorator for checking if a bucket is mounted. This is meant to be used by 

{ngpiris-5.2.2.dev2 → ngpiris-5.2.2.dev4}/NGPIris.egg-info/PKG-INFO

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

{ngpiris-5.2.2.dev2 → ngpiris-5.2.2.dev4}/PKG-INFO

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

{ngpiris-5.2.2.dev2 → ngpiris-5.2.2.dev4}/pyproject.toml

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