ras-commander 0.35.0__py3-none-any.whl → 0.36.0__py3-none-any.whl

ras_commander/RasCmdr.py

@@ -1,8 +1,27 @@
 """
-Execution operations for running HEC-RAS simulations using subprocess.
-Based on the HEC-Commander project's "Command Line is All You Need" approach, leveraging the -c compute flag to run HEC-RAS and orchestrating changes directly in the RAS input files to achieve automation outcomes. 
-"""
+RasCmdr - Execution operations for running HEC-RAS simulations
+
+This module is part of the ras-commander library and uses a centralized logging configuration.
+
+Logging Configuration:
+- The logging is set up in the logging_config.py file.
+- A @log_call decorator is available to automatically log function calls.
+- Log levels: DEBUG, INFO, WARNING, ERROR, CRITICAL
+- Logs are written to both console and a rotating file handler.
+- The default log file is 'ras_commander.log' in the 'logs' directory.
+- The default log level is INFO.
 
+To use logging in this module:
+1. Use the @log_call decorator for automatic function call logging.
+2. For additional logging, use logger.[level]() calls (e.g., logger.info(), logger.debug()).
+
+Example:
+    @log_call
+    def my_function():
+        
+        logger.debug("Additional debug information")
+        # Function logic here
+"""
 import os
 import subprocess
 import shutil
@@ -28,25 +47,35 @@ from threading import Lock, Thread, current_thread
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from itertools import cycle
 from typing import Union, List, Optional, Dict
-
-
-# Configure logging
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-# TO DO: 
-# 1. Alternate Run Mode for compute_plan and compute_parallel:  Using Powershell to execute the HEC-RAS command and hide the RAS window and all child windows.
-#    If this is implemented, and the plan has a popup, then the plan will not execute.  This is a deal breaker for many scenarios, and should only be used
-#    as a special option for those who don't want to deal with the popups, or want to run in the background.  This option should be limited to non-commercial use.
-# 2. Implment compute_plan_remote to go along with compute_plan.  This will be a compute_plan that is run on a remote machine via a psexec command.
-#    First, we will use the keyring package to securely store the remote machine username and password.
-#    Second, we will implement the psexec command to execute the HEC-RAS command on the remote machine.
-#    Each machine will need to be initialized as a remote_worker object, which will store the machine name, username, password, ras_exe_path, local folder path and other relevant info.
-#    A separate RasRemote class will be created to handle the creation of the remote_worker objects and the necessary abstractions. 
-#    The compute_plan_remote function will live in RasCmdr, and will be a thin abstraction above the RasRemote class, since the functions will be simliar to the existing compute_plan functions, but specific to remote execution.  
+from ras_commander.logging_config import get_logger, log_call
+
+logger = get_logger(__name__)
+
+# Module code starts here
+
+# TODO: Future Enhancements
+# 1. Alternate Run Mode for compute_plan and compute_parallel:
+#    - Use Powershell to execute HEC-RAS command
+#    - Hide RAS window and all child windows
+#    - Note: This mode may prevent execution if the plan has a popup
+#    - Intended for background runs or popup-free scenarios
+#    - Limit to non-commercial use
+#
+# 2. Implement compute_plan_remote:
+#    - Execute compute_plan on a remote machine via psexec
+#    - Use keyring package for secure credential storage
+#    - Implement psexec command for remote HEC-RAS execution
+#    - Create remote_worker objects to store machine details:
+#      (machine name, username, password, ras_exe_path, local folder path, etc.)
+#    - Develop RasRemote class for remote_worker management and abstractions
+#    - Implement compute_plan_remote in RasCmdr as a thin wrapper around RasRemote
+#      (similar to existing compute_plan functions but for remote execution)
 
 
 class RasCmdr:
+    
     @staticmethod
+    @log_call
     def compute_plan(
         plan_number,
         dest_folder=None, 
@@ -74,252 +103,252 @@ class RasCmdr:
         Raises:
             ValueError: If the specified dest_folder already exists and is not empty, and overwrite_dest is False.
         """
