NGPIris 5.3.1__tar.gz → 5.4.0__tar.gz

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

@@ -4,11 +4,7 @@ from click.core import Context
 from json import dump
 from pathlib import Path
 from boto3 import set_stream_logger
-from botocore.paginate import PageIterator, Paginator
 from typing import Any, Generator
-from os import get_terminal_size
-from math import floor
-from tabulate import tabulate
 from bitmath import Byte, TiB
 
 from NGPIris.hcp import HCPHandler
@@ -26,36 +22,9 @@ def _list_objects_generator(hcph : HCPHandler, path : str, name_only : bool, fil
     different from `list_objects` in `hcp.py` in order to make the output 
     printable in a terminal
     """
-    paginator : Paginator = hcph.s3_client.get_paginator("list_objects_v2")
-    pages : PageIterator = paginator.paginate(Bucket = hcph.bucket_name, Prefix = path)
-    (nb_of_cols, _) = get_terminal_size()
-    max_width = floor(nb_of_cols / 5)
-    if (not name_only):
-        yield tabulate(
-            [],
-            headers = ["Key", "LastModified", "ETag", "Size", "StorageClass"],
-            tablefmt = "plain",
-            stralign = "center"
-        ) + "\n" + "-"*nb_of_cols + "\n"
-    if files_only:
-        filter_string = "Contents[?!ends_with(Key, '/')][]" # filter objects that does not end with "/"
-    else:
-        filter_string = "Contents[*][]"
-    for object in pages.search(filter_string): 
-        if name_only:
-            yield str(object["Key"]) + "\n"
-        else:
-            yield tabulate(
-                [
-                    [str(object["Key"]), 
-                        str(object["LastModified"]), 
-                        str(object["ETag"]), 
-                        str(object["Size"]), 
-                        str(object["StorageClass"])]
-                ],
-                maxcolwidths = max_width,
-                tablefmt = "plain"
-            ) + "\n" + "-"*nb_of_cols + "\n"
+    objects = hcph.list_objects(path, name_only, files_only)
+    for obj in objects:
+        yield str(obj) + "\n"
 
 def object_is_folder(object_path : str, hcph : HCPHandler) -> bool:
     return (object_path[-1] == "/") and (hcph.get_object(object_path)["ContentLength"] == 0)

{ngpiris-5.3.1 → ngpiris-5.4.0}/NGPIris/hcp/hcp.py

@@ -256,51 +256,64 @@ class HCPHandler:
         response = self.get_response("/namespaces")
         list_of_buckets : list[str] = response["name"]
         return list_of_buckets
-    
+
     @check_mounted
     def list_objects(self, path_key : str = "", 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.
+        :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 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
         :type files_only: bool, optional
-        :yield: A generator of all objects in a bucket
+        :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)
-
-        if files_only:
-            filter_string = "Contents[?!ends_with(Key, '/')][]"
-        else:
-            filter_string = "Contents[*][]"
-
-        split_path_key = len(path_key.split("/")) + 1
+        pages : PageIterator = paginator.paginate(Bucket = self.bucket_name, Prefix = path_key, Delimiter = "/")
 
-        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:
+        for page in pages:
+            page : dict | None
+            # Check if `page` is None
+            if not page:
                 break
 
-            # Split the object key by "/"
-            split_object = object["Key"].split("/")
-            # Check if the object is within the specified path_key depth
-            if len(split_object) <= split_path_key:
-                # Skip objects that are not at the desired depth
-                if (len(split_object) == split_path_key) and split_object[-1]:
-                    continue
-                
-                if name_only:
-                    yield str(object["Key"])
-                else:
-                    yield object
+            if files_only:
+                for file_object in page.get("Contents", []):
+                    file_object : dict
+                    if file_object["Key"] != path_key:
+                        file_object["IsFile"] = True
+                        if name_only:
+                            yield file_object["Key"]
+                        else:
+                            yield file_object
+            else:
+                for folder_object in page.get("CommonPrefixes", []):
+                    folder_object : dict
+                    folder_object_metadata = self.get_object(folder_object["Prefix"])
+                    
+                    if name_only: 
+                        yield folder_object["Prefix"]
+                    else:
+                        yield {
+                            "Key" : folder_object["Prefix"],
+                            "LastModified" : folder_object_metadata["LastModified"],
+                            "ETag" : folder_object_metadata["ETag"],
+                            "IsFile" : False,
+                        }
+
+                for file_object in page.get("Contents", []):
+                    file_object : dict
+                    if file_object["Key"] != path_key:
+                        file_object["IsFile"] = True
+                        if name_only:
+                            yield file_object["Key"]
+                        else:
+                            yield file_object
+        
                     
     @check_mounted
     def get_object(self, key : str) -> dict:

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

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

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

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

{ngpiris-5.3.1 → ngpiris-5.4.0}/pyproject.toml

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