cloudos-cli 2.75.0__tar.gz → 2.75.1__tar.gz

{cloudos_cli-2.75.0 → cloudos_cli-2.75.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudos_cli
-Version: 2.75.0
+Version: 2.75.1
 Summary: Python package for interacting with CloudOS
 Home-page: https://github.com/lifebit-ai/cloudos-cli
 Author: David Piñeyro

{cloudos_cli-2.75.0 → cloudos_cli-2.75.1}/cloudos_cli/__main__.py

@@ -702,9 +702,9 @@ def job_status(ctx,
         print(f'\tTo further check your job status you can either go to {j_url} ' +
               'or repeat the command you just used.')
     except BadRequestException as e:
-        raise ValueError(f"Job '{job_id}' not found or not accessible: {str(e)}")
+        raise ValueError(f"Job '{job_id}' not found or not accessible. {str(e)}")
     except Exception as e:
-        raise ValueError(f"Failed to retrieve working directory for job '{job_id}': {str(e)}")
+        raise ValueError(f"Failed to retrieve working directory for job '{job_id}'. {str(e)}")
 
 
 @job.command('workdir')
@@ -889,9 +889,9 @@ def job_workdir(ctx,
             link_client.link_folder(workdir.strip(), session_id)
             
     except BadRequestException as e:
-        raise ValueError(f"Job '{job_id}' not found or not accessible: {str(e)}")
+        raise ValueError(f"Job '{job_id}' not found or not accessible. {str(e)}")
     except Exception as e:
-        raise ValueError(f"Failed to retrieve working directory for job '{job_id}': {str(e)}")
+        raise ValueError(f"Failed to retrieve working directory for job '{job_id}'. {str(e)}")
 
     # Delete workdir directory if requested
     if delete:
@@ -919,9 +919,9 @@ def job_workdir(ctx,
             job.delete_job_results(job_id, "workDirectory", verify=verify_ssl)
             click.secho('\nIntermediate results directories deleted successfully.', fg='green', bold=True)
         except BadRequestException as e:
-            raise ValueError(f"Job '{job_id}' not found or not accessible: {str(e)}")
+            raise ValueError(f"Job '{job_id}' not found or not accessible. {str(e)}")
         except Exception as e:
-            raise ValueError(f"Failed to retrieve intermediate results for job '{job_id}': {str(e)}")
+            raise ValueError(f"Failed to retrieve intermediate results for job '{job_id}'. {str(e)}")
     else:
         if yes:
             click.secho("\n'--yes' flag is ignored when '--delete' is not specified.", fg='yellow', bold=True)
@@ -1030,9 +1030,9 @@ def job_logs(ctx,
                     print('\tNo logs found to link.')
             
     except BadRequestException as e:
-        raise ValueError(f"Job '{job_id}' not found or not accessible: {str(e)}")
+        raise ValueError(f"Job '{job_id}' not found or not accessible. {str(e)}")
     except Exception as e:
-        raise ValueError(f"Failed to retrieve logs for job '{job_id}': {str(e)}")
+        raise ValueError(f"Failed to retrieve logs for job '{job_id}'. {str(e)}")
 
 
 @job.command('results')
@@ -1247,9 +1247,9 @@ def job_results(ctx,
             if yes:
                 click.secho("\n'--yes' flag is ignored when '--delete' is not specified.", fg='yellow', bold=True)
     except BadRequestException as e:
-        raise ValueError(f"Job '{job_id}' not found or not accessible: {str(e)}")
+        raise ValueError(f"Job '{job_id}' not found or not accessible. {str(e)}")
     except Exception as e:
-        raise ValueError(f"Failed to retrieve results for job '{job_id}': {str(e)}")
+        raise ValueError(f"Failed to retrieve results for job '{job_id}'. {str(e)}")
 
 
 @job.command('details')
@@ -1328,9 +1328,9 @@ def job_details(ctx,
         if '403' in str(e) or 'Forbidden' in str(e):
             raise ValueError("API can only show job details of your own jobs, cannot see other user's job details.")
         else:
-            raise ValueError(f"Job '{job_id}' not found or not accessible: {str(e)}")
+            raise ValueError(f"Job '{job_id}' not found or not accessible. {str(e)}")
     except Exception as e:
-        raise ValueError(f"Failed to retrieve details for job '{job_id}': {str(e)}")
+        raise ValueError(f"Failed to retrieve details for job '{job_id}'. {str(e)}")
     create_job_details(json.loads(j_details.content), job_id, output_format, output_basename, parameters, cloudos_url)
 
 
@@ -1860,9 +1860,9 @@ def clone_resume(ctx,
         print(f"Job successfully {mode}d. New job ID: {cloned_resumed_job_id}")
 
     except BadRequestException as e:
-        raise ValueError(f"Failed to {mode} job. Job '{job_id}' not found or not accessible: {str(e)}")
+        raise ValueError(f"Failed to {mode} job. Job '{job_id}' not found or not accessible. {str(e)}")
     except Exception as e:
-        raise ValueError(f"Failed to {mode} job. Failed to {action} job '{job_id}': {str(e)}")
+        raise ValueError(f"Failed to {mode} job. Failed to {action} job '{job_id}'. {str(e)}")
 
 
 # Apply the best Click solution: Set specific help text for each command registration
@@ -3217,7 +3217,7 @@ def list_files(ctx,
                         console.print(item['name'])
 
     except Exception as e:
-        raise ValueError(f"Failed to list files for project '{project_name}': {str(e)}")
+        raise ValueError(f"Failed to list files for project '{project_name}'. {str(e)}")
 
 
 @datasets.command(name="mv")
@@ -3281,7 +3281,7 @@ def move_files(ctx, source_path, destination_path, apikey, cloudos_url, workspac
     try:
         source_contents = source_client.list_folder_content(source_parent_path)
     except Exception as e:
-        raise ValueError(f"Could not resolve source path '{source_path}': {str(e)}")
+        raise ValueError(f"Could not resolve source path '{source_path}'. {str(e)}")
 
     found_source = None
     for collection in ["files", "folders"]:
@@ -3322,7 +3322,7 @@ def move_files(ctx, source_path, destination_path, apikey, cloudos_url, workspac
             raise ValueError(f"Unrecognized folderType '{folder_type}' for destination '{destination_path}'")
 
     except Exception as e:
-        raise ValueError(f"Could not resolve destination path '{destination_path}': {str(e)}")
+        raise ValueError(f"Could not resolve destination path '{destination_path}'. {str(e)}")
     print(f"Moving {source_kind} '{source_item_name}' to '{destination_path}' " +
                f"in project '{destination_project_name} ...")
     # === Perform Move ===
@@ -3337,9 +3337,9 @@ def move_files(ctx, source_path, destination_path, apikey, cloudos_url, workspac
             click.secho(f"{source_kind} '{source_item_name}' moved to '{destination_path}' " +
                         f"in project '{destination_project_name}'.", fg="green", bold=True)
         else:
-            raise ValueError(f"Move failed: {response.status_code} - {response.text}")
+            raise ValueError(f"Move failed. {response.status_code} - {response.text}")
     except Exception as e:
-        raise ValueError(f"Move operation failed: {str(e)}")
+        raise ValueError(f"Move operation failed. {str(e)}")
 
 
 @datasets.command(name="rename")
@@ -3392,7 +3392,7 @@ def renaming_item(ctx,
     try:
         contents = client.list_folder_content(parent_path)
     except Exception as e:
-        raise ValueError(f"Could not list contents at '{parent_path or '[project root]'}': {str(e)}")
+        raise ValueError(f"Could not list contents at '{parent_path or '[project root]'}'. {str(e)}")
 
     # Search for file/folder
     found_item = None
@@ -3420,9 +3420,9 @@ def renaming_item(ctx,
                 bold=True
             )
         else:
-            raise ValueError(f"Rename failed: {response.status_code} - {response.text}")
+            raise ValueError(f"Rename failed. {response.status_code} - {response.text}")
     except Exception as e:
-        raise ValueError(f"Rename operation failed: {str(e)}")
+        raise ValueError(f"Rename operation failed. {str(e)}")
 
 
 @datasets.command(name="cp")
@@ -3490,7 +3490,7 @@ def copy_item_cli(ctx,
         source_content = source_client.list_folder_content(source_parent)
         dest_content = dest_client.list_folder_content(dest_parent)
     except Exception as e:
-        raise ValueError(f"Could not access paths: {str(e)}")
+        raise ValueError(f"Could not access paths. {str(e)}")
     # Find the source item
     source_item = None
     for item in source_content.get('files', []) + source_content.get('folders', []):
@@ -3532,9 +3532,9 @@ def copy_item_cli(ctx,
         if response.ok:
             click.secho("Item copied successfully.", fg="green", bold=True)
         else:
-            raise ValueError(f"Copy failed: {response.status_code} - {response.text}")
+            raise ValueError(f"Copy failed. {response.status_code} - {response.text}")
     except Exception as e:
-        raise ValueError(f"Copy operation failed: {str(e)}")
+        raise ValueError(f"Copy operation failed. {str(e)}")
 
 
 @datasets.command(name="mkdir")
@@ -3593,7 +3593,7 @@ def mkdir_item(ctx,
     try:
         contents = client.list_folder_content(parent_of_parent_path)
     except Exception as e:
-        raise ValueError(f"Could not list contents at '{parent_of_parent_path}': {str(e)}")
+        raise ValueError(f"Could not list contents at '{parent_of_parent_path}'. {str(e)}")
 
     # Find the parent folder in the contents
     folder_info = next(
@@ -3621,9 +3621,9 @@ def mkdir_item(ctx,
         if response.ok:
             click.secho(f"Folder '{folder_name}' created under '{parent_path}'", fg="green", bold=True)
         else:
-            raise ValueError(f"Folder creation failed: {response.status_code} - {response.text}")
+            raise ValueError(f"Folder creation failed. {response.status_code} - {response.text}")
     except Exception as e:
-        raise ValueError(f"Folder creation failed: {str(e)}")
+        raise ValueError(f"Folder creation failed. {str(e)}")
 
 
 @datasets.command(name="rm")
@@ -3675,7 +3675,7 @@ def rm_item(ctx,
     try:
         contents = client.list_folder_content(parent_path)
     except Exception as e:
-        raise ValueError(f"Could not list contents at '{parent_path or '[project root]'}': {str(e)}")
+        raise ValueError(f"Could not list contents at '{parent_path or '[project root]'}'. {str(e)}")
 
     found_item = None
     for item in contents.get('files', []) + contents.get('folders', []):
@@ -3710,9 +3710,9 @@ def rm_item(ctx,
                 )
                 click.secho("This item will still be available on your Cloud Provider.", fg="yellow")
         else:
-            raise ValueError(f"Removal failed: {response.status_code} - {response.text}")
+            raise ValueError(f"Removal failed. {response.status_code} - {response.text}")
     except Exception as e:
-        raise ValueError(f"Remove operation failed: {str(e)}")
+        raise ValueError(f"Remove operation failed. {str(e)}")
 
 
 @datasets.command(name="link")
@@ -3833,7 +3833,7 @@ def link(ctx,
     except Exception as e:
         if is_s3:
             print("If you are linking an S3 path, please ensure it is a folder.")
-        raise ValueError(f"Could not link folder: {e}")
+        raise ValueError(f"Could not link folder. {e}")
 
 
 @images.command(name="ls")

cloudos_cli-2.75.1/cloudos_cli/_version.py

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

{cloudos_cli-2.75.0 → cloudos_cli-2.75.1}/cloudos_cli/clos.py

@@ -422,7 +422,7 @@ class Cloudos:
         if r_json["status"] =='initializing' or r_json["status"] =='scheduled':
             raise ValueError("Logs are not yet available. The job is still initializing.")
         if "logs" not in r_json:
-            raise ValueError("ERROR: Logs are not available.")
+            raise ValueError("Logs are not available.")
         else:
             logs_obj = r_json["logs"]
             cloud_name, cloud_meta, cloud_storage = find_cloud(self.cloudos_url, self.apikey, workspace_id, logs_obj)
@@ -651,7 +651,7 @@ class Cloudos:
         try:
             project_content = ds.list_project_content()
         except Exception as e:
-            raise ValueError(f"Failed to list project content for project '{project_name}': {str(e)}")
+            raise ValueError(f"Failed to list project content for project '{project_name}'. {str(e)}")
         
         # Find the Analysis Results folder ID
         analysis_results_id = None
@@ -669,7 +669,7 @@ class Cloudos:
             response = self.get_folder_items_deletion_status(analysis_results_id, workspace_id, verify)
             content = json.loads(response.content)
         except Exception as e:
-            raise ValueError(f"Failed to get items from Analyses Results folder: {str(e)}")
+            raise ValueError(f"Failed to get items from Analyses Results folder. {str(e)}")
         
         # The API response contains folders and files arrays
         # Find the entry matching our job_id
@@ -948,7 +948,7 @@ class Cloudos:
             else:
                 raise ValueError(f"User '{filter_owner}' not found.")
         except Exception as e:
-            raise ValueError(f"Error resolving user '{filter_owner}': {str(e)}")
+            raise ValueError(f"Error resolving user '{filter_owner}'. {str(e)}")
 
     def get_cromwell_status(self, workspace_id, verify=True):
         """Get Cromwell server status from CloudOS.
@@ -1143,7 +1143,7 @@ class Cloudos:
                 else:
                     raise ValueError(f"Project '{filter_project}' not found.")
             except Exception as e:
-                raise ValueError(f"Error resolving project '{filter_project}': {str(e)}")
+                raise ValueError(f"Error resolving project '{filter_project}'. {str(e)}")
 
         # Resolve workflow name to ID
         if filter_workflow:
@@ -1160,7 +1160,7 @@ class Cloudos:
                 else:
                     raise ValueError(f"Workflow '{filter_workflow}' not found.")
             except Exception as e:
-                raise ValueError(f"Error resolving workflow '{filter_workflow}': {str(e)}")
+                raise ValueError(f"Error resolving workflow '{filter_workflow}'. {str(e)}")
 
         # Get current user ID for filter_only_mine
         if filter_only_mine:
@@ -1172,7 +1172,7 @@ class Cloudos:
                 else:
                     raise ValueError("Could not retrieve current user information.")
             except Exception as e:
-                raise ValueError(f"Error getting current user info: {str(e)}")
+                raise ValueError(f"Error getting current user info. {str(e)}")
 
         # Resolve owner username to user ID
         if filter_owner:
@@ -1240,7 +1240,7 @@ class Cloudos:
                 else:
                     raise ValueError(f"The environment is not a batch environment so queues do not exist. Please remove the --filter-queue option.")
             except Exception as e:
-                raise ValueError(f"Error filtering by queue '{filter_queue}': {str(e)}")
+                raise ValueError(f"Error filtering by queue '{filter_queue}'. {str(e)}")
 
         # --- Apply limit after all filtering ---
         if use_pagination_mode and target_job_count != 'all' and isinstance(target_job_count, int) and target_job_count > 0:
@@ -1585,7 +1585,7 @@ class Cloudos:
         # make unique
         wt = list(dict.fromkeys(wt_all))
         if len(wt) > 1:
-            raise ValueError(f'More than one workflow type detected for {workflow_name}: {wt}')
+            raise ValueError(f'More than one workflow type ("{wt}") detected for "{workflow_name}". ')
         return str(wt[0])
 
     def is_module(self, workflow_name, workspace_id, verify=True, last=False):
@@ -1769,7 +1769,7 @@ class Cloudos:
             repository_project = workflow_url.split('/')[4]
             repository_id = repository_name
         else:
-            raise ValueError(f'Your repository platform is not supported: {platform_url}. ' +
+            raise ValueError(f'Your repository platform "{platform_url}" is not supported. ' +
                              'Please use either GitHub or BitbucketServer.')
         repository_name = workflow_url.split('/')[-1]
 
@@ -1989,7 +1989,7 @@ class Cloudos:
         pag_content = json.loads(response.content)
         max_pagination = pag_content["paginationMetadata"]["Pagination-Count"]
         if max_pagination == 0:
-            raise ValueError(f'No workflow found with name: {workflow_name} in workspace: {workspace_id}')
+            raise ValueError(f'No workflow found with name "{workflow_name}" in workspace "{workspace_id}"')
 
         return max_pagination
 
@@ -2045,9 +2045,9 @@ class Cloudos:
         wf = [wf.get("name") for wf in content.get("workflows", []) if wf.get("name") == workflow_name]
 
         if len(wf) == 0 or len(content["workflows"]) == 0:
-            raise ValueError(f'No workflow found with name: {workflow_name} in workspace: {workspace_id}')
+            raise ValueError(f'No workflow found with name "{workflow_name}" in workspace "{workspace_id}"')
         if len(wf) > 1 and not last:
-            raise ValueError(f'More than one workflow found with name: {workflow_name}. ' + \
+            raise ValueError(f'More than one workflow found with name "{workflow_name}". ' + \
                              "To run the last imported workflow use '--last' flag.")
         else:
             content = youngest_workflow_id_by_name(content, workflow_name)

{cloudos_cli-2.75.0 → cloudos_cli-2.75.1}/cloudos_cli/cost/cost.py

@@ -256,4 +256,4 @@ class CostViewer:
             else:
                 raise ValueError(f"{str(e)}")
         except Exception as e:
-            raise ValueError(f"[Error] An unexpected error occurred: {str(e)}")
+            raise ValueError(f"An unexpected error occurred. {str(e)}")

{cloudos_cli-2.75.0 → cloudos_cli-2.75.1}/cloudos_cli/jobs/job.py

@@ -391,7 +391,7 @@ class Job(Cloudos):
                              "textValue": p_value}
                     workflow_params.append(param)
             if len(workflow_params) == 0:
-                raise ValueError(f'The provided parameters are not valid: {parameter}')
+                raise ValueError(f'The provided parameters "{parameter}" are not valid. ')
         if len(example_parameters) > 0:
             for example_param in example_parameters:
                 workflow_params.append(example_param)
@@ -1101,7 +1101,7 @@ class Job(Cloudos):
                     source_job_id, field="status", verify=verify
                 )
             except Exception as e:
-                raise ValueError(f"The job status cannot be retrieved: {e}")
+                raise ValueError(f"The job status cannot be retrieved. {e}")
 
             allowed_statuses = {"completed", "aborted", "failed"}
             if status not in allowed_statuses:
@@ -1191,7 +1191,7 @@ class Job(Cloudos):
                     if not queue_id:
                         raise ValueError(f"Queue with name '{queue_name}' not found in workspace '{self.workspace_id}'")
                 except Exception as e:
-                    raise ValueError(f"Error filtering by queue '{queue_name}': {str(e)}")
+                    raise ValueError(f"Error filtering by queue '{queue_name}'. {str(e)}")
             else:
                 print("Azure workspace does not use job queues, option '--job-queue' is ignored.\n")
 
@@ -1469,11 +1469,11 @@ class Job(Cloudos):
             # NoContent - successful deletion
             return {"message": "Results deleted successfully", "status": "deleted"}
         elif response.status_code == 400:
-            raise ValueError(f"Operation not permitted: Your workspace does not have the option to delete {'results' if mode == 'analysisResults' else 'intermediate'} folders enabled. Please consult with the organisation owner to enable this feature.")
+            raise ValueError(f"Operation not permitted. Your workspace does not have the option to delete {'results' if mode == 'analysisResults' else 'intermediate'} folders enabled. Please consult with the organisation owner to enable this feature.")
         elif response.status_code == 401:
-            raise ValueError("Unauthorized: Invalid or missing API key.")
+            raise ValueError("Unauthorized. Invalid or missing API key.")
         elif response.status_code == 403:
-            raise ValueError("Forbidden: You don't have permission to delete this folder.")
+            raise ValueError("Forbidden. You don't have permission to delete this folder.")
         elif response.status_code == 404:
             if response.content:
                 try:
@@ -1484,9 +1484,9 @@ class Job(Cloudos):
                 error_message = f"Job with ID '{job_id}' not found or data does not exist."
             raise ValueError(error_message)
         elif response.status_code == 409:
-            raise ValueError("Conflict: The folder cannot be deleted due to a conflict (e.g., folder is not empty or has dependencies).")
+            raise ValueError("Conflict. The folder cannot be deleted due to a conflict (e.g., folder is not empty or has dependencies).")
         elif response.status_code == 500:
-            raise ValueError("Internal server error: The server encountered an error while processing the deletion request.")
+            raise ValueError("Internal server error. The server encountered an error while processing the deletion request.")
         elif response.status_code >= 400:
             raise BadRequestException(response)
 

{cloudos_cli-2.75.0 → cloudos_cli-2.75.1}/cloudos_cli/link/link.py

@@ -82,7 +82,7 @@ class Link(Cloudos):
         if r.status_code == 403:
             raise ValueError(f"Provided {type_folder} folder already exists with 'mounted' status")
         elif r.status_code == 401:
-            raise ValueError(f"Forbidden: Invalid API key or insufficient permissions")
+            raise ValueError(f"Forbidden. Invalid API key or insufficient permissions.")
         elif r.status_code == 400:
             r_content = json.loads(r.content)
             if r_content["message"] == "Invalid Supported DataItem folderType. Supported values are S3Folder":
@@ -236,7 +236,7 @@ class Link(Cloudos):
         r = retry_requests_get(url, headers=headers, verify=self.verify)
         
         if r.status_code == 401:
-            raise ValueError("Forbidden: Invalid API key or insufficient permissions")
+            raise ValueError("Forbidden. Invalid API key or insufficient permissions.")
         elif r.status_code == 404:
             raise ValueError(f"Interactive session {session_id} not found")
         elif r.status_code != 200:

{cloudos_cli-2.75.0 → cloudos_cli-2.75.1}/cloudos_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudos_cli
-Version: 2.75.0
+Version: 2.75.1
 Summary: Python package for interacting with CloudOS
 Home-page: https://github.com/lifebit-ai/cloudos-cli
 Author: David Piñeyro

{cloudos_cli-2.75.0 → cloudos_cli-2.75.1}/cloudos_cli.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ cloudos_cli/utils/resources.py
 tests/__init__.py
 tests/functions_for_pytest.py
 tests/test_cli_project_create.py
+tests/test_error_messages.py
 tests/test_cost/__init__.py
 tests/test_cost/test_job_cost.py
 tests/test_logging/__init__.py