-        ras_obj = ras_object if ras_object is not None else ras
-        logging.info(f"Using ras_object with project folder: {ras_obj.project_folder}")
-        ras_obj.check_initialized()
-        
-        if dest_folder is not None:
-            dest_folder = Path(ras_obj.project_folder).parent / dest_folder if isinstance(dest_folder, str) else Path(dest_folder)
-            
-            if dest_folder.exists():
-                if overwrite_dest:
-                    shutil.rmtree(dest_folder)
-                    logging.info(f"Destination folder '{dest_folder}' exists. Overwriting as per overwrite_dest=True.")
-                elif any(dest_folder.iterdir()):
-                    error_msg = f"Destination folder '{dest_folder}' exists and is not empty. Use overwrite_dest=True to overwrite."
-                    logging.error(error_msg)
-                    raise ValueError(error_msg)
-            
-            dest_folder.mkdir(parents=True, exist_ok=True)
-            shutil.copytree(ras_obj.project_folder, dest_folder, dirs_exist_ok=True)
-            logging.info(f"Copied project folder to destination: {dest_folder}")
+        try:
+            ras_obj = ras_object if ras_object is not None else ras
+            logger.info(f"Using ras_object with project folder: {ras_obj.project_folder}")
+            ras_obj.check_initialized()
             
-            compute_ras = RasPrj()
-            compute_ras.initialize(dest_folder, ras_obj.ras_exe_path)
-            compute_prj_path = compute_ras.prj_file
-        else:
-            compute_ras = ras_obj
-            compute_prj_path = ras_obj.prj_file
-
-        # Determine the plan path
-        compute_plan_path = Path(plan_number) if isinstance(plan_number, (str, Path)) and Path(plan_number).is_file() else RasPlan.get_plan_path(plan_number, compute_ras)
-
-        if not compute_prj_path or not compute_plan_path:
-            logging.error(f"Could not find project file or plan file for plan {plan_number}")
-            return False
+            if dest_folder is not None:
+                dest_folder = Path(ras_obj.project_folder).parent / dest_folder if isinstance(dest_folder, str) else Path(dest_folder)
+                
+                if dest_folder.exists():
+                    if overwrite_dest:
+                        shutil.rmtree(dest_folder)
+                        logger.info(f"Destination folder '{dest_folder}' exists. Overwriting as per overwrite_dest=True.")
+                    elif any(dest_folder.iterdir()):
+                        error_msg = f"Destination folder '{dest_folder}' exists and is not empty. Use overwrite_dest=True to overwrite."
+                        logger.error(error_msg)
+                        raise ValueError(error_msg)
+                
+                dest_folder.mkdir(parents=True, exist_ok=True)
+                shutil.copytree(ras_obj.project_folder, dest_folder, dirs_exist_ok=True)
+                logger.info(f"Copied project folder to destination: {dest_folder}")
+                
+                compute_ras = RasPrj()
+                compute_ras.initialize(dest_folder, ras_obj.ras_exe_path)
+                compute_prj_path = compute_ras.prj_file
+            else:
+                compute_ras = ras_obj
+                compute_prj_path = ras_obj.prj_file
 
-        # Clear geometry preprocessor files if requested
-        if clear_geompre:
-            try:
-                RasGeo.clear_geompre_files(compute_plan_path, ras_object=compute_ras)
-                logging.info(f"Cleared geometry preprocessor files for plan: {plan_number}")
-            except Exception as e:
-                logging.error(f"Error clearing geometry preprocessor files for plan {plan_number}: {str(e)}")
+            # Determine the plan path
+            compute_plan_path = Path(plan_number) if isinstance(plan_number, (str, Path)) and Path(plan_number).is_file() else RasPlan.get_plan_path(plan_number, compute_ras)
 
-        # Set the number of cores if specified
-        if num_cores is not None:
-            try:
-                RasPlan.set_num_cores(compute_plan_path, num_cores=num_cores, ras_object=compute_ras)
-                logging.info(f"Set number of cores to {num_cores} for plan: {plan_number}")
-            except Exception as e:
-                logging.error(f"Error setting number of cores for plan {plan_number}: {str(e)}")
+            if not compute_prj_path or not compute_plan_path:
+                logger.error(f"Could not find project file or plan file for plan {plan_number}")
+                return False
+
+            # Clear geometry preprocessor files if requested
+            if clear_geompre:
+                try:
+                    RasGeo.clear_geompre_files(compute_plan_path, ras_object=compute_ras)
+                    logger.info(f"Cleared geometry preprocessor files for plan: {plan_number}")
+                except Exception as e:
+                    logger.error(f"Error clearing geometry preprocessor files for plan {plan_number}: {str(e)}")
+
+            # Set the number of cores if specified
+            if num_cores is not None:
+                try:
+                    RasPlan.set_num_cores(compute_plan_path, num_cores=num_cores, ras_object=compute_ras)
+                    logger.info(f"Set number of cores to {num_cores} for plan: {plan_number}")
+                except Exception as e:
+                    logger.error(f"Error setting number of cores for plan {plan_number}: {str(e)}")
 
