cloudos-cli 2.26.1__tar.gz → 2.27.0__tar.gz

{cloudos_cli-2.26.1 → cloudos_cli-2.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudos_cli
-Version: 2.26.1
+Version: 2.27.0
 Summary: Python package for interacting with CloudOS
 Home-page: https://github.com/lifebit-ai/cloudos-cli
 Author: David Piñeyro
@@ -758,9 +758,19 @@ cloudos datasets ls <path> \
     --workspace-id $WORKSPACE_ID \
     --project-name $PROJEC_NAME
 ```
+
+
 The output of this command is a list of files and folders present in the specified project.
 If the `<path>` is left empty, the command will return the list of folders present in the selected project.
 
+If you require more information on the files and folder listed, you can use the `--details` flag that will output a table containing the following columns:
+- Type (folder or file)
+- Owner
+- Size in human readable format
+- Last updated
+- Filepath (the file or folder name)
+- S3 Path
+
 ### WDL pipeline support
 
 #### Cromwell server managing

{cloudos_cli-2.26.1 → cloudos_cli-2.27.0}/README.md

@@ -723,9 +723,19 @@ cloudos datasets ls <path> \
     --workspace-id $WORKSPACE_ID \
     --project-name $PROJEC_NAME
 ```
+
+
 The output of this command is a list of files and folders present in the specified project.
 If the `<path>` is left empty, the command will return the list of folders present in the selected project.
 
+If you require more information on the files and folder listed, you can use the `--details` flag that will output a table containing the following columns:
+- Type (folder or file)
+- Owner
+- Size in human readable format
+- Last updated
+- Filepath (the file or folder name)
+- S3 Path
+
 ### WDL pipeline support
 
 #### Cromwell server managing

{cloudos_cli-2.26.1 → cloudos_cli-2.27.0}/cloudos_cli/__main__.py

@@ -8,11 +8,14 @@ from cloudos_cli.queue.queue import Queue
 import json
 import time
 import sys
-import os
-import urllib3
 from ._version import __version__
 from cloudos_cli.configure.configure import ConfigurationProfile
 from cloudos_cli.datasets import Datasets
+from cloudos_cli.utils.resources import ssl_selector, format_bytes
+from rich.console import Console
+from rich.table import Table
+from rich.style import Style
+
 
 # GLOBAL VARS
 JOB_COMPLETED = 'completed'
@@ -27,39 +30,6 @@ ABORT_JOB_STATES = ['running', 'initializing']
 CLOUDOS_URL = 'https://cloudos.lifebit.ai'
 INIT_PROFILE = 'initialisingProfile'
 
-
-def ssl_selector(disable_ssl_verification, ssl_cert):
-    """Verify value selector.
-
-    This function stablish the value that will be passed to requests.verify
-    variable.
-
-    Parameters
-    ----------
-    disable_ssl_verification : bool
-        Whether to disable SSL verification.
-    ssl_cert : string
-        String indicating the path to the SSL certificate file to use.
-
-    Returns
-    -------
-    verify_ssl : [bool | string]
-        Either a bool or a path string to be passed to requests.verify to control
-        SSL verification.
-    """
-    if disable_ssl_verification:
-        verify_ssl = False
-        print('[WARNING] Disabling SSL verification')
-        urllib3.disable_warnings()
-    elif ssl_cert is None:
-        verify_ssl = True
-    elif os.path.isfile(ssl_cert):
-        verify_ssl = ssl_cert
-    else:
-        raise FileNotFoundError(f"The specified file '{ssl_cert}' was not found")
-    return verify_ssl
-
-
 @click.group()
 @click.version_option(__version__)
 @click.pass_context
@@ -1855,6 +1825,11 @@ def run_bash_job(ctx,
 @click.option('--project-name',
               help='The name of a CloudOS project.')
 @click.option('--profile', help='Profile to use from the config file', default=None)
+@click.option('--details',
+              help=('When selected, it prints the details of the listed files. ' +
+                    'Details contains "Type", "Owner", "Size", "Last Updated", ' +
+                    '"Filepath", "S3 Path".'),
+              is_flag=True)
 @click.pass_context
 def list_files(ctx,
                apikey,
@@ -1864,14 +1839,14 @@ def list_files(ctx,
                ssl_cert,
                project_name,
                profile,
-               path):
+               path,
+               details):
     """List contents of a path within a CloudOS workspace dataset."""
 
     # fallback to ctx default if profile not specified
     profile = profile or ctx.default_map['datasets']['list'].get('profile')
 
     config_manager = ConfigurationProfile()
-
     required_dict = {
         'apikey': True,
         'workspace_id': True,
@@ -1879,7 +1854,6 @@ def list_files(ctx,
         'project_name': False
     }
 
-    # Unpack profile values first
     apikey, cloudos_url, workspace_id, workflow_name, repository_platform, execution_platform, project_name = (
         config_manager.load_profile_and_validate_data(
             ctx,
@@ -1912,21 +1886,69 @@ def list_files(ctx,
         result = datasets.list_folder_content(path)
         contents = result.get("contents") or result.get("datasets", [])
         if not contents:
-            files = result.get("files", [])
-            folders = result.get("folders", [])
-            contents = [{"name": f["name"], "isDir": False} for f in files] + \
-                       [{"name": f["name"], "isDir": True} for f in folders]
+            contents = result.get("files", []) + result.get("folders", [])
+
+        if details:
+            console = Console(width=None)  # Avoid terminal width truncation
+
+            table = Table(show_header=True, header_style="bold white")
+            table.add_column("Type", style="cyan", no_wrap=True)
+            table.add_column("Owner", style="white")
+            table.add_column("Size", style="magenta")
+            table.add_column("Last Updated", style="green")
+            table.add_column("Filepath", style="bold", overflow="fold")
+            table.add_column("S3 Path", style="dim", no_wrap=False, overflow="fold", ratio=2)
+
+            for item in contents:
+                is_folder = "folderType" in item or item.get("isDir", False)
+                type_ = "folder" if is_folder else "file"
+
+                user = item.get("user")
+                if isinstance(user, dict):
+                    name = user.get("name", "").strip()
+                    surname = user.get("surname", "").strip()
+                    if name and surname:
+                        owner = f"{name} {surname}"
+                    elif name:
+                        owner = name
+                    elif surname:
+                        owner = surname
+                    else:
+                        owner = "-"
+                else:
+                    owner = "-"
+
+                raw_size = item.get("sizeInBytes", item.get("size"))
+                size = format_bytes(raw_size) if not is_folder and raw_size is not None else "-"
+
+                updated = item.get("updatedAt") or item.get("lastModified", "-")
+                filepath = item.get("name", "-")
+
+                if is_folder:
+                    s3_bucket = item.get("s3BucketName")
+                    s3_key = item.get("s3Prefix")
+                    s3_path = f"s3://{s3_bucket}/{s3_key}" if s3_bucket and s3_key else "-"
+                else:
+                    s3_bucket = item.get("s3BucketName")
+                    s3_key = item.get("s3ObjectKey") or item.get("s3Prefix")
+                    s3_path = f"s3://{s3_bucket}/{s3_key}" if s3_bucket and s3_key else "-"
+
+                style = Style(color="blue", underline=True) if is_folder else None
+                table.add_row(type_, owner, size, updated, filepath, s3_path, style=style)
+
+            console.print(table)
 
-        for item in contents:
-            name = item.get("name", "")
-            if item.get("isDir"):
-                name = click.style(name, fg="blue", underline=True)
-            click.echo(name)
+        else:
+            console = Console()
+            for item in contents:
+                name = item.get("name", "")
+                if item.get("isDir"):
+                    console.print(f"[blue underline]{name}[/]")
+                else:
+                    console.print(name)
 
     except Exception as e:
         click.echo(f"[ERROR] {str(e)}", err=True)
 
-
 if __name__ == "__main__":
     run_cloudos_cli()
-

cloudos_cli-2.27.0/cloudos_cli/_version.py

@@ -0,0 +1 @@
+__version__ = '2.27.0'

{cloudos_cli-2.26.1 → cloudos_cli-2.27.0}/cloudos_cli/datasets/datasets.py

@@ -150,7 +150,12 @@ class Datasets(Cloudos):
                                                                                   self.project_id,
                                                                                   self.workspace_id),
                                headers=headers, verify=self.verify)
-        return r.json()
+        raw = r.json()
+
+        #  Normalize response
+        for item in raw.get("datasets", []):
+            item["folderType"] = True
+        return raw
 
     def list_datasets_content(self, folder_name):
         """Uses
@@ -187,6 +192,7 @@ class Datasets(Cloudos):
                                                                               self.workspace_id),
                                 headers=headers, verify=self.verify)
         return r.json()
+
     def list_s3_folder_content(self, s3_bucket_name, s3_relative_path):
         """Uses
         ----------

{cloudos_cli-2.26.1 → cloudos_cli-2.27.0}/cloudos_cli/utils/__init__.py

@@ -4,6 +4,6 @@ Utility functions and classes to use across the package.
 
 from .errors import BadRequestException, TimeOutException
 from .requests import retry_requests_get,  retry_requests_post
+from .resources import format_bytes, ssl_selector
 
-
-__all__ = ['errors', 'requests']
+__all__ = ['errors', 'requests', 'resources']

cloudos_cli-2.27.0/cloudos_cli/utils/resources.py

@@ -0,0 +1,46 @@
+import os
+import urllib3
+
+def format_bytes(size):
+    """Convert bytes to human-readable format (e.g., 1.2 MB)."""
+    if size is None:
+        return "-"
+    power = 1024
+    n = 0
+    labels = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']
+    while size >= power and n < len(labels) - 1:
+        size /= power
+        n += 1
+    return f"{size:.1f} {labels[n]}"
+
+
+def ssl_selector(disable_ssl_verification, ssl_cert):
+    """Verify value selector.
+
+    This function stablish the value that will be passed to requests.verify
+    variable.
+
+    Parameters
+    ----------
+    disable_ssl_verification : bool
+        Whether to disable SSL verification.
+    ssl_cert : string
+        String indicating the path to the SSL certificate file to use.
+
+    Returns
+    -------
+    verify_ssl : [bool | string]
+        Either a bool or a path string to be passed to requests.verify to control
+        SSL verification.
+    """
+    if disable_ssl_verification:
+        verify_ssl = False
+        print('[WARNING] Disabling SSL verification')
+        urllib3.disable_warnings()
+    elif ssl_cert is None:
+        verify_ssl = True
+    elif os.path.isfile(ssl_cert):
+        verify_ssl = ssl_cert
+    else:
+        raise FileNotFoundError(f"The specified file '{ssl_cert}' was not found")
+    return verify_ssl

{cloudos_cli-2.26.1 → cloudos_cli-2.27.0}/cloudos_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudos_cli
-Version: 2.26.1
+Version: 2.27.0
 Summary: Python package for interacting with CloudOS
 Home-page: https://github.com/lifebit-ai/cloudos-cli
 Author: David Piñeyro
@@ -758,9 +758,19 @@ cloudos datasets ls <path> \
     --workspace-id $WORKSPACE_ID \
     --project-name $PROJEC_NAME
 ```
+
+
 The output of this command is a list of files and folders present in the specified project.
 If the `<path>` is left empty, the command will return the list of folders present in the selected project.
 
+If you require more information on the files and folder listed, you can use the `--details` flag that will output a table containing the following columns:
+- Type (folder or file)
+- Owner
+- Size in human readable format
+- Last updated
+- Filepath (the file or folder name)
+- S3 Path
+
 ### WDL pipeline support
 
 #### Cromwell server managing

{cloudos_cli-2.26.1 → cloudos_cli-2.27.0}/cloudos_cli.egg-info/SOURCES.txt

@@ -24,5 +24,6 @@ cloudos_cli/queue/queue.py
 cloudos_cli/utils/__init__.py
 cloudos_cli/utils/errors.py
 cloudos_cli/utils/requests.py
+cloudos_cli/utils/resources.py
 tests/__init__.py
 tests/functions_for_pytest.py

cloudos_cli-2.26.1/cloudos_cli/_version.py

@@ -1 +0,0 @@
-__version__ = '2.26.1'