cloudos-cli 2.68.0__tar.gz → 2.69.1__tar.gz

{cloudos_cli-2.68.0 → cloudos_cli-2.69.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudos_cli
-Version: 2.68.0
+Version: 2.69.1
 Summary: Python package for interacting with CloudOS
 Home-page: https://github.com/lifebit-ai/cloudos-cli
 Author: David Piñeyro
@@ -669,6 +669,41 @@ You can also link all result directories to an interactive session using the `--
 cloudos job results --profile my_profile --job-id "12345678910" --link --session-id your_session_id
 ```
 
+**Check Results Deletion Status**
+
+You can check the deletion status of a job's results folder using the `--status` flag. This is useful for monitoring the deletion lifecycle of analysis results.
+
+```bash
+cloudos job results --status --profile my_profile --job-id "12345678910"
+```
+
+The command will display the current status of the results folder. Possible statuses include:
+- **available**: Results are available and accessible
+- **scheduled for deletion**: Results are scheduled to be deleted
+- **deleting**: Results are currently being deleted
+- **deleted**: Results have been deleted
+- **failed to delete**: Deletion process failed
+
+Example output for available results:
+```console
+The results of job 1234567890 are in status: available
+```
+
+For results in any state other than available, the output includes additional information about when the status changed and who initiated the change:
+```console
+The results of job 6912036aa6ed001148c96018 are in status: scheduled for deletion
+Status changed at: 2025-11-11T14:43:44.416Z
+User: Leila Mansouri (leila.mansouri@lifebit.ai)
+```
+
+Use the `--verbose` flag to see detailed information including the results folder name, folder ID, creation and update timestamps:
+```bash
+cloudos job results --status --profile my_profile --job-id "12345678910" --verbose
+```
+
+> [!NOTE]
+> If results have been completely deleted, the command will report that the results folder was not found, which may indicate that results have been deleted or scheduled for deletion.
+
 
 #### Clone or Resume job
 
@@ -930,6 +965,42 @@ cloudos job workdir \
     --link --session-id your_session_id
 ```
 
+**Check Working Directory Deletion Status**
+
+You can check the deletion status of a job's working directory using the `--status` flag. This is useful for monitoring the deletion lifecycle of intermediate job files.
+
+```bash
+cloudos job workdir --status --profile my_profile --job-id "12345678910"
+```
+
+The command will display the current status of the working directory folder. Possible statuses include:
+- **available**: Working directory is available and accessible
+- **scheduled for deletion**: Working directory is scheduled to be deleted
+- **deleting**: Working directory is currently being deleted
+- **deleted**: Working directory has been deleted
+- **failed to delete**: Deletion process failed
+
+Example output for available working directory:
+```console
+The working directory of job 6912036aa6ed001148c96018 is in status: available
+```
+
+For working directories in any state other than available, the output includes additional information about when the status changed and who initiated the change:
+```console
+The working directory of job 6912036aa6ed001148c96018 is in status: scheduled for deletion
+Status changed at: 2025-11-11T14:43:44.416Z
+User: Leila Mansouri (leila.mansouri@lifebit.ai)
+```
+
+Use the `--verbose` flag to see detailed information including the working directory folder name, folder ID, creation and update timestamps:
+```bash
+cloudos job workdir --status --profile my_profile --job-id "12345678910" --verbose
+```
+
+> [!NOTE]
+> This command only works for jobs that were run with resumable mode enabled (using the `--resumable` flag). Jobs without resumable mode will not have a working directory to check.
+> If the working directory has been completely deleted, the command will report that the working directory was not found.
+
 #### List Jobs
 
 You can get a summary of workspace jobs in two different formats:

{cloudos_cli-2.68.0 → cloudos_cli-2.69.1}/README.md

@@ -634,6 +634,41 @@ You can also link all result directories to an interactive session using the `--
 cloudos job results --profile my_profile --job-id "12345678910" --link --session-id your_session_id
 ```
 
+**Check Results Deletion Status**
+
+You can check the deletion status of a job's results folder using the `--status` flag. This is useful for monitoring the deletion lifecycle of analysis results.
+
+```bash
+cloudos job results --status --profile my_profile --job-id "12345678910"
+```
+
+The command will display the current status of the results folder. Possible statuses include:
+- **available**: Results are available and accessible
+- **scheduled for deletion**: Results are scheduled to be deleted
+- **deleting**: Results are currently being deleted
+- **deleted**: Results have been deleted
+- **failed to delete**: Deletion process failed
+
+Example output for available results:
+```console
+The results of job 1234567890 are in status: available
+```
+
+For results in any state other than available, the output includes additional information about when the status changed and who initiated the change:
+```console
+The results of job 6912036aa6ed001148c96018 are in status: scheduled for deletion
+Status changed at: 2025-11-11T14:43:44.416Z
+User: Leila Mansouri (leila.mansouri@lifebit.ai)
+```
+
+Use the `--verbose` flag to see detailed information including the results folder name, folder ID, creation and update timestamps:
+```bash
+cloudos job results --status --profile my_profile --job-id "12345678910" --verbose
+```
+
+> [!NOTE]
+> If results have been completely deleted, the command will report that the results folder was not found, which may indicate that results have been deleted or scheduled for deletion.
+
 
 #### Clone or Resume job
 
@@ -895,6 +930,42 @@ cloudos job workdir \
     --link --session-id your_session_id
 ```
 
+**Check Working Directory Deletion Status**
+
+You can check the deletion status of a job's working directory using the `--status` flag. This is useful for monitoring the deletion lifecycle of intermediate job files.
+
+```bash
+cloudos job workdir --status --profile my_profile --job-id "12345678910"
+```
+
+The command will display the current status of the working directory folder. Possible statuses include:
+- **available**: Working directory is available and accessible
+- **scheduled for deletion**: Working directory is scheduled to be deleted
+- **deleting**: Working directory is currently being deleted
+- **deleted**: Working directory has been deleted
+- **failed to delete**: Deletion process failed
+
+Example output for available working directory:
+```console
+The working directory of job 6912036aa6ed001148c96018 is in status: available
+```
+
+For working directories in any state other than available, the output includes additional information about when the status changed and who initiated the change:
+```console
+The working directory of job 6912036aa6ed001148c96018 is in status: scheduled for deletion
+Status changed at: 2025-11-11T14:43:44.416Z
+User: Leila Mansouri (leila.mansouri@lifebit.ai)
+```
+
+Use the `--verbose` flag to see detailed information including the working directory folder name, folder ID, creation and update timestamps:
+```bash
+cloudos job workdir --status --profile my_profile --job-id "12345678910" --verbose
+```
+
+> [!NOTE]
+> This command only works for jobs that were run with resumable mode enabled (using the `--resumable` flag). Jobs without resumable mode will not have a working directory to check.
+> If the working directory has been completely deleted, the command will report that the working directory was not found.
+
 #### List Jobs
 
 You can get a summary of workspace jobs in two different formats:

{cloudos_cli-2.68.0 → cloudos_cli-2.69.1}/cloudos_cli/__main__.py

@@ -729,6 +729,9 @@ def job_status(ctx,
 @click.option('--session-id',
               help='The specific CloudOS interactive session id. Required when using --link flag.',
               required=False)
+@click.option('--status',
+              help='Check the deletion status of the working directory.',
+              is_flag=True)
 @click.option('--verbose',
               help='Whether to print information messages or not.',
               is_flag=True)
@@ -748,20 +751,101 @@ def job_workdir(ctx,
                 job_id,
                 link,
                 session_id,
+                status,
                 verbose,
                 disable_ssl_verification,
                 ssl_cert,
                 profile):
-    """Get the path to the working directory of a specified job."""
+    """Get the path to the working directory of a specified job or check deletion status."""
     # apikey, cloudos_url, and workspace_id are now automatically resolved by the decorator
     # session_id is also resolved if provided in profile
 
+    verify_ssl = ssl_selector(disable_ssl_verification, ssl_cert)
+
+    # Handle --status flag
+    if status:
+        console = Console()
+        
+        if verbose:
+            console.print('[bold cyan]Checking deletion status of job working directory...[/bold cyan]')
+            console.print('\t[dim]...Preparing objects[/dim]')
+            console.print('\t[bold]Using the following parameters:[/bold]')
+            console.print(f'\t\t[cyan]CloudOS url:[/cyan] {cloudos_url}')
+            console.print(f'\t\t[cyan]Workspace ID:[/cyan] {workspace_id}')
+            console.print(f'\t\t[cyan]Job ID:[/cyan] {job_id}')
+        
+        # Use Cloudos object to access the deletion status method
+        cl = Cloudos(cloudos_url, apikey, None)
+        
+        if verbose:
+            console.print('\t[dim]The following Cloudos object was created:[/dim]')
+            console.print('\t' + str(cl) + '\n')
+        
+        try:
+            deletion_status = cl.get_workdir_deletion_status(
+                job_id=job_id,
+                workspace_id=workspace_id,
+                verify=verify_ssl
+            )
+            
+            # Convert API status to user-friendly terminology with color
+            status_config = {
+                "ready": ("available", "green"),
+                "deleting": ("deleting", "yellow"),
+                "scheduledForDeletion": ("scheduled for deletion", "yellow"),
+                "deleted": ("deleted", "red"),
+                "failedToDelete": ("failed to delete", "red")
+            }
+            
+            # Get the status of the workdir folder itself and convert it
+            api_status = deletion_status.get("status", "unknown")
+            folder_status, status_color = status_config.get(api_status, (api_status, "white"))
+            folder_info = deletion_status.get("items", {})
+            
+            # Display results in a clear, styled format with human-readable sentence
+            console.print(f'The working directory of job [cyan]{deletion_status["job_id"]}[/cyan] is in status: [bold {status_color}]{folder_status}[/bold {status_color}]')
+            
+            # For non-available statuses, always show update time and user info
+            if folder_status != "available":
+                if folder_info.get("updatedAt"):
+                    console.print(f'[magenta]Status changed at:[/magenta] {folder_info.get("updatedAt")}')
+                
+                # Show user information - prefer deletedBy over user field
+                user_info = folder_info.get("deletedBy") or folder_info.get("user", {})
+                if user_info:
+                    user_name = f"{user_info.get('name', '')} {user_info.get('surname', '')}".strip()
+                    user_email = user_info.get('email', '')
+                    if user_name or user_email:
+                        user_display = f'{user_name} ({user_email})' if user_name and user_email else (user_name or user_email)
+                        console.print(f'[blue]User:[/blue] {user_display}')
+            
+            # Display detailed information if verbose
+            if verbose:
+                console.print(f'\n[bold]Additional information:[/bold]')
+                console.print(f'  [cyan]Job name:[/cyan] {deletion_status["job_name"]}')
+                console.print(f'  [cyan]Working directory folder name:[/cyan] {deletion_status["workdir_folder_name"]}')
+                console.print(f'  [cyan]Working directory folder ID:[/cyan] {deletion_status["workdir_folder_id"]}')
+                
+                # Show folder metadata if available
+                if folder_info.get("createdAt"):
+                    console.print(f'  [cyan]Created at:[/cyan] {folder_info.get("createdAt")}')
+                if folder_info.get("updatedAt"):
+                    console.print(f'  [cyan]Updated at:[/cyan] {folder_info.get("updatedAt")}')
+                if folder_info.get("folderType"):
+                    console.print(f'  [cyan]Folder type:[/cyan] {folder_info.get("folderType")}')
+        
+        except ValueError as e:
+            raise click.ClickException(str(e))
+        except Exception as e:
+            raise click.ClickException(f"Failed to retrieve deletion status: {str(e)}")
+        
+        return
+
     # Validate link flag requirements AFTER loading profile
     if link and not session_id:
         raise click.ClickException("--session-id is required when using --link flag")
 
     print('Finding working directory path...')
-    verify_ssl = ssl_selector(disable_ssl_verification, ssl_cert)
     if verbose:
         print('\t...Preparing objects')
         print('\tUsing the following parameters:')
@@ -932,6 +1016,9 @@ def job_logs(ctx,
 @click.option('--session-id',
               help='The specific CloudOS interactive session id. Required when using --link flag.',
               required=False)
+@click.option('--status',
+              help='Check the deletion status of the job results.',
+              is_flag=True)
 @click.option('--verbose',
               help='Whether to print information messages or not.',
               is_flag=True)
@@ -951,20 +1038,101 @@ def job_results(ctx,
                 job_id,
                 link,
                 session_id,
+                status,
                 verbose,
                 disable_ssl_verification,
                 ssl_cert,
                 profile):
-    """Get the path to the results of a specified job."""
+    """Get the path to the results of a specified job or check deletion status."""
     # apikey, cloudos_url, and workspace_id are now automatically resolved by the decorator
     # session_id is also resolved if provided in profile
 
+    verify_ssl = ssl_selector(disable_ssl_verification, ssl_cert)
+
+    # Handle --status flag
+    if status:
+        console = Console()
+        
+        if verbose:
+            console.print('[bold cyan]Checking deletion status of job results...[/bold cyan]')
+            console.print('\t[dim]...Preparing objects[/dim]')
+            console.print('\t[bold]Using the following parameters:[/bold]')
+            console.print(f'\t\t[cyan]CloudOS url:[/cyan] {cloudos_url}')
+            console.print(f'\t\t[cyan]Workspace ID:[/cyan] {workspace_id}')
+            console.print(f'\t\t[cyan]Job ID:[/cyan] {job_id}')
+        
+        # Use Cloudos object to access the deletion status method
+        cl = Cloudos(cloudos_url, apikey, None)
+        
+        if verbose:
+            console.print('\t[dim]The following Cloudos object was created:[/dim]')
+            console.print('\t' + str(cl) + '\n')
+        
+        try:
+            deletion_status = cl.get_results_deletion_status(
+                job_id=job_id,
+                workspace_id=workspace_id,
+                verify=verify_ssl
+            )
+            
+            # Convert API status to user-friendly terminology with color
+            status_config = {
+                "ready": ("available", "green"),
+                "deleting": ("deleting", "yellow"),
+                "scheduledForDeletion": ("scheduled for deletion", "yellow"),
+                "deleted": ("deleted", "red"),
+                "failedToDelete": ("failed to delete", "red")
+            }
+            
+            # Get the status of the results folder itself and convert it
+            api_status = deletion_status.get("status", "unknown")
+            folder_status, status_color = status_config.get(api_status, (api_status, "white"))
+            folder_info = deletion_status.get("items", {})
+            
+            # Display results in a clear, styled format with human-readable sentence
+            console.print(f'The results of job [cyan]{deletion_status["job_id"]}[/cyan] are in status: [bold {status_color}]{folder_status}[/bold {status_color}]')
+            
+            # For non-available statuses, always show update time and user info
+            if folder_status != "available":
+                if folder_info.get("updatedAt"):
+                    console.print(f'[magenta]Status changed at:[/magenta] {folder_info.get("updatedAt")}')
+                
+                # Show user information - prefer deletedBy over user field
+                user_info = folder_info.get("deletedBy") or folder_info.get("user", {})
+                if user_info:
+                    user_name = f"{user_info.get('name', '')} {user_info.get('surname', '')}".strip()
+                    user_email = user_info.get('email', '')
+                    if user_name or user_email:
+                        user_display = f'{user_name} ({user_email})' if user_name and user_email else (user_name or user_email)
+                        console.print(f'[blue]User:[/blue] {user_display}')
+            
+            # Display detailed information if verbose
+            if verbose:
+                console.print(f'\n[bold]Additional information:[/bold]')
+                console.print(f'  [cyan]Job name:[/cyan] {deletion_status["job_name"]}')
+                console.print(f'  [cyan]Results folder name:[/cyan] {deletion_status["results_folder_name"]}')
+                console.print(f'  [cyan]Results folder ID:[/cyan] {deletion_status["results_folder_id"]}')
+                
+                # Show folder metadata if available
+                if folder_info.get("createdAt"):
+                    console.print(f'  [cyan]Created at:[/cyan] {folder_info.get("createdAt")}')
+                if folder_info.get("updatedAt"):
+                    console.print(f'  [cyan]Updated at:[/cyan] {folder_info.get("updatedAt")}')
+                if folder_info.get("folderType"):
+                    console.print(f'  [cyan]Folder type:[/cyan] {folder_info.get("folderType")}')
+        
+        except ValueError as e:
+            raise click.ClickException(str(e))
+        except Exception as e:
+            raise click.ClickException(f"Failed to retrieve deletion status: {str(e)}")
+        
+        return
+
     # Validate link flag requirements AFTER loading profile
     if link and not session_id:
         raise click.ClickException("--session-id is required when using --link flag")
 
     print('Executing results...')
-    verify_ssl = ssl_selector(disable_ssl_verification, ssl_cert)
     if verbose:
         print('\t...Preparing objects')
         print('\tUsing the following parameters:')

cloudos_cli-2.69.1/cloudos_cli/_version.py

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

{cloudos_cli-2.68.0 → cloudos_cli-2.69.1}/cloudos_cli/clos.py

@@ -224,8 +224,56 @@ class Cloudos:
         if "resumeWorkDir" not in r_json:
             raise ValueError("Working directories are not available. This may be because the analysis was run without resumable mode enabled, or because intermediate results have since been removed.")
         
-        # If resumeWorkDir exists, use the folders API to get the shared working directory
+        # Check if intermediate results have been deleted
+        # When intermediate results are deleted, resumeWorkDir becomes None but workDirectory still exists with folderId
         resume_workdir_id = r_json.get("resumeWorkDir")
+        if resume_workdir_id is None and "workDirectory" in r_json:
+            work_directory = r_json["workDirectory"]
+            # If workDirectory has a folderId, it means the job was resumeable but intermediate results were deleted
+            if work_directory.get("folderId") is not None:
+                # Get the actual deletion status from the folders API
+                api_status = None
+                try:
+                    folder_id = work_directory["folderId"]
+                    folder_response = self.get_folder_deletion_status(folder_id, workspace_id, verify)
+                    folder_data = json.loads(folder_response.content)
+                    
+                    # If the API returns the folder, get its status
+                    if folder_data and len(folder_data) > 0:
+                        api_status = folder_data[0].get("status")
+                    else:
+                        # If the folder is not returned, check if deletedBy exists in workDirectory
+                        if "deletedBy" in work_directory:
+                            api_status = "scheduledForDeletion"  # Assume scheduled for deletion
+                        
+                except Exception:
+                    # If we can't get the status, check if deletedBy exists
+                    if "deletedBy" in work_directory:
+                        api_status = "scheduledForDeletion"  # Assume scheduled for deletion
+                
+                # Build contextually appropriate error message based on status
+                # Only raise error for non-ready statuses (ready means it's available, so no error)
+                if api_status == "deleting":
+                    error_msg = "Intermediate job results are currently being deleted. The working directory is not accessible."
+                    raise ValueError(error_msg)
+                elif api_status == "scheduledForDeletion":
+                    error_msg = "Intermediate job results have been scheduled for deletion. The working directory is no longer available."
+                    raise ValueError(error_msg)
+                elif api_status == "deleted":
+                    error_msg = "Intermediate job results have been deleted. The working directory is no longer available."
+                    raise ValueError(error_msg)
+                elif api_status == "failedToDelete":
+                    error_msg = "Intermediate job results were marked for deletion but failed to delete. The working directory may not be accessible."
+                    raise ValueError(error_msg)
+                elif api_status != "ready" and api_status is not None:
+                    # For any other unknown status (not ready), raise generic error
+                    error_msg = "Intermediate job results have been removed. The working directory is no longer available."
+                    raise ValueError(error_msg)
+                # If status is "ready", set resume_workdir_id so we can retrieve the workdir path
+                elif api_status == "ready":
+                    resume_workdir_id = folder_id
+        
+        # If resumeWorkDir exists, use the folders API to get the shared working directory
         if resume_workdir_id:
             try:
                 # Use folders API to get the actual shared working directory
@@ -421,6 +469,53 @@ class Cloudos:
         job_workspace = req_obj["team"]
         if job_workspace != workspace_id:
             raise ValueError("Workspace provided or configured is different from workspace where the job was executed")
+        
+        # Check if analysis results have been deleted or scheduled for deletion
+        # Similar to workdir check - if analysisResults exists with folderId, check its status
+        if "analysisResults" in req_obj and req_obj.get("analysisResults"):
+            analysis_results = req_obj["analysisResults"]
+            results_folder_id = analysis_results.get("folderId")
+            
+            if results_folder_id:
+                # Get the actual deletion status from the folders API
+                api_status = None
+                try:
+                    folder_response = self.get_folder_deletion_status(results_folder_id, workspace_id, verify)
+                    folder_data = json.loads(folder_response.content)
+                    
+                    # If the API returns the folder, get its status
+                    if folder_data and len(folder_data) > 0:
+                        api_status = folder_data[0].get("status")
+                    else:
+                        # If the folder is not returned, check if deletedBy exists in analysisResults
+                        if "deletedBy" in analysis_results:
+                            api_status = "scheduledForDeletion"  # Assume scheduled for deletion
+                        
+                except Exception:
+                    # If we can't get the status, check if deletedBy exists
+                    if "deletedBy" in analysis_results:
+                        api_status = "scheduledForDeletion"  # Assume scheduled for deletion
+                
+                # Build contextually appropriate error message based on status
+                # Only raise error for non-ready statuses (ready means it's available, so no error)
+                if api_status == "deleting":
+                    error_msg = "Analysis results are currently being deleted. The results folder is not accessible."
+                    raise ValueError(error_msg)
+                elif api_status == "scheduledForDeletion":
+                    error_msg = "Analysis results have been scheduled for deletion. The results folder is no longer available."
+                    raise ValueError(error_msg)
+                elif api_status == "deleted":
+                    error_msg = "Analysis results have been deleted. The results folder is no longer available."
+                    raise ValueError(error_msg)
+                elif api_status == "failedToDelete":
+                    error_msg = "Analysis results were marked for deletion but failed to delete. The results folder may not be accessible."
+                    raise ValueError(error_msg)
+                elif api_status != "ready" and api_status is not None:
+                    # For any other unknown status (not ready), raise generic error
+                    error_msg = "Analysis results have been removed. The results folder is no longer available."
+                    raise ValueError(error_msg)
+                # If status is "ready" or None, don't raise error - let the code continue to retrieve the results path
+        
         cloud_name, meta, cloud_storage = find_cloud(self.cloudos_url, self.apikey, workspace_id, req_obj["logs"])
         # cont_name
         results_obj = req_obj["results"]
@@ -439,6 +534,343 @@ class Cloudos:
                 results[filename] = f"{scheme}://{storage_account_prefix}{results_container}/{item['path']}"
         return results
 
+    def get_folder_items_deletion_status(self, folder_id, workspace_id, verify=True):
+        """Get deletion status of items within a folder.
+
+        Simple API wrapper to query the datasets API for items in a folder
+        with their deletion status (ready/deleting).
+
+        Parameters
+        ----------
+        folder_id : str
+            The CloudOS folder ID.
+        workspace_id : str
+            The CloudOS workspace ID.
+        verify : [bool | str], optional
+            Whether to use SSL verification or not. Alternatively, if
+            a string is passed, it will be interpreted as the path to
+            the SSL certificate file. Default is True.
+
+        Returns
+        -------
+        Response
+            The API response containing folders and files with their status.
+
+        Raises
+        ------
+        BadRequestException
+            If the request fails with a status code indicating an error.
+        """
+        headers = {
+            "Content-type": "application/json",
+            "apikey": self.apikey
+        }
+        
+        # Query all possible deletion statuses
+        params = {
+            "status": ["ready", "deleted", "deleting", "scheduledForDeletion", "failedToDelete"],
+            "teamId": workspace_id
+        }
+        
+        url = f"{self.cloudos_url}/api/v1/datasets/{folder_id}/items"
+        response = retry_requests_get(url, params=params, headers=headers, verify=verify)
+        
+        if response.status_code >= 400:
+            raise BadRequestException(response)
+        
+        return response
+
+    def get_results_deletion_status(self, job_id, workspace_id, verify=True):
+        """Get the deletion status of a specific job's results folder.
+
+        This method orchestrates finding the job's results folder and retrieving
+        the deletion status of items within it.
+
+        Parameters
+        ----------
+        job_id : str
+            The CloudOS job ID.
+        workspace_id : str
+            The CloudOS workspace ID.
+        verify : [bool | str], optional
+            Whether to use SSL verification or not. Alternatively, if
+            a string is passed, it will be interpreted as the path to
+            the SSL certificate file. Default is True.
+
+        Returns
+        -------
+        dict
+            A dictionary containing the deletion status information with the following structure:
+            {
+                "job_id": str,  # The job ID
+                "job_name": str,  # The job name
+                "results_folder_id": str,  # The ID of the job's results folder
+                "results_folder_name": str,  # The name of the job's results folder
+                "items": dict  # Dictionary with 'folders' and 'files' arrays containing items and their status
+            }
+
+        Raises
+        ------
+        BadRequestException
+            If the request fails with a status code indicating an error.
+        ValueError
+            If the job's results folder is not found.
+        """
+        # First, get job details to find the project and job name
+        job_status = self.get_job_status(job_id, workspace_id, verify)
+        job_data = json.loads(job_status.content)
+        job_name = job_data.get("name", job_id)
+        project_info = job_data.get("project")
+        
+        # Extract deletedBy info from analysisResults if available
+        analysis_results_deleted_by = None
+        if "analysisResults" in job_data and job_data.get("analysisResults"):
+            analysis_results_deleted_by = job_data["analysisResults"].get("deletedBy")
+        
+        if not project_info:
+            raise ValueError(f"Could not find project for job '{job_id}'")
+        
+        # Extract project ID and name from the project info dict
+        project_id = project_info.get("_id")
+        project_name = project_info.get("name")
+        
+        if not project_name or not project_id:
+            raise ValueError(f"Could not extract project information from job '{job_id}'")
+        
+        from cloudos_cli.datasets.datasets import Datasets
+        
+        # Create Datasets object to navigate to the Analysis Results folder
+        ds = Datasets(
+            cloudos_url=self.cloudos_url,
+            apikey=self.apikey,
+            cromwell_token=self.cromwell_token,
+            workspace_id=workspace_id,
+            project_name=project_name,
+            verify=verify
+        )
+        
+        # Get project content to find Analysis Results folder
+        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)}")
+        
+        # Find the Analysis Results folder ID
+        analysis_results_id = None
+        for folder in project_content.get("folders", []):
+            if folder['name'] in ['Analyses Results', 'AnalysesResults']:
+                analysis_results_id = folder['_id']
+                break
+        
+        if not analysis_results_id:
+            raise ValueError(f"Analyses Results folder not found in project '{project_name}'.")
+        
+        # Get items in Analysis Results folder to find the job's specific results folder
+        # The Analysis Results folder contains folders for each job's results
+        try:
+            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)}")
+        
+        # The API response contains folders and files arrays
+        # Find the entry matching our job_id
+        job_status_info = None
+        
+        # Check if it's a dict with folders/files arrays
+        if isinstance(content, dict):
+            # Check for 'folders' or 'files' keys (common dataset API response format)
+            items_to_search = []
+            if 'folders' in content:
+                items_to_search.extend(content['folders'])
+            if 'files' in content:
+                items_to_search.extend(content['files'])
+            
+            # If no folders/files keys, treat dict values as items
+            if not items_to_search:
+                items_to_search = list(content.values())
+            
+            for item in items_to_search:
+                if not isinstance(item, dict):
+                    continue
+                
+                item_name = item.get("name", "")
+                
+                # Match by exact job ID in the item name (format: workflowname-jobid)
+                # The folder name should contain the exact job ID
+                if job_id in item_name:
+                    job_status_info = item
+                    break
+        elif isinstance(content, list):
+            for item in content:
+                if not isinstance(item, dict):
+                    continue
+                
+                item_name = item.get("name", "")
+                
+                # Match by exact job ID in the item name
+                if job_id in item_name:
+                    job_status_info = item
+                    break
+        
+        if not job_status_info:
+            raise ValueError(
+                f"Results folder for job '{job_name}' (ID: {job_id}) not found in Analyses Results.\n"
+                f"This may indicate that the results have been deleted or are scheduled for deletion."
+            )
+        
+        # Merge the deletedBy info from job data with the folder info
+        # The deletedBy from analysisResults is more reliable than folder's user field
+        if analysis_results_deleted_by:
+            job_status_info["deletedBy"] = analysis_results_deleted_by
+        
+        return {
+            "job_id": job_id,
+            "job_name": job_name,
+            "results_folder_id": job_status_info.get("_id"),
+            "results_folder_name": job_status_info.get("name"),
+            "status": job_status_info.get("status"),
+            "items": job_status_info
+        }
+
+    def get_folder_deletion_status(self, folder_id, workspace_id, verify=True):
+        """Get deletion status of a specific folder by ID.
+
+        Simple API wrapper to query the folders API for a specific folder
+        with its deletion status (ready/deleting/etc).
+
+        Parameters
+        ----------
+        folder_id : str
+            The CloudOS folder ID.
+        workspace_id : str
+            The CloudOS workspace ID.
+        verify : [bool | str], optional
+            Whether to use SSL verification or not. Alternatively, if
+            a string is passed, it will be interpreted as the path to
+            the SSL certificate file. Default is True.
+
+        Returns
+        -------
+        Response
+            The API response containing folder information with status.
+
+        Raises
+        ------
+        BadRequestException
+            If the request fails with a status code indicating an error.
+        """
+        headers = {
+            "Content-type": "application/json",
+            "apikey": self.apikey
+        }
+        
+        # Query with all possible deletion statuses
+        params = {
+            "id": folder_id,
+            "status": ["ready", "deleted", "deleting", "scheduledForDeletion", "failedToDelete"],
+            "teamId": workspace_id
+        }
+        
+        url = f"{self.cloudos_url}/api/v1/folders/"
+        response = retry_requests_get(url, params=params, headers=headers, verify=verify)
+        
+        if response.status_code >= 400:
+            raise BadRequestException(response)
+        
+        return response
+
+    def get_workdir_deletion_status(self, job_id, workspace_id, verify=True):
+        """Get the deletion status of a specific job's working directory.
+
+        This method retrieves the deletion status of the job's working directory
+        using the folders API endpoint.
+
+        Parameters
+        ----------
+        job_id : str
+            The CloudOS job ID.
+        workspace_id : str
+            The CloudOS workspace ID.
+        verify : [bool | str], optional
+            Whether to use SSL verification or not. Alternatively, if
+            a string is passed, it will be interpreted as the path to
+            the SSL certificate file. Default is True.
+
+        Returns
+        -------
+        dict
+            A dictionary containing the deletion status information with the following structure:
+            {
+                "job_id": str,  # The job ID
+                "job_name": str,  # The job name
+                "workdir_folder_id": str,  # The ID of the job's working directory folder
+                "workdir_folder_name": str,  # The name of the job's working directory folder
+                "status": str,  # The deletion status
+                "items": dict  # Full folder object with metadata
+            }
+
+        Raises
+        ------
+        BadRequestException
+            If the request fails with a status code indicating an error.
+        ValueError
+            If the job's working directory is not found or not accessible.
+        """
+        # First, get job details to find the working directory folder ID
+        job_status = self.get_job_status(job_id, workspace_id, verify)
+        job_data = json.loads(job_status.content)
+        job_name = job_data.get("name", job_id)
+        
+        # Try to get the workdir folder ID from workDirectory.folderId first (new format)
+        # If not available, fall back to resumeWorkDir (old format)
+        workdir_folder_id = None
+        workdir_deleted_by = None
+        
+        if "workDirectory" in job_data and job_data.get("workDirectory"):
+            workdir_folder_id = job_data["workDirectory"].get("folderId")
+            # Get deletedBy info if available (contains user who scheduled deletion)
+            workdir_deleted_by = job_data["workDirectory"].get("deletedBy")
+        
+        if not workdir_folder_id and "resumeWorkDir" in job_data:
+            workdir_folder_id = job_data.get("resumeWorkDir")
+        
+        if not workdir_folder_id:
+            raise ValueError(
+                "Working directory is not available for this job. "
+                "This may be because the analysis was run without resumable mode enabled, "
+                "or because intermediate results have been removed."
+            )
+        
+        # Use the folders API to get the working directory status
+        response = self.get_folder_deletion_status(workdir_folder_id, workspace_id, verify)
+        
+        # Parse the response
+        content = json.loads(response.content)
+        
+        # The API returns an array with the folder info
+        if not content or len(content) == 0:
+            raise ValueError(
+                f"Working directory for job '{job_name}' (ID: {job_id}) not found.\n"
+                f"This may indicate that the working directory has been deleted or is scheduled for deletion."
+            )
+        
+        workdir_info = content[0]  # Get the first (and should be only) result
+        
+        # Merge the deletedBy info from job data with the folder info
+        # The deletedBy from workDirectory is more reliable than folder's user field
+        if workdir_deleted_by:
+            workdir_info["deletedBy"] = workdir_deleted_by
+        
+        return {
+            "job_id": job_id,
+            "job_name": job_name,
+            "workdir_folder_id": workdir_info.get("_id"),
+            "workdir_folder_name": workdir_info.get("name"),
+            "status": workdir_info.get("status"),
+            "items": workdir_info
+        }
+
     def _create_cromwell_header(self):
         """Generates cromwell header.
 

{cloudos_cli-2.68.0 → cloudos_cli-2.69.1}/cloudos_cli/import_wf/import_wf.py

@@ -4,14 +4,13 @@ from cloudos_cli.utils.errors import BadRequestException, AccountNotLinkedExcept
 from cloudos_cli.utils.requests import retry_requests_post, retry_requests_get
 import json
 from requests.exceptions import RetryError
-import sys
 
 
 class WFImport(ABC):
     def __init__(self, cloudos_url, cloudos_apikey, workspace_id, platform,
                  workflow_name, workflow_url, workflow_docs_link="", workflow_description="", cost_limit=30, main_file=None, verify=True):
         self.cloudos_url = cloudos_url
-        self.workflow_url = workflow_url.rstrip('.git')
+        self.workflow_url = workflow_url.removesuffix('.git')
         self.workspace_id = workspace_id
         self.platform = platform
         self.parsed_url = urlsplit(self.workflow_url)

{cloudos_cli-2.68.0 → cloudos_cli-2.69.1}/cloudos_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudos_cli
-Version: 2.68.0
+Version: 2.69.1
 Summary: Python package for interacting with CloudOS
 Home-page: https://github.com/lifebit-ai/cloudos-cli
 Author: David Piñeyro
@@ -669,6 +669,41 @@ You can also link all result directories to an interactive session using the `--
 cloudos job results --profile my_profile --job-id "12345678910" --link --session-id your_session_id
 ```
 
+**Check Results Deletion Status**
+
+You can check the deletion status of a job's results folder using the `--status` flag. This is useful for monitoring the deletion lifecycle of analysis results.
+
+```bash
+cloudos job results --status --profile my_profile --job-id "12345678910"
+```
+
+The command will display the current status of the results folder. Possible statuses include:
+- **available**: Results are available and accessible
+- **scheduled for deletion**: Results are scheduled to be deleted
+- **deleting**: Results are currently being deleted
+- **deleted**: Results have been deleted
+- **failed to delete**: Deletion process failed
+
+Example output for available results:
+```console
+The results of job 1234567890 are in status: available
+```
+
+For results in any state other than available, the output includes additional information about when the status changed and who initiated the change:
+```console
+The results of job 6912036aa6ed001148c96018 are in status: scheduled for deletion
+Status changed at: 2025-11-11T14:43:44.416Z
+User: Leila Mansouri (leila.mansouri@lifebit.ai)
+```
+
+Use the `--verbose` flag to see detailed information including the results folder name, folder ID, creation and update timestamps:
+```bash
+cloudos job results --status --profile my_profile --job-id "12345678910" --verbose
+```
+
+> [!NOTE]
+> If results have been completely deleted, the command will report that the results folder was not found, which may indicate that results have been deleted or scheduled for deletion.
+
 
 #### Clone or Resume job
 
@@ -930,6 +965,42 @@ cloudos job workdir \
     --link --session-id your_session_id
 ```
 
+**Check Working Directory Deletion Status**
+
+You can check the deletion status of a job's working directory using the `--status` flag. This is useful for monitoring the deletion lifecycle of intermediate job files.
+
+```bash
+cloudos job workdir --status --profile my_profile --job-id "12345678910"
+```
+
+The command will display the current status of the working directory folder. Possible statuses include:
+- **available**: Working directory is available and accessible
+- **scheduled for deletion**: Working directory is scheduled to be deleted
+- **deleting**: Working directory is currently being deleted
+- **deleted**: Working directory has been deleted
+- **failed to delete**: Deletion process failed
+
+Example output for available working directory:
+```console
+The working directory of job 6912036aa6ed001148c96018 is in status: available
+```
+
+For working directories in any state other than available, the output includes additional information about when the status changed and who initiated the change:
+```console
+The working directory of job 6912036aa6ed001148c96018 is in status: scheduled for deletion
+Status changed at: 2025-11-11T14:43:44.416Z
+User: Leila Mansouri (leila.mansouri@lifebit.ai)
+```
+
+Use the `--verbose` flag to see detailed information including the working directory folder name, folder ID, creation and update timestamps:
+```bash
+cloudos job workdir --status --profile my_profile --job-id "12345678910" --verbose
+```
+
+> [!NOTE]
+> This command only works for jobs that were run with resumable mode enabled (using the `--resumable` flag). Jobs without resumable mode will not have a working directory to check.
+> If the working directory has been completely deleted, the command will report that the working directory was not found.
+
 #### List Jobs
 
 You can get a summary of workspace jobs in two different formats:

cloudos_cli-2.68.0/cloudos_cli/_version.py

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