-        # Prepare the command for HEC-RAS execution
-        cmd = f'"{compute_ras.ras_exe_path}" -c "{compute_prj_path}" "{compute_plan_path}"'
-        logging.info("Running HEC-RAS from the Command Line:")
-        logging.info(f"Running command: {cmd}")
+            # Prepare the command for HEC-RAS execution
+            cmd = f'"{compute_ras.ras_exe_path}" -c "{compute_prj_path}" "{compute_plan_path}"'
+            logger.info("Running HEC-RAS from the Command Line:")
+            logger.info(f"Running command: {cmd}")
 
-        # Execute the HEC-RAS command
-        start_time = time.time()
-        try:
-            subprocess.run(cmd, check=True, shell=True, capture_output=True, text=True)
-            end_time = time.time()
-            run_time = end_time - start_time
-            logging.info(f"HEC-RAS execution completed for plan: {plan_number}")
-            logging.info(f"Total run time for plan {plan_number}: {run_time:.2f} seconds")
-            return True
-        except subprocess.CalledProcessError as e:
-            end_time = time.time()
-            run_time = end_time - start_time
-            logging.error(f"Error running plan: {plan_number}")
-            logging.error(f"Error message: {e.output}")
-            logging.info(f"Total run time for plan {plan_number}: {run_time:.2f} seconds")
+            # Execute the HEC-RAS command
+            start_time = time.time()
+            try:
+                subprocess.run(cmd, check=True, shell=True, capture_output=True, text=True)
+                end_time = time.time()
+                run_time = end_time - start_time
+                logger.info(f"HEC-RAS execution completed for plan: {plan_number}")
+                logger.info(f"Total run time for plan {plan_number}: {run_time:.2f} seconds")
+                return True
+            except subprocess.CalledProcessError as e:
+                end_time = time.time()
+                run_time = end_time - start_time
+                logger.error(f"Error running plan: {plan_number}")
+                logger.error(f"Error message: {e.output}")
+                logger.info(f"Total run time for plan {plan_number}: {run_time:.2f} seconds")
+                return False
+        except Exception as e:
+            logger.critical(f"Error in compute_plan: {str(e)}")
             return False
         finally:
             # Update the RAS object's dataframes
-            ras_obj.plan_df = ras_obj.get_plan_entries()
-            ras_obj.geom_df = ras_obj.get_geom_entries()
-            ras_obj.flow_df = ras_obj.get_flow_entries()
-            ras_obj.unsteady_df = ras_obj.get_unsteady_entries()
+            if ras_obj:
+                ras_obj.plan_df = ras_obj.get_plan_entries()
+                ras_obj.geom_df = ras_obj.get_geom_entries()
+                ras_obj.flow_df = ras_obj.get_flow_entries()
+                ras_obj.unsteady_df = ras_obj.get_unsteady_entries()
     
 
 
     @staticmethod
+    @log_call
+    @staticmethod
+    @log_call
     def compute_parallel(
         plan_number: Union[str, List[str], None] = None,
         max_workers: int = 2,
         num_cores: int = 2,
         clear_geompre: bool = False,
-        ras_object: Optional['RasPrj'] = None,  # Type hinting as string to avoid NameError
+        ras_object: Optional['RasPrj'] = None,
         dest_folder: Union[str, Path, None] = None,
         overwrite_dest: bool = False
     ) -> Dict[str, bool]:
         """
-        [Docstring remains unchanged]
-        """
-        ras_obj = ras_object or ras  # Assuming 'ras' is a global RasPrj instance
-        ras_obj.check_initialized()
+        Compute multiple HEC-RAS plans in parallel.
 
-        project_folder = Path(ras_obj.project_folder)
+        Args:
+            plan_number (Union[str, List[str], None]): Plan number(s) to compute. If None, all plans are computed.
+            max_workers (int): Maximum number of parallel workers.
+            num_cores (int): Number of cores to use per plan computation.
+            clear_geompre (bool): Whether to clear geometry preprocessor files.
+            ras_object (Optional[RasPrj]): RAS project object. If None, uses global instance.
+            dest_folder (Union[str, Path, None]): Destination folder for computed results.
+            overwrite_dest (bool): Whether to overwrite existing destination folder.
 
