cloudos-cli 2.38.3__tar.gz → 2.40.0__tar.gz

{cloudos_cli-2.38.3 → cloudos_cli-2.40.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudos_cli
-Version: 2.38.3
+Version: 2.40.0
 Summary: Python package for interacting with CloudOS
 Home-page: https://github.com/lifebit-ai/cloudos-cli
 Author: David Piñeyro
@@ -1006,8 +1006,8 @@ If you require more information on the files and folder listed, you can use the
 - Owner
 - Size in human readable format
 - Last updated
-- Filepath (the file or folder name)
-- S3 Path
+- File Name (the file or folder name)
+- Storage Path
 
 ##### Moving files
 

{cloudos_cli-2.38.3 → cloudos_cli-2.40.0}/README.md

@@ -971,8 +971,8 @@ If you require more information on the files and folder listed, you can use the
 - Owner
 - Size in human readable format
 - Last updated
-- Filepath (the file or folder name)
-- S3 Path
+- File Name (the file or folder name)
+- Storage Path
 
 ##### Moving files
 

{cloudos_cli-2.38.3 → cloudos_cli-2.40.0}/cloudos_cli/__main__.py

@@ -2653,7 +2653,7 @@ def run_bash_array_job(ctx,
 @click.option('--details',
               help=('When selected, it prints the details of the listed files. ' +
                     'Details contains "Type", "Owner", "Size", "Last Updated", ' +
-                    '"Filepath", "S3 Path".'),
+                    '"File Name", "Storage Path".'),
               is_flag=True)
 @click.pass_context
 def list_files(ctx,
@@ -2668,10 +2668,9 @@ def list_files(ctx,
                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,
@@ -2679,28 +2678,25 @@ def list_files(ctx,
         'project_name': False
     }
 
-    user_options = (
-        config_manager.load_profile_and_validate_data(
-            ctx,
-            INIT_PROFILE,
-            CLOUDOS_URL,
-            profile=profile,
-            required_dict=required_dict,
-            apikey=apikey,
-            cloudos_url=cloudos_url,
-            workspace_id=workspace_id,
-            workflow_name=None,
-            repository_platform=None,
-            execution_platform=None,
-            project_name=project_name
-        )
+    user_options = config_manager.load_profile_and_validate_data(
+        ctx,
+        INIT_PROFILE,
+        CLOUDOS_URL,
+        profile=profile,
+        required_dict=required_dict,
+        apikey=apikey,
+        cloudos_url=cloudos_url,
+        workspace_id=workspace_id,
+        workflow_name=None,
+        repository_platform=None,
+        execution_platform=None,
+        project_name=project_name
     )
-    # Setup only the required parameters
+
     apikey = user_options['apikey']
     cloudos_url = user_options['cloudos_url']
     workspace_id = user_options['workspace_id']
     project_name = user_options['project_name']
-
     verify_ssl = ssl_selector(disable_ssl_verification, ssl_cert)
 
     datasets = Datasets(
@@ -2719,32 +2715,31 @@ def list_files(ctx,
             contents = result.get("files", []) + result.get("folders", [])
 
         if details:
-            console = Console(width=None)  # Avoid terminal width truncation
-
+            console = Console(width=None)
             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)
+            table.add_column("File Name", style="bold", overflow="fold")
+            table.add_column("Storage 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")
+                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:
+                    name = surname = ""
+                if name and surname:
+                    owner = f"{name} {surname}"
+                elif name:
+                    owner = name
+                elif surname:
+                    owner = surname
                 else:
                     owner = "-"
 
@@ -2754,14 +2749,17 @@ def list_files(ctx,
                 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 "-"
+                if item.get("fileType") == "S3File" or item.get("folderType") == "S3Folder":
+                    bucket = item.get("s3BucketName")
+                    key = item.get("s3ObjectKey") or item.get("s3Prefix")
+                    s3_path = f"s3://{bucket}/{key}" if bucket and key else "-"
+                elif item.get("fileType") == "AzureBlobFile" or item.get("folderType") == "AzureBlobFolder":
+                    account = item.get("blobStorageAccountName")
+                    container = item.get("blobContainerName")
+                    key = item.get("blobName") if item.get("fileType") == "AzureBlobFile" else item.get("blobPrefix")
+                    s3_path = f"az://{account}.blob.core.windows.net/{container}/{key}" if account and container and 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 "-"
+                    s3_path = "-"
 
                 style = Style(color="blue", underline=True) if is_folder else None
                 table.add_row(type_, owner, size, updated, filepath, s3_path, style=style)

cloudos_cli-2.40.0/cloudos_cli/_version.py

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

{cloudos_cli-2.38.3 → cloudos_cli-2.40.0}/cloudos_cli/datasets/datasets.py

@@ -5,6 +5,7 @@ This is the main class for file explorer (datasets).
 from dataclasses import dataclass
 from typing import Union
 from cloudos_cli.clos import Cloudos
+from cloudos_cli.utils.errors import BadRequestException
 from cloudos_cli.utils.requests import retry_requests_get, retry_requests_put, retry_requests_post, retry_requests_delete
 import json
 
@@ -127,6 +128,8 @@ class Datasets(Cloudos):
                              f' and an importsFile \'{importsfile}\' was not found')
         else:
             raise ValueError(f'[ERROR] No {name} element in {resource} was found')
+        
+
     def list_project_content(self):
         """
         Fetch the information of the directories present in the projects.
@@ -150,6 +153,8 @@ class Datasets(Cloudos):
                                                                                   self.project_id,
                                                                                   self.workspace_id),
                                headers=headers, verify=self.verify)
+        if r.status_code >= 400:
+            raise BadRequestException(r)
         raw = r.json()
         datasets = raw.get("datasets", [])
         #  Normalize response
@@ -195,6 +200,8 @@ class Datasets(Cloudos):
                                                                               folder_id,
                                                                               self.workspace_id),
                                 headers=headers, verify=self.verify)
+        if r.status_code >= 400:
+            raise BadRequestException(r)
         return r.json()
 
     def list_s3_folder_content(self, s3_bucket_name, s3_relative_path):
@@ -224,6 +231,8 @@ class Datasets(Cloudos):
                                                                                                              s3_relative_path,
                                                                                                              self.workspace_id),
                                 headers=headers, verify=self.verify)
+        if r.status_code >= 400:
+            raise BadRequestException(r)
         raw = r.json()
 
         #  Normalize response
@@ -265,8 +274,63 @@ class Datasets(Cloudos):
                                                                                      folder_id,
                                                                                      self.workspace_id),
                                 headers=headers, verify=self.verify)
+        if r.status_code >= 400:
+            raise BadRequestException(r)
         return r.json()
     
+    def list_azure_container_content(self, container_name: str, storage_account_name: str, path: str):
+        """
+        List contents of an Azure Blob container path.
+        """
+        headers = {
+            "Content-type": "application/json",
+            "apikey": self.apikey
+        }
+
+        url = f"{self.cloudos_url}/api/v1/data-access/azure/container-contents"
+        url += f"?containerName={container_name}&storageAccountName={storage_account_name}"
+        url += f"&path={path}&teamId={self.workspace_id}"
+
+        r = retry_requests_get(url, headers=headers, verify=self.verify)
+        if r.status_code >= 400:
+            raise BadRequestException(r)
+        raw = r.json()
+
+        # Normalize response to match existing expectations
+        normalized = {"folders": [], "files": []}
+        for item in raw.get("contents", []):
+            is_dir = item.get("isDir", False)
+
+            # Set a name field based on the last part of the blob path
+            path_str = item.get("path", "")
+            name = item.get("name") or path_str.rstrip("/").split("/")[-1]
+
+            # inject expected structure
+            if is_dir:
+                normalized["folders"].append({
+                    "_id": item.get("_id"),
+                    "name": name,
+                    "folderType": "AzureBlobFolder",
+                    "blobPrefix": path_str,
+                    "blobContainerName": container_name,
+                    "blobStorageAccountName": storage_account_name,
+                    "kind": "Folder" 
+                })
+            else:
+                normalized["files"].append({
+                    "_id": item.get("_id"),
+                    "name": name,
+                    "fileType": "AzureBlobFile",
+                    "blobName": path_str,
+                    "blobContainerName": container_name,
+                    "blobStorageAccountName": storage_account_name,
+                    "sizeInBytes": item.get("size", 0),
+                    "updatedAt": item.get("lastModified"),
+                    "kind": "File" 
+                })
+
+        return normalized
+
     def list_folder_content(self, path=None):
         """
         Wrapper to list contents of a CloudOS folder.
@@ -324,6 +388,21 @@ class Datasets(Cloudos):
                             path_depth += 1
                             break
 
+                    elif folder_type == "AzureBlobFolder":
+                        container_name = job_folder['blobContainerName']
+                        storage_account_name = job_folder['blobStorageAccountName']
+                        blob_prefix = job_folder['blobPrefix']
+                        # trailing slash is mandatory for azure, otherwise it will not list the content of thefolde, just the folder 
+                        if not blob_prefix.endswith('/'):
+                            blob_prefix += '/'
+
+                        if path_depth == len(parts) - 1:
+                            return self.list_azure_container_content(container_name, storage_account_name, blob_prefix)
+                        else:
+                            sub_path = '/'.join(parts[0:path_depth+1])
+                            folder_content = self.list_folder_content(sub_path)
+                            path_depth += 1
+                            break
                     else:
                         raise ValueError(f"Unsupported folder type '{folder_type}' for path '{path}'")
 
@@ -366,6 +445,8 @@ class Datasets(Cloudos):
             }
         }
         response = retry_requests_put(url, headers=headers, data=json.dumps(payload), verify=self.verify)
+        if response.status_code >= 400:
+            raise BadRequestException(response)
         return response
 
     def rename_item(self, item_id: str, new_name: str, kind: str):
@@ -403,6 +484,8 @@ class Datasets(Cloudos):
         }
 
         response = retry_requests_put(url, headers=headers, data=json.dumps(payload), verify=self.verify)
+        if response.status_code >= 400:
+            raise BadRequestException(response)
         return response
     
     def copy_item(self, item, destination_id, destination_kind):
@@ -446,7 +529,8 @@ class Datasets(Cloudos):
         else:
             raise ValueError(f"Unknown item type for copy: {item.get('name')}")
         response = retry_requests_post(url, headers=headers, json=payload)
-
+        if response.status_code >= 400:
+            raise BadRequestException(response)
         return response
     
     def create_virtual_folder(self, name: str, parent_id: str, parent_kind: str):
@@ -487,6 +571,8 @@ class Datasets(Cloudos):
         }
 
         response = retry_requests_post(url, headers=headers, json=payload, verify=self.verify)
+        if response.status_code >= 400:
+            raise BadRequestException(response)
         return response
     
     def delete_item(self, item_id: str, kind: str):
@@ -517,4 +603,6 @@ class Datasets(Cloudos):
         }
 
         response = retry_requests_delete(url, headers=headers, verify=self.verify)
+        if response.status_code >= 400:
+            raise BadRequestException(response)
         return response

{cloudos_cli-2.38.3 → cloudos_cli-2.40.0}/cloudos_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudos_cli
-Version: 2.38.3
+Version: 2.40.0
 Summary: Python package for interacting with CloudOS
 Home-page: https://github.com/lifebit-ai/cloudos-cli
 Author: David Piñeyro
@@ -1006,8 +1006,8 @@ If you require more information on the files and folder listed, you can use the
 - Owner
 - Size in human readable format
 - Last updated
-- Filepath (the file or folder name)
-- S3 Path
+- File Name (the file or folder name)
+- Storage Path
 
 ##### Moving files
 

cloudos_cli-2.38.3/cloudos_cli/_version.py

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