NGPIris 5.4.0__tar.gz → 5.4.2.dev1__tar.gz

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

@@ -426,7 +426,7 @@ def iris_generate_credentials_file(path : str, name : str):
             file_path = path + name
     
         if not Path(path).is_dir():
-            Path(path).mkdir()
+            Path(path).mkdir(parents=True)
     else:
         file_path = name
         

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

@@ -1,4 +1,3 @@
-
 from NGPIris.parse_credentials import CredentialsHandler
 from NGPIris.hcp.helpers import (
     raise_path_error,
@@ -41,7 +40,6 @@ from rapidfuzz import (
 from requests import get
 from urllib3 import disable_warnings
 from tqdm import tqdm
-
 from bitmath import TiB, Byte
 
 from typing import Generator
@@ -258,22 +256,33 @@ class HCPHandler:
         return list_of_buckets
 
     @check_mounted
-    def list_objects(self, path_key : str = "", name_only : bool = False, files_only : bool = False) -> Generator:
+    def list_objects(
+        self, 
+        path_key : str = "", 
+        list_all_bucket_objects : bool = False,
+        name_only : bool = False, 
+        files_only : bool = False
+    ) -> Generator:
         """
         List all objects in the mounted bucket as a generator. If one wishes to 
         get the result as a list, use :py:function:`list` to type cast the generator
 
         :param path_key: Filter string for which keys to list, specifically for finding objects in certain folders. Defaults to \"the root\" of the bucket
         :type path_key: str, optional
+        :param list_all_bucket_objects: If True, the value of `path_key` will be ignored and instead will list all objects in the bucket. Defaults to False
+        :type list_all_bucket_objects: bool, optional
         :param name_only: If True, yield only a the object names. If False, yield the full metadata about each object. Defaults to False.
         :type name_only: bool, optional
-        :param files_only: If true, only yield file objects. Defaults to False
+        :param files_only: If True, only yield file objects. Defaults to False
         :type files_only: bool, optional
         :yield: A generator of all objects in specified folder in a bucket
         :rtype: Generator
         """
         paginator : Paginator = self.s3_client.get_paginator("list_objects_v2")
-        pages : PageIterator = paginator.paginate(Bucket = self.bucket_name, Prefix = path_key, Delimiter = "/")
+        if list_all_bucket_objects:
+            pages : PageIterator = paginator.paginate(Bucket = self.bucket_name)
+        else:
+            pages : PageIterator = paginator.paginate(Bucket = self.bucket_name, Prefix = path_key, Delimiter = "/")
 
         for page in pages:
             page : dict | None
@@ -440,10 +449,18 @@ class HCPHandler:
             raise ObjectDoesNotExist("Could not find object", "\"" + folder_key + "\"", "in bucket", "\"" + str(self.bucket_name) + "\"")
         if Path(local_folder_path).is_dir():
             current_download_size_in_bytes = Byte(0) # For tracking download limit
-            for object in self.list_objects(folder_key): # Build the tree with directories or add files
+            (Path(local_folder_path) / Path(folder_key)).mkdir(parents = True) # Create "base folder"
+            for object in self.list_objects(folder_key): # Build the tree with directories or add files:
                 p = Path(local_folder_path) / Path(object["Key"])
-                if object["Key"][-1] == "/": # If the object is a "folder"
-                    p.mkdir()
+                if not object["IsFile"]: # If the object is a "folder"
+                    p.mkdir(parents = True)
+                    self.download_folder(
+                        folder_key = str(object["Key"]), 
+                        local_folder_path = local_folder_path,
+                        use_download_limit = use_download_limit, 
+                        show_progress_bar = show_progress_bar,
+                        download_limit_in_bytes = download_limit_in_bytes - current_download_size_in_bytes
+                    )
                 else: # If the object is a file
                     current_download_size_in_bytes += Byte(object["Size"])
                     if current_download_size_in_bytes >= download_limit_in_bytes and use_download_limit:
@@ -490,20 +507,26 @@ 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)
                     )
-            else:
-                self.s3_client.upload_file(
-                    Filename = local_file_path, 
-                    Bucket = self.bucket_name, 
-                    Key = key,
-                    Config = self.transfer_config,
-                )
+                except Exception as e:
+                    print("Upload failed:", e)
 
 
     @check_mounted
@@ -586,6 +609,7 @@ class HCPHandler:
             key += "/"
 
         objects : list[str] = list(self.list_objects(key, name_only = True))
+        objects.append(key) # Include the object "folder" path to be deleted
 
         if not objects:
             raise RuntimeError("\"" + key + "\"" + " is not a valid path") #TODO: change this error
@@ -653,11 +677,11 @@ class HCPHandler:
             processor = utils.default_process 
 
         if not name_only:
-            full_list = list(self.list_objects())
+            full_list = list(self.list_objects(list_all_bucket_objects = True))
 
         for item, score, index in process.extract_iter(
                 search_string, 
-                self.list_objects(name_only = True), 
+                self.list_objects(list_all_bucket_objects = True, name_only = True), 
                 scorer = fuzz.partial_ratio,
                 processor = processor
             ):

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: NGPIris
-Version: 5.4.0
+Version: 5.4.2.dev1
 Author-email: Erik Brink <erik.brink@gu.se>, Isak Sylvin <isak.sylvin@gu.se>
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -13,6 +13,7 @@ Requires-Dist: tqdm>=4.66.2
 Requires-Dist: click>=8.1.7
 Requires-Dist: bitmath==1.3.3.1
 Requires-Dist: tabulate==0.9.0
+Dynamic: license-file
 
 # NGP IRIS 👀
 NGP IRIS, or just Iris, is a tool for interacting with a Hitachi Content Platform (HCP) using S3 in the `boto3` package. NGP Iris is designed with two use cases in mind:

{ngpiris-5.4.0 → ngpiris-5.4.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: NGPIris
-Version: 5.4.0
+Version: 5.4.2.dev1
 Author-email: Erik Brink <erik.brink@gu.se>, Isak Sylvin <isak.sylvin@gu.se>
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -13,6 +13,7 @@ Requires-Dist: tqdm>=4.66.2
 Requires-Dist: click>=8.1.7
 Requires-Dist: bitmath==1.3.3.1
 Requires-Dist: tabulate==0.9.0
+Dynamic: license-file
 
 # NGP IRIS 👀
 NGP IRIS, or just Iris, is a tool for interacting with a Hitachi Content Platform (HCP) using S3 in the `boto3` package. NGP Iris is designed with two use cases in mind:

{ngpiris-5.4.0 → ngpiris-5.4.2.dev1}/pyproject.toml

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