-        if dest_folder is not None:
-            dest_folder_path = Path(dest_folder)
-            if dest_folder_path.exists():
-                if overwrite_dest:
-                    shutil.rmtree(dest_folder_path)
-                    logging.info(f"Destination folder '{dest_folder_path}' exists. Overwriting as per overwrite_dest=True.")
-                elif any(dest_folder_path.iterdir()):
-                    error_msg = f"Destination folder '{dest_folder_path}' exists and is not empty. Use overwrite_dest=True to overwrite."
-                    logging.error(error_msg)
-                    raise ValueError(error_msg)
-            dest_folder_path.mkdir(parents=True, exist_ok=True)
-            shutil.copytree(project_folder, dest_folder_path, dirs_exist_ok=True)
-            logging.info(f"Copied project folder to destination: {dest_folder_path}")
-            project_folder = dest_folder_path
-
-        if plan_number:
-            if isinstance(plan_number, str):
-                plan_number = [plan_number]
-            ras_obj.plan_df = ras_obj.plan_df[ras_obj.plan_df['plan_number'].isin(plan_number)]
-            logging.info(f"Filtered plans to execute: {plan_number}")
-
-        num_plans = len(ras_obj.plan_df)
-        max_workers = min(max_workers, num_plans) if num_plans > 0 else 1
-        logging.info(f"Adjusted max_workers to {max_workers} based on the number of plans: {num_plans}")
-
-        # Clean up existing worker folders and create new ones
-        worker_ras_objects = {}
-        for worker_id in range(1, max_workers + 1):
-            worker_folder = project_folder.parent / f"{project_folder.name} [Worker {worker_id}]"
-            if worker_folder.exists():
-                shutil.rmtree(worker_folder)
-                logging.info(f"Removed existing worker folder: {worker_folder}")
-            shutil.copytree(project_folder, worker_folder)
-            logging.info(f"Created worker folder: {worker_folder}")
-
-            # Instantiate RasPrj properly
-            ras_instance = RasPrj()  # Add necessary parameters if required
-            worker_ras_instance = init_ras_project(
-                ras_project_folder=worker_folder,
-                ras_version=ras_obj.ras_exe_path,
-                ras_instance=ras_instance  # Pass the instance instead of a string
-            )
-            worker_ras_objects[worker_id] = worker_ras_instance
-
-        # Distribute plans among workers in a round-robin fashion
-        worker_cycle = cycle(range(1, max_workers + 1))
-        plan_assignments = [(next(worker_cycle), plan_num) for plan_num in ras_obj.plan_df['plan_number']]
-
-        # Initialize ThreadPoolExecutor without tracking individual plan success
-        with ThreadPoolExecutor(max_workers=max_workers) as executor:
-            # Submit all plan executions to the executor
-            futures = [
-                executor.submit(
-                    RasCmdr.compute_plan,
-                    plan_num, 
-                    ras_object=worker_ras_objects[worker_id], 
-                    clear_geompre=clear_geompre,
-                    num_cores=num_cores
-                )
-                for worker_id, plan_num in plan_assignments
-            ]
+        Returns:
+            Dict[str, bool]: Dictionary of plan numbers and their execution success status.
+        """
+        try:
+            ras_obj = ras_object or ras
+            ras_obj.check_initialized()
+
+            project_folder = Path(ras_obj.project_folder)
+
+            if dest_folder is not None:
+                dest_folder_path = Path(dest_folder)
+                if dest_folder_path.exists():
+                    if overwrite_dest:
+                        shutil.rmtree(dest_folder_path)
+                        logger.info(f"Destination folder '{dest_folder_path}' exists. Overwriting as per overwrite_dest=True.")
+                    elif any(dest_folder_path.iterdir()):
+                        error_msg = f"Destination folder '{dest_folder_path}' exists and is not empty. Use overwrite_dest=True to overwrite."
+                        logger.error(error_msg)
+                        raise ValueError(error_msg)
+                dest_folder_path.mkdir(parents=True, exist_ok=True)
+                shutil.copytree(project_folder, dest_folder_path, dirs_exist_ok=True)
+                logger.info(f"Copied project folder to destination: {dest_folder_path}")
+                project_folder = dest_folder_path
+
+            if plan_number:
+                if isinstance(plan_number, str):
+                    plan_number = [plan_number]
+                ras_obj.plan_df = ras_obj.plan_df[ras_obj.plan_df['plan_number'].isin(plan_number)]
+                logger.info(f"Filtered plans to execute: {plan_number}")
+
+            num_plans = len(ras_obj.plan_df)
+            max_workers = min(max_workers, num_plans) if num_plans > 0 else 1
+            logger.info(f"Adjusted max_workers to {max_workers} based on the number of plans: {num_plans}")
+
+            worker_ras_objects = {}
+            for worker_id in range(1, max_workers + 1):
+                worker_folder = project_folder.parent / f"{project_folder.name} [Worker {worker_id}]"
+                if worker_folder.exists():
+                    shutil.rmtree(worker_folder)
+                    logger.info(f"Removed existing worker folder: {worker_folder}")
+                shutil.copytree(project_folder, worker_folder)
+                logger.info(f"Created worker folder: {worker_folder}")
 
-            # Optionally, you can log when each plan starts and completes
-            for future, (worker_id, plan_num) in zip(as_completed(futures), plan_assignments):
                 try:
-                    future.result()  # We don't need the success flag here
-                    logging.info(f"Plan {plan_num} executed in worker {worker_id}")
+                    ras_instance = RasPrj()
+                    worker_ras_instance = init_ras_project(
+                        ras_project_folder=worker_folder,
+                        ras_version=ras_obj.ras_exe_path,
+                        ras_instance=ras_instance
+                    )
+                    worker_ras_objects[worker_id] = worker_ras_instance
                 except Exception as e:
-                    logging.error(f"Plan {plan_num} failed in worker {worker_id}: {str(e)}")
-                    # Depending on requirements, you might want to handle retries or mark these plans differently
-
-        # Consolidate results
-        final_dest_folder = dest_folder_path if dest_folder is not None else project_folder.parent / f"{project_folder.name} [Computed]"
-        final_dest_folder.mkdir(parents=True, exist_ok=True)
-        logging.info(f"Final destination for computed results: {final_dest_folder}")
+                    logger.critical(f"Failed to initialize RAS project for worker {worker_id}: {str(e)}")
+                    worker_ras_objects[worker_id] = None
+
+            worker_cycle = cycle(range(1, max_workers + 1))
+            plan_assignments = [(next(worker_cycle), plan_num) for plan_num in ras_obj.plan_df['plan_number']]
+
+            execution_results: Dict[str, bool] = {}
+
+            with ThreadPoolExecutor(max_workers=max_workers) as executor:
+                futures = [
+                    executor.submit(
+                        RasCmdr.compute_plan,
+                        plan_num, 
+                        ras_object=worker_ras_objects[worker_id], 
+                        clear_geompre=clear_geompre,
+                        num_cores=num_cores
+                    )
+                    for worker_id, plan_num in plan_assignments
+                ]
+
+                for future, (worker_id, plan_num) in zip(as_completed(futures), plan_assignments):
+                    try:
+                        success = future.result()
+                        execution_results[plan_num] = success
+                        logger.info(f"Plan {plan_num} executed in worker {worker_id}: {'Successful' if success else 'Failed'}")
+                    except Exception as e:
+                        execution_results[plan_num] = False
+                        logger.error(f"Plan {plan_num} failed in worker {worker_id}: {str(e)}")
+
+            final_dest_folder = dest_folder_path if dest_folder is not None else project_folder.parent / f"{project_folder.name} [Computed]"
+            final_dest_folder.mkdir(parents=True, exist_ok=True)
+            logger.info(f"Final destination for computed results: {final_dest_folder}")
+
+            for worker_ras in worker_ras_objects.values():
+                if worker_ras is None:
+                    continue
+                worker_folder = Path(worker_ras.project_folder)
+                try:
+                    for item in worker_folder.iterdir():
+                        dest_path = final_dest_folder / item.name
+                        if dest_path.exists():
+                            if dest_path.is_dir():
+                                shutil.rmtree(dest_path)
+                                logger.debug(f"Removed existing directory at {dest_path}")
+                            else:
+                                dest_path.unlink()
+                                logger.debug(f"Removed existing file at {dest_path}")
+                        shutil.move(str(item), final_dest_folder)
+                        logger.debug(f"Moved {item} to {final_dest_folder}")
+                    shutil.rmtree(worker_folder)
+                    logger.info(f"Removed worker folder: {worker_folder}")
+                except Exception as e:
+                    logger.error(f"Error moving results from {worker_folder} to {final_dest_folder}: {str(e)}")
 
-        for worker_ras in worker_ras_objects.values():
-            worker_folder = Path(worker_ras.project_folder)
             try:
-                for item in worker_folder.iterdir():
-                    dest_path = final_dest_folder / item.name
-                    if dest_path.exists():
-                        if dest_path.is_dir():
-                            shutil.rmtree(dest_path)
-                            logging.debug(f"Removed existing directory at {dest_path}")
-                        else:
-                            dest_path.unlink()
-                            logging.debug(f"Removed existing file at {dest_path}")
-                    shutil.move(str(item), final_dest_folder)
-                    logging.debug(f"Moved {item} to {final_dest_folder}")
-                shutil.rmtree(worker_folder)
-                logging.info(f"Removed worker folder: {worker_folder}")
+                final_dest_folder_ras_obj = RasPrj()
+                final_dest_folder_ras_obj = init_ras_project(
+                    ras_project_folder=final_dest_folder, 
+                    ras_version=ras_obj.ras_exe_path,
+                    ras_instance=final_dest_folder_ras_obj
+                )
+                final_dest_folder_ras_obj.check_initialized()
             except Exception as e:
-                logging.error(f"Error moving results from {worker_folder} to {final_dest_folder}: {str(e)}")
+                logger.critical(f"Failed to initialize RasPrj for final destination: {str(e)}")
 
-        # Initialize a new RasPrj object for the final destination
-        try:
-            # Create a new RasPrj instance
-            final_dest_folder_ras_obj = RasPrj()
-            
-            # Initialize it using init_ras_project
-            final_dest_folder_ras_obj = init_ras_project(
-                ras_project_folder=final_dest_folder, 
-                ras_version=ras_obj.ras_exe_path,
-                ras_instance=final_dest_folder_ras_obj
-            )
-            
-            # Now we can check if it's initialized
-            final_dest_folder_ras_obj.check_initialized()
-        except Exception as e:
-            logging.error(f"Failed to initialize RasPrj for final destination: {str(e)}")
-            raise
+            logger.info("\nExecution Results:")
+            for plan_num, success in execution_results.items():
+                status = 'Successful' if success else 'Failed'
+                logger.info(f"Plan {plan_num}: {status}")
 
-        # Retrieve plan entries and check for HDF results
-        try:
-            plan_entries = final_dest_folder_ras_obj.get_prj_entries('Plan')
-        except Exception as e:
-            logging.error(f"Failed to retrieve plan entries from final RasPrj: {str(e)}")
-            raise
-
-        execution_results: Dict[str, bool] = {}
-        for _, row in ras_obj.plan_df.iterrows():
-            plan_num = row['plan_number']
-            # Find the corresponding entry in plan_entries
-            entry = plan_entries[plan_entries['plan_number'] == plan_num]
-            if not entry.empty:
-                hdf_path = entry.iloc[0].get('HDF_Results_Path')
-                success = hdf_path is not None and Path(hdf_path).exists()
-            else:
-                success = False
-            execution_results[plan_num] = success
-
-        # Print execution results for each plan
-        logging.info("\nExecution Results:")
-        for plan_num, success in execution_results.items():
-            status = 'Successful' if success else 'Failed'
-            logging.info(f"Plan {plan_num}: {status} \n(HDF_Results_Path: {hdf_path})")
-            
-        ras_obj = ras_object or ras
-        ras_obj.plan_df = ras_obj.get_plan_entries()
-        ras_obj.geom_df = ras_obj.get_geom_entries()
-        ras_obj.flow_df = ras_obj.get_flow_entries()
-        ras_obj.unsteady_df = ras_obj.get_unsteady_entries()
+            ras_obj = ras_object or ras
+            ras_obj.plan_df = ras_obj.get_plan_entries()
+            ras_obj.geom_df = ras_obj.get_geom_entries()
+            ras_obj.flow_df = ras_obj.get_flow_entries()
+            ras_obj.unsteady_df = ras_obj.get_unsteady_entries()
 
-        return execution_results
-    
+            return execution_results
+
+        except Exception as e:
+            logger.critical(f"Error in compute_parallel: {str(e)}")
+            return {}
 
     @staticmethod
+    @log_call
     def compute_test_mode(
         plan_number=None, 
         dest_folder_suffix="[Test]", 
@@ -329,11 +358,11 @@ class RasCmdr:
         overwrite_dest=False
     ):
         """
-        Execute HEC-RAS plans in test mode.  This is a re-creation of the HEC-RAS command line -test flag, 
+        Execute HEC-RAS plans in test mode. This is a re-creation of the HEC-RAS command line -test flag, 
         which does not work in recent versions of HEC-RAS.
         
         As a special-purpose function that emulates the original -test flag, it operates differently than the 
-        other two compute_ functions.  Per the original HEC-RAS test flag, it creates a separate test folder,
+        other two compute_ functions. Per the original HEC-RAS test flag, it creates a separate test folder,
         copies the project there, and executes the specified plans in sequential order.
         
         For most purposes, just copying a the project folder, initing that new folder, then running each plan 
@@ -354,7 +383,7 @@ class RasCmdr:
             overwrite_dest (bool, optional): If True, overwrite the destination folder if it exists. Defaults to False.
 
         Returns:
-            None
+            Dict[str, bool]: Dictionary of plan numbers and their execution success status.
 
         Example:
             Run all plans: RasCommander.compute_test_mode()
@@ -373,110 +402,109 @@ class RasCmdr:
             - Because copying the project is implicit, only a dest_folder_suffix option is provided.
             - For more flexible run management, use the compute_parallel or compute_sequential functions.
         """
-        
-        # This line of code is used to initialize the RasPrj object with the default "ras" object if no specific object is provided.
-        ras_obj = ras_object or ras
-        # This line of code is used to check if the RasPrj object is initialized.
-        ras_obj.check_initialized()
-        
-        logging.info("Starting the compute_test_mode...")
-           
-        # Use the project folder from the ras object
-        project_folder = ras_obj.project_folder
-
-        # Check if the project folder exists
-        if not project_folder.exists():
-            logging.error(f"Project folder '{project_folder}' does not exist.")
-            return
-
-        # Create test folder with the specified suffix in the same directory as the project folder
-        compute_folder = project_folder.parent / f"{project_folder.name} {dest_folder_suffix}"
-        logging.info(f"Creating the test folder: {compute_folder}...")
-
-        # Check if the compute folder exists and is empty
-        if compute_folder.exists():
-            if overwrite_dest:
-                shutil.rmtree(compute_folder)
-                logging.info(f"Compute folder '{compute_folder}' exists. Overwriting as per overwrite_dest=True.")
-            elif any(compute_folder.iterdir()):
-                error_msg = (
-                    f"Compute folder '{compute_folder}' exists and is not empty. "
-                    "Use overwrite_dest=True to overwrite."
-                )
-                logging.error(error_msg)
-                raise ValueError(error_msg)
-        else:
+        try:
+            ras_obj = ras_object or ras
+            ras_obj.check_initialized()
+            
+            logger.info("Starting the compute_test_mode...")
+               
+            project_folder = Path(ras_obj.project_folder)
+
+            if not project_folder.exists():
+                logger.error(f"Project folder '{project_folder}' does not exist.")
+                return {}
+
+            compute_folder = project_folder.parent / f"{project_folder.name} {dest_folder_suffix}"
+            logger.info(f"Creating the test folder: {compute_folder}...")
+
+            if compute_folder.exists():
+                if overwrite_dest:
+                    shutil.rmtree(compute_folder)
+                    logger.info(f"Compute folder '{compute_folder}' exists. Overwriting as per overwrite_dest=True.")
+                elif any(compute_folder.iterdir()):
+                    error_msg = (
+                        f"Compute folder '{compute_folder}' exists and is not empty. "
+                        "Use overwrite_dest=True to overwrite."
+                    )
+                    logger.error(error_msg)
+                    raise ValueError(error_msg)
+
             try:
                 shutil.copytree(project_folder, compute_folder)
-                logging.info(f"Copied project folder to compute folder: {compute_folder}")
-            except FileNotFoundError:
-                logging.error(f"Unable to copy project folder. Source folder '{project_folder}' not found.")
-                return
-            except PermissionError:
-                logging.error(f"Permission denied when trying to create or copy to '{compute_folder}'.")
-                return
+                logger.info(f"Copied project folder to compute folder: {compute_folder}")
             except Exception as e:
-                logging.error(f"Error occurred while copying project folder: {str(e)}")
-                return
+                logger.critical(f"Error occurred while copying project folder: {str(e)}")
+                return {}
 
-        # Initialize a new RAS project in the compute folder
-        try:
-            compute_ras = RasPrj()
-            compute_ras.initialize(compute_folder, ras_obj.ras_exe_path)
-            compute_prj_path = compute_ras.prj_file
-            logging.info(f"Initialized RAS project in compute folder: {compute_prj_path}")
-        except Exception as e:
-            logging.error(f"Error initializing RAS project in compute folder: {str(e)}")
-            return
+            try:
+                compute_ras = RasPrj()
+                compute_ras.initialize(compute_folder, ras_obj.ras_exe_path)
+                compute_prj_path = compute_ras.prj_file
+                logger.info(f"Initialized RAS project in compute folder: {compute_prj_path}")
+            except Exception as e:
+                logger.critical(f"Error initializing RAS project in compute folder: {str(e)}")
+                return {}
 
-        if not compute_prj_path:
-            logging.error("Project file not found.")
-            return
+            if not compute_prj_path:
+                logger.error("Project file not found.")
+                return {}
 
-        # Get plan entries
-        logging.info("Getting plan entries...")
-        try:
-            ras_compute_plan_entries = compute_ras.plan_df
-            logging.info("Retrieved plan entries successfully.")
-        except Exception as e:
-            logging.error(f"Error retrieving plan entries: {str(e)}")
-            return
-
-        if plan_number:
-            if isinstance(plan_number, str):
-                plan_number = [plan_number]
-            ras_compute_plan_entries = ras_compute_plan_entries[
-                ras_compute_plan_entries['plan_number'].isin(plan_number)
-            ]
-            logging.info(f"Filtered plans to execute: {plan_number}")
-
-        logging.info("Running selected plans sequentially...")
-        for _, plan in ras_compute_plan_entries.iterrows():
-            plan_number = plan["plan_number"]
-            start_time = time.time()
+            logger.info("Getting plan entries...")
             try:
-                success = RasCmdr.compute_plan(
-                    plan_number,
-                    ras_object=compute_ras,
-                    clear_geompre=clear_geompre,
-                    num_cores=num_cores
-                )
-                if success:
-                    logging.info(f"Successfully computed plan {plan_number}")
-                else:
-                    logging.error(f"Failed to compute plan {plan_number}")
+                ras_compute_plan_entries = compute_ras.plan_df
+                logger.info("Retrieved plan entries successfully.")
             except Exception as e:
-                logging.error(f"Error computing plan {plan_number}: {str(e)}")
-            end_time = time.time()
-            run_time = end_time - start_time
-            logging.info(f"Total run time for plan {plan_number}: {run_time:.2f} seconds")
-
-        logging.info("All selected plans have been executed.")
-        logging.info("compute_test_mode completed.")
-
-        ras_obj = ras_object or ras
-        ras_obj.plan_df = ras_obj.get_plan_entries()
-        ras_obj.geom_df = ras_obj.get_geom_entries()
-        ras_obj.flow_df = ras_obj.get_flow_entries()
-        ras_obj.unsteady_df = ras_obj.get_unsteady_entries()
-    
+                logger.critical(f"Error retrieving plan entries: {str(e)}")
+                return {}
+
+            if plan_number:
+                if isinstance(plan_number, str):
+                    plan_number = [plan_number]
+                ras_compute_plan_entries = ras_compute_plan_entries[
+                    ras_compute_plan_entries['plan_number'].isin(plan_number)
+                ]
+                logger.info(f"Filtered plans to execute: {plan_number}")
+
+            execution_results = {}
+            logger.info("Running selected plans sequentially...")
+            for _, plan in ras_compute_plan_entries.iterrows():
+                plan_number = plan["plan_number"]
+                start_time = time.time()
+                try:
+                    success = RasCmdr.compute_plan(
+                        plan_number,
+                        ras_object=compute_ras,
+                        clear_geompre=clear_geompre,
+                        num_cores=num_cores
+                    )
+                    execution_results[plan_number] = success
+                    if success:
+                        logger.info(f"Successfully computed plan {plan_number}")
+                    else:
+                        logger.error(f"Failed to compute plan {plan_number}")
+                except Exception as e:
+                    execution_results[plan_number] = False
+                    logger.error(f"Error computing plan {plan_number}: {str(e)}")
+                finally:
+                    end_time = time.time()
+                    run_time = end_time - start_time
+                    logger.info(f"Total run time for plan {plan_number}: {run_time:.2f} seconds")
+
+            logger.info("All selected plans have been executed.")
+            logger.info("compute_test_mode completed.")
+
+            logger.info("\nExecution Results:")
+            for plan_num, success in execution_results.items():
+                status = 'Successful' if success else 'Failed'
+                logger.info(f"Plan {plan_num}: {status}")
+
+            ras_obj.plan_df = ras_obj.get_plan_entries()
+            ras_obj.geom_df = ras_obj.get_geom_entries()
+            ras_obj.flow_df = ras_obj.get_flow_entries()
+            ras_obj.unsteady_df = ras_obj.get_unsteady_entries()
+
+            return execution_results
+
+        except Exception as e:
+            logger.critical(f"Error in compute_test_mode: {str(e)}")
+            return {}