ara-cli 0.1.9.96__py3-none-any.whl → 0.1.10.0__py3-none-any.whl

ara_cli/chat.py

@@ -1,29 +1,55 @@
 import os
+import errno
 import argparse
 import cmd2
-from . import error_handler
+
 from ara_cli.prompt_handler import send_prompt
 
+from . import error_handler
+from ara_cli.error_handler import AraError, AraConfigurationError
+
 from ara_cli.file_loaders.document_file_loader import DocumentFileLoader
 from ara_cli.file_loaders.binary_file_loader import BinaryFileLoader
 from ara_cli.file_loaders.text_file_loader import TextFileLoader
 
 
 extract_parser = argparse.ArgumentParser()
-extract_parser.add_argument('-f', '--force', action='store_true', help='Force extraction')
-extract_parser.add_argument('-w','--write', action='store_true', help='Overwrite existing files without using LLM for merging.')
+extract_parser.add_argument(
+    "-f", "--force", action="store_true", help="Force extraction"
+)
+extract_parser.add_argument(
+    "-w",
+    "--write",
+    action="store_true",
+    help="Overwrite existing files without using LLM for merging.",
+)
 
 load_parser = argparse.ArgumentParser()
-load_parser.add_argument('file_name', nargs='?', default='', help='File to load')
-load_parser.add_argument('--load-images', action='store_true', help='Extract and describe images from documents')
+load_parser.add_argument("file_name", nargs="?", default="", help="File to load")
+load_parser.add_argument(
+    "--load-images",
+    action="store_true",
+    help="Extract and describe images from documents",
+)
 
 extract_parser = argparse.ArgumentParser()
-extract_parser.add_argument('-f', '--force', action='store_true', help='Force extraction')
-extract_parser.add_argument('-w','--write', action='store_true', help='Overwrite existing files without using LLM for merging.')
+extract_parser.add_argument(
+    "-f", "--force", action="store_true", help="Force extraction"
+)
+extract_parser.add_argument(
+    "-w",
+    "--write",
+    action="store_true",
+    help="Overwrite existing files without using LLM for merging.",
+)
 
 load_parser = argparse.ArgumentParser()
-load_parser.add_argument('file_name', nargs='?', default='', help='File to load')
-load_parser.add_argument('--load-images', action='store_true', help='Extract and describe images from documents')
+load_parser.add_argument("file_name", nargs="?", default="", help="File to load")
+load_parser.add_argument(
+    "--load-images",
+    action="store_true",
+    help="Extract and describe images from documents",
+)
 
 
 class Chat(cmd2.Cmd):
@@ -53,10 +79,10 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
     ROLE_RESPONSE = "ara response"
 
     BINARY_TYPE_MAPPING = {
-            ".png": "image/png",
-            ".jpg": "image/jpeg",
-            ".jpeg": "image/jpeg",
-        }
+        ".png": "image/png",
+        ".jpg": "image/jpeg",
+        ".jpeg": "image/jpeg",
+    }
 
     DOCUMENT_TYPE_EXTENSIONS = [".docx", ".doc", ".odt", ".pdf"]
 
@@ -64,25 +90,29 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         self,
         chat_name: str,
         reset: bool | None = None,
-        enable_commands: list[str] | None = None
+        enable_commands: list[str] | None = None,
     ):
+        from ara_cli.template_loader import TemplateLoader
         shortcuts = dict(cmd2.DEFAULT_SHORTCUTS)
         if enable_commands:
             enable_commands.append("quit")  # always allow quitting
             enable_commands.append("eof")  # always allow quitting with ctrl-D
             enable_commands.append("help")  # always allow help
 
-            shortcuts = {key: value for key, value in shortcuts.items() if value in enable_commands}
+            shortcuts = {
+                key: value
+                for key, value in shortcuts.items()
+                if value in enable_commands
+            }
 
-        super().__init__(
-            allow_cli_args=False,
-            shortcuts=shortcuts
-        )
+        super().__init__(allow_cli_args=False, shortcuts=shortcuts)
         self.create_default_aliases()
 
         if enable_commands:
             all_commands = self.get_all_commands()
-            commands_to_disable = [command for command in all_commands if command not in enable_commands]
+            commands_to_disable = [
+                command for command in all_commands if command not in enable_commands
+            ]
             self.disable_commands(commands_to_disable)
 
         self.prompt = "ara> "
@@ -94,12 +124,15 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         self.chat_history = []
         self.message_buffer = []
         self.config = self._retrieve_ara_config()
+        self.template_loader = TemplateLoader(chat_instance=self)
 
     def disable_commands(self, commands: list[str]):
         for command in commands:
-            setattr(self, f'do_{command}', self.default)
+            setattr(self, f"do_{command}", self.default)
             self.hidden_commands.append(command)
-        aliases_to_remove = [alias for alias, cmd in self.aliases.items() if cmd in commands]
+        aliases_to_remove = [
+            alias for alias, cmd in self.aliases.items() if cmd in commands
+        ]
         for alias in aliases_to_remove:
             del self.aliases[alias]
 
@@ -134,8 +167,10 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         chat_file_short = os.path.split(chat_file)[-1]
 
         if reset is None:
-            user_input = input(f"{chat_file_short} already exists. Do you want to reset the chat? (y/N): ")
-            if user_input.lower() == 'y':
+            user_input = input(
+                f"{chat_file_short} already exists. Do you want to reset the chat? (y/N): "
+            )
+            if user_input.lower() == "y":
                 self.create_empty_chat_file(chat_file)
         if reset:
             self.create_empty_chat_file(chat_file)
@@ -168,10 +203,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
     def get_last_role_marker(lines):
         if not lines:
             return
-        role_markers = [
-            f"# {Chat.ROLE_PROMPT}:",
-            f"# {Chat.ROLE_RESPONSE}"
-        ]
+        role_markers = [f"# {Chat.ROLE_PROMPT}:", f"# {Chat.ROLE_RESPONSE}"]
         for line in reversed(lines):
             stripped_line = line.strip()
             if stripped_line.startswith(tuple(role_markers)):
@@ -179,7 +211,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         return None
 
     def start_non_interactive(self):
-        with open(self.chat_name, 'r', encoding='utf-8') as file:
+        with open(self.chat_name, "r", encoding="utf-8") as file:
             content = file.read()
         print(content)
 
@@ -214,7 +246,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         text_content = []
         image_data_list = []
 
-        image_pattern = re.compile(r'\((data:image/[^;]+;base64,.*?)\)')
+        image_pattern = re.compile(r"\((data:image/[^;]+;base64,.*?)\)")
 
         for line in message.splitlines():
             match = image_pattern.search(line)
@@ -224,13 +256,8 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             else:
                 text_content.append(line)
 
-        message_content = {
-            "type": "text",
-            "text": '\n'.join(text_content)}
-        message = {
-            "role": role,
-            "content": [message_content]
-        }
+        message_content = {"type": "text", "text": "\n".join(text_content)}
+        message = {"role": role, "content": [message_content]}
         message = append_images_to_message(message, image_data_list)
         return message
 
@@ -243,7 +270,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
         split_pattern = re.compile(f"({prompt_marker}|{response_marker})")
 
-        parts = re.split(split_pattern, '\n'.join(self.chat_history))
+        parts = re.split(split_pattern, "\n".join(self.chat_history))
 
         all_prompts_and_responses = []
         current = ""
@@ -277,7 +304,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         prompt_to_send = self.assemble_prompt()
         role_marker = f"# {Chat.ROLE_RESPONSE}:"
 
-        with open(self.chat_name, 'a+', encoding='utf-8') as file:
+        with open(self.chat_name, "a+", encoding="utf-8") as file:
             last_line = self.get_last_line(file)
 
             print(role_marker)
@@ -300,24 +327,24 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
     def save_message(self, role: str, message: str):
         role_marker = f"# {role}:"
-        with open(self.chat_name, 'r', encoding='utf-8') as file:
+        with open(self.chat_name, "r", encoding="utf-8") as file:
             stripped_line = self.get_last_non_empty_line(file)
         line_to_write = f"{message}\n\n"
         if stripped_line != role_marker:
             line_to_write = f"\n{role_marker}\n{message}\n"
 
-        with open(self.chat_name, 'a', encoding='utf-8') as file:
+        with open(self.chat_name, "a", encoding="utf-8") as file:
             file.write(line_to_write)
         self.chat_history.append(line_to_write)
 
     def resend_message(self):
-        with open(self.chat_name, 'r', encoding='utf-8') as file:
+        with open(self.chat_name, "r", encoding="utf-8") as file:
             lines = file.readlines()
         if not lines:
             return
         index_to_remove = self.find_last_reply_index(lines)
         if index_to_remove is not None:
-            with open(self.chat_name, 'w', encoding='utf-8') as file:
+            with open(self.chat_name, "w", encoding="utf-8") as file:
                 file.writelines(lines[:index_to_remove])
         self.send_message()
 
@@ -332,45 +359,35 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         return index_to_remove
 
     def append_strings(self, strings: list[str]):
-        output = '\n'.join(strings)
-        with open(self.chat_name, 'a') as file:
-            file.write(output + '\n')
+        output = "\n".join(strings)
+        with open(self.chat_name, "a") as file:
+            file.write(output + "\n")
 
     def load_chat_history(self, chat_file: str):
         chat_history = []
         if os.path.exists(chat_file):
-            with open(chat_file, 'r', encoding='utf-8') as file:
+            with open(chat_file, "r", encoding="utf-8") as file:
                 chat_history = file.readlines()
         return chat_history
 
     def create_empty_chat_file(self, chat_file: str):
-        with open(chat_file, 'w', encoding='utf-8') as file:
+        with open(chat_file, "w", encoding="utf-8") as file:
             file.write(self.default_chat_content)
         self.chat_history = []
 
     def add_prompt_tag_if_needed(self, chat_file: str):
-        with open(chat_file, 'r', encoding='utf-8') as file:
+        with open(chat_file, "r", encoding="utf-8") as file:
             lines = file.readlines()
         prompt_tag = f"# {Chat.ROLE_PROMPT}:"
         if Chat.get_last_role_marker(lines) == prompt_tag:
             return
         append = prompt_tag
         last_line = lines[-1].strip()
-        if last_line != "" and last_line != '\n':
+        if last_line != "" and last_line != "\n":
             append = f"\n{append}"
-        with open(chat_file, 'a', encoding='utf-8') as file:
+        with open(chat_file, "a", encoding="utf-8") as file:
             file.write(append)
 
-    def determine_file_path(self, file_name: str):
-        current_directory = os.path.dirname(self.chat_name)
-        file_path = os.path.join(current_directory, file_name)
-        if not os.path.exists(file_path):
-            file_path = file_name
-        if not os.path.exists(file_path):
-            print(f"File {file_name} not found")
-            return None
-        return file_path
-
     # @file_exists_check
     def load_text_file(
         self,
@@ -378,7 +395,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         prefix: str = "",
         suffix: str = "",
         block_delimiter: str = "",
-        extract_images: bool = False
+        extract_images: bool = False,
     ):
         loader = TextFileLoader(self)
         return loader.load(
@@ -386,18 +403,15 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             prefix=prefix,
             suffix=suffix,
             block_delimiter=block_delimiter,
-            extract_images=extract_images
+            extract_images=extract_images,
         )
 
     # @file_exists_check
-    def load_binary_file(self, file_path, mime_type: str, prefix: str = "", suffix: str = ""):
+    def load_binary_file(
+        self, file_path, mime_type: str, prefix: str = "", suffix: str = ""
+    ):
         loader = BinaryFileLoader(self)
-        return loader.load(
-            file_path,
-            mime_type=mime_type,
-            prefix=prefix,
-            suffix=suffix
-        )
+        return loader.load(file_path, mime_type=mime_type, prefix=prefix, suffix=suffix)
 
     def read_markdown(self, file_path: str, extract_images: bool = False) -> str:
         """Read markdown file and optionally extract/describe images"""
@@ -413,7 +427,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         prefix: str = "",
         suffix: str = "",
         block_delimiter: str = "```",
-        extract_images: bool = False
+        extract_images: bool = False,
     ):
         loader = DocumentFileLoader(self)
         return loader.load(
@@ -421,7 +435,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             prefix=prefix,
             suffix=suffix,
             block_delimiter=block_delimiter,
-            extract_images=extract_images
+            extract_images=extract_images,
         )
 
     def load_file(
@@ -430,7 +444,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         prefix: str = "",
         suffix: str = "",
         block_delimiter: str = "",
-        extract_images: bool = False
+        extract_images: bool = False,
     ):
         binary_type_mapping = Chat.BINARY_TYPE_MAPPING
         document_type_extensions = Chat.DOCUMENT_TYPE_EXTENSIONS
@@ -442,8 +456,9 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
                 file_type = mime_type
                 break
 
-        is_file_document = any(file_name_lower.endswith(ext)
-                                for ext in document_type_extensions)
+        is_file_document = any(
+            file_name_lower.endswith(ext) for ext in document_type_extensions
+        )
 
         if is_file_document:
             return self.load_document_file(
@@ -451,14 +466,11 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
                 prefix=prefix,
                 suffix=suffix,
                 block_delimiter=block_delimiter,
-                extract_images=extract_images
+                extract_images=extract_images,
             )
         elif file_type:
             return self.load_binary_file(
-                file_path=file_name,
-                mime_type=file_type,
-                prefix=prefix,
-                suffix=suffix
+                file_path=file_name, mime_type=file_type, prefix=prefix, suffix=suffix
             )
         else:
             return self.load_text_file(
@@ -466,7 +478,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
                 prefix=prefix,
                 suffix=suffix,
                 block_delimiter=block_delimiter,
-                extract_images=extract_images
+                extract_images=extract_images,
             )
 
     def choose_file_to_load(self, files: list[str], pattern: str):
@@ -478,11 +490,13 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             try:
                 choice_index = int(choice) - 1
                 if choice_index < 0 or choice_index >= len(files):
-                    print("Invalid choice. Aborting load.")
+                    error_handler.report_error(
+                        ValueError("Invalid choice. Aborting load.")
+                    )
                     return None
                 file_path = files[choice_index]
-            except ValueError:
-                print("Invalid input. Aborting load.")
+            except ValueError as e:
+                error_handler.report_error(ValueError("Invalid input. Aborting load."))
                 return None
         else:
             file_path = files[0]
@@ -491,7 +505,9 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
     def _help_menu(self, verbose: bool = False):
         super()._help_menu(verbose)
         if self.aliases:
-            aliases = [f"{alias} -> {command}" for alias, command in self.aliases.items()]
+            aliases = [
+                f"{alias} -> {command}" for alias, command in self.aliases.items()
+            ]
             self._print_topics("Aliases", aliases, verbose)
 
     def do_quit(self, _):
@@ -510,7 +526,9 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
     def onecmd_plus_hooks(self, line, orig_rl_history_length):
         # store the full line for use with default()
         self.full_input = line
-        return super().onecmd_plus_hooks(line, orig_rl_history_length=orig_rl_history_length)
+        return super().onecmd_plus_hooks(
+            line, orig_rl_history_length=orig_rl_history_length
+        )
 
     def default(self, line):
         self.message_buffer.append(self.full_input)
@@ -523,7 +541,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
         file_name = args.file_name
         load_images = args.load_images
-        
+
         matching_files = self.find_matching_files_to_load(file_name)
         if not matching_files:
             return
@@ -532,7 +550,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             block_delimiter = "```"
             prefix = f"\nFile: {file_path}\n"
             self.add_prompt_tag_if_needed(self.chat_name)
-            
+
             if not os.path.isdir(file_path):
                 command = LoadCommand(
                     chat_instance=self,
@@ -540,16 +558,18 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
                     prefix=prefix,
                     block_delimiter=block_delimiter,
                     extract_images=load_images,
-                    output=self.poutput
+                    output=self.poutput,
                 )
                 command.execute()
 
     def complete_LOAD(self, text, line, begidx, endidx):
         import glob
-        return [x for x in glob.glob(text + '*')]
+
+        return [x for x in glob.glob(text + "*")]
 
     def _retrieve_ara_config(self):
         from ara_cli.prompt_handler import ConfigManager
+
         return ConfigManager().get_config()
 
     def _retrieve_llm_config(self):
@@ -565,7 +585,9 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         file_pattern = os.path.join(os.path.dirname(self.chat_name), file_name)
         matching_files = glob.glob(file_pattern)
         if not matching_files:
-            print(f"No files matching pattern {file_name} found.")
+            error_handler.report_error(
+                AraError(f"No files matching pattern '{file_name}' found.")
+            )
             return
         return matching_files
 
@@ -581,27 +603,29 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
         if file_type:
             return self.load_binary_file(
-                file_path=file_name,
-                mime_type=file_type,
-                prefix=prefix,
-                suffix=suffix
+                file_path=file_name, mime_type=file_type, prefix=prefix, suffix=suffix
             )
-        print(f"File {file_name} not recognized as image, could not load")
+        error_handler.report_error(
+            AraError(f"File {file_name} not recognized as image, could not load")
+        )
 
     def _verify_llm_choice(self, model_name):
         llm_config = self._retrieve_llm_config()
         models = [name for name in llm_config.keys()]
         if model_name not in models:
-            print(f"Model {model_name} unavailable. Retrieve the list of available models using the LIST_MODELS command.")
+            error_handler.report_error(
+                AraConfigurationError(
+                    f"Model {model_name} unavailable. Retrieve the list of available models using the LIST_MODELS command."
+                )
+            )
             return False
         return True
 
-
     @cmd2.with_category(CATEGORY_CHAT_CONTROL)
     def do_LOAD_IMAGE(self, file_name):
         """Load an image file and append it to chat file. Can be given the file name in-line. Will attempt to find the file relative to chat file first, then treat the given path as absolute"""
         from ara_cli.commands.load_image_command import LoadImageCommand
-        
+
         matching_files = self.find_matching_files_to_load(file_name)
         if not matching_files:
             return
@@ -609,7 +633,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         for file_path in matching_files:
             prefix = f"\nFile: {file_path}\n"
             self.add_prompt_tag_if_needed(self.chat_name)
-            
+
             if not os.path.isdir(file_path):
                 # Determine mime type
                 file_type = None
@@ -618,18 +642,22 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
                     if file_path_lower.endswith(extension):
                         file_type = mime_type
                         break
-                
+
                 if file_type:
                     command = LoadImageCommand(
                         chat_instance=self,
                         file_path=file_path,
                         mime_type=file_type,
                         prefix=prefix,
-                        output=self.poutput
+                        output=self.poutput,
                     )
                     command.execute()
                 else:
-                    self.perror(f"File {file_path} not recognized as image, could not load")
+                    error_handler.report_error(
+                        AraError(
+                            f"File {file_path} not recognized as image, could not load"
+                        )
+                    )
 
     @cmd2.with_category(CATEGORY_LLM_CONTROL)
     def do_LIST_MODELS(self, _):
@@ -648,7 +676,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         original_dir = os.getcwd()
         navigator = DirectoryNavigator()
         navigator.navigate_to_target()
-        os.chdir('..')
+        os.chdir("..")
 
         if not self._verify_llm_choice(model_name):
             return
@@ -670,14 +698,14 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         original_dir = os.getcwd()
         navigator = DirectoryNavigator()
         navigator.navigate_to_target()
-        os.chdir('..')
+        os.chdir("..")
 
         if not self._verify_llm_choice(model_name):
             return
 
         self.config.extraction_llm = model_name
         save_data(filepath=DEFAULT_CONFIG_LOCATION, config=self.config)
-        
+
         LLMSingleton.set_extraction_model(model_name)
         print(f"Extraction model switched to '{model_name}'")
 
@@ -693,7 +721,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
     def do_CURRENT_EXTRACTION_MODEL(self, _):
         """Displays the current extraction language model."""
         from ara_cli.prompt_handler import LLMSingleton
-        
+
         print(LLMSingleton.get_extraction_model())
 
     def _complete_llms(self, text, line, begidx, endidx):
@@ -731,7 +759,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
     def do_CLEAR(self, _):
         """Clear the chat and the file containing it"""
         user_input = input("Are you sure you want to clear the chat? (y/N): ")
-        if user_input.lower() != 'y':
+        if user_input.lower() != "y":
             return
         self.create_empty_chat_file(self.chat_name)
         self.chat_history = self.load_chat_history(self.chat_name)
@@ -740,24 +768,30 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
     @cmd2.with_category(CATEGORY_CHAT_CONTROL)
     def do_LOAD_RULES(self, rules_name):
         """Load rules from ./prompt.data/*.rules.md or from a specified template directory if an argument is given. Specify global/<rules_template> to access globally defined rules templates"""
-        self._load_template_helper(rules_name, "rules", "*.rules.md")
+        self.template_loader.load_template(rules_name, "rules", self.chat_name, "*.rules.md")
 
     @cmd2.with_category(CATEGORY_CHAT_CONTROL)
     def do_LOAD_INTENTION(self, intention_name):
         """Load intention from ./prompt.data/*.intention.md or from a specified template directory if an argument is given. Specify global/<intention_template> to access globally defined intention templates"""
-        self._load_template_helper(intention_name, "intention", "*.intention.md")
+        self.template_loader.load_template(intention_name, "intention", self.chat_name, "*.intention.md")
 
     @cmd2.with_category(CATEGORY_CHAT_CONTROL)
     def do_LOAD_COMMANDS(self, commands_name):
         """Load commands from ./prompt.data/*.commands.md or from a specified template directory if an argument is given. Specify global/<commands_template> to access globally defined commands templates"""
-        self._load_template_helper(commands_name, "commands", "*.commands.md")
+        self.template_loader.load_template(commands_name, "commands", self.chat_name, "*.commands.md")
 
     @cmd2.with_category(CATEGORY_CHAT_CONTROL)
     def do_LOAD_BLUEPRINT(self, blueprint_name):
         """Load specified blueprint. Specify global/<blueprint_name> to access globally defined blueprints"""
-        self._load_template_from_global_or_local(blueprint_name, "blueprint")
+        self.template_loader.load_template(blueprint_name, "blueprint", self.chat_name)
 
-    def _load_helper(self, directory: str, pattern: str, file_type: str, exclude_pattern: str | None = None):
+    def _load_helper(
+        self,
+        directory: str,
+        pattern: str,
+        file_type: str,
+        exclude_pattern: str | None = None,
+    ):
         import glob
 
         directory_path = os.path.join(os.path.dirname(self.chat_name), directory)
@@ -770,7 +804,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             matching_files = list(set(matching_files) - set(exclude_files))
 
         if not matching_files:
-            print(f"No {file_type} file found.")
+            error_handler.report_error(AraError(f"No {file_type} file found."))
             return
 
         file_path = self.choose_file_to_load(matching_files, pattern)
@@ -787,10 +821,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         from ara_cli.ara_config import ConfigManager
         from ara_cli.directory_navigator import DirectoryNavigator
 
-        plurals = {
-            "commands": "commands",
-            "rules": "rules"
-        }
+        plurals = {"commands": "commands", "rules": "rules"}
 
         plural = f"{template_type}s"
         if template_type in plurals:
@@ -798,7 +829,9 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
         if template_name.startswith("global/"):
             directory = f"{TemplatePathManager.get_template_base_path()}/prompt-modules/{plural}/"
-            self._load_helper(directory, template_name.removeprefix("global/"), template_type)
+            self._load_helper(
+                directory, template_name.removeprefix("global/"), template_type
+            )
             return
 
         ara_config = ConfigManager.get_config()
@@ -812,7 +845,9 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         os.chdir(original_directory)
 
         custom_prompt_templates_subdir = self.config.custom_prompt_templates_subdir
-        template_directory = f"{local_templates_path}/{custom_prompt_templates_subdir}/{plural}"
+        template_directory = (
+            f"{local_templates_path}/{custom_prompt_templates_subdir}/{plural}"
+        )
         self._load_helper(template_directory, template_name, template_type)
 
     def _load_template_helper(self, template_name, template_type, default_pattern):
@@ -820,7 +855,9 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             self._load_helper("prompt.data", default_pattern, template_type)
             return
 
-        self._load_template_from_global_or_local(template_name=template_name, template_type=template_type)
+        self._load_template_from_global_or_local(
+            template_name=template_name, template_type=template_type
+        )
 
     @cmd2.with_category(CATEGORY_CHAT_CONTROL)
     @cmd2.with_argparser(extract_parser)
@@ -832,7 +869,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             file_name=self.chat_name,
             force=args.force,
             write=args.write,
-            output=self.poutput
+            output=self.poutput,
         )
         command.execute()
 
@@ -860,13 +897,18 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             if path:
                 return [path]
             relative_path_for_error = os.path.join(base_directory, file_name)
-            self.perror(f"No givens file found at {relative_path_for_error} or {file_name}")
+            error_handler.report_error(
+                AraError,
+                f"No givens file found at {relative_path_for_error} or {file_name}",
+            )
             return []
 
         # If no file_name, check for defaults
         default_files_to_check = [
             os.path.join(base_directory, "prompt.data", "config.prompt_givens.md"),
-            os.path.join(base_directory, "prompt.data", "config.prompt_global_givens.md")
+            os.path.join(
+                base_directory, "prompt.data", "config.prompt_global_givens.md"
+            ),
         ]
         existing_defaults = [f for f in default_files_to_check if os.path.exists(f)]
         if existing_defaults:
@@ -877,11 +919,13 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         if not user_input:
             self.poutput("Aborting.")
             return []
-        
+
         path = resolve_path(user_input)
         if path:
             return [path]
-        self.perror(f"No givens file found at {user_input}. Aborting.")
+        error_handler.report_error(
+            AraError(f"No givens file found at {user_input}. Aborting.")
+        )
         return []
 
     @cmd2.with_category(CATEGORY_CHAT_CONTROL)
@@ -891,7 +935,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
         givens_files_to_process = self._find_givens_files(file_name)
         if not givens_files_to_process:
-            self.poutput("No givens files to load.")
+            error_handler.report_error(AraError("No givens files to load."))
             return
 
         for givens_path in givens_files_to_process:
@@ -899,7 +943,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             # from the markdown file. No directory change is needed.
             content, _ = load_givens(givens_path)
 
-            with open(self.chat_name, 'a', encoding='utf-8') as chat_file:
+            with open(self.chat_name, "a", encoding="utf-8") as chat_file:
                 chat_file.write(content)
 
             self.poutput(f"Loaded files listed and marked in {givens_path}")
@@ -916,12 +960,15 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         """Load artefact template"""
         from ara_cli.artefact_models.artefact_templates import template_artefact_of_type
 
-        artefact = template_artefact_of_type(''.join(template_name))
+        artefact = template_artefact_of_type("".join(template_name))
         if not artefact:
-            raise ValueError(f"No template for '{template_name}' found.")
+            error_handler.report_error(
+                ValueError(f"No template for '{template_name}' found.")
+            )
+            return
         write_content = artefact.serialize()
         self.add_prompt_tag_if_needed(self.chat_name)
-        with open(self.chat_name, 'a', encoding='utf-8') as chat_file:
+        with open(self.chat_name, "a", encoding="utf-8") as chat_file:
             chat_file.write(write_content)
         print(f"Loaded {template_name} artefact template")
 
@@ -935,11 +982,12 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         if not text:
             completions = classifiers
         else:
-            completions = [classifier for classifier in classifiers if classifier.startswith(text)]
+            completions = [
+                classifier for classifier in classifiers if classifier.startswith(text)
+            ]
 
         return completions
 
-
     def _get_plural_template_type(self, template_type: str) -> str:
         """Determines the plural form of a template type."""
         plurals = {"commands": "commands", "rules": "rules"}
@@ -952,22 +1000,25 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         """
         current_dir = os.path.dirname(self.chat_name)
         while True:
-            if os.path.isdir(os.path.join(current_dir, 'ara')):
+            if os.path.isdir(os.path.join(current_dir, "ara")):
                 return current_dir
             parent_dir = os.path.dirname(current_dir)
             if parent_dir == current_dir:  # Reached the filesystem root
                 return None
             current_dir = parent_dir
 
-    def _gather_templates_from_path(self, search_path: str, templates_set: set, prefix: str = ""):
+    def _gather_templates_from_path(
+        self, search_path: str, templates_set: set, prefix: str = ""
+    ):
         """
         Scans a given path for items and adds them to the provided set,
         optionally prepending a prefix.
         """
         import glob
+
         if not os.path.isdir(search_path):
             return
-        for path in glob.glob(os.path.join(search_path, '*')):
+        for path in glob.glob(os.path.join(search_path, "*")):
             templates_set.add(f"{prefix}{os.path.basename(path)}")
 
     def _get_available_templates(self, template_type: str) -> list[str]:
@@ -991,8 +1042,12 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         # 1. Find Global Templates
         try:
             global_base_path = TemplatePathManager.get_template_base_path()
-            global_template_dir = os.path.join(global_base_path, "prompt-modules", plural_type)
-            self._gather_templates_from_path(global_template_dir, templates, prefix="global/")
+            global_template_dir = os.path.join(
+                global_base_path, "prompt-modules", plural_type
+            )
+            self._gather_templates_from_path(
+                global_template_dir, templates, prefix="global/"
+            )
         except Exception:
             pass  # Silently ignore if global templates are not found
 
@@ -1000,8 +1055,14 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         try:
             project_root = self._find_project_root()
             if project_root:
-                local_templates_base = os.path.join(project_root, self.config.local_prompt_templates_dir)
-                custom_dir = os.path.join(local_templates_base, self.config.custom_prompt_templates_subdir, plural_type)
+                local_templates_base = os.path.join(
+                    project_root, self.config.local_prompt_templates_dir
+                )
+                custom_dir = os.path.join(
+                    local_templates_base,
+                    self.config.custom_prompt_templates_subdir,
+                    plural_type,
+                )
                 self._gather_templates_from_path(custom_dir, templates)
         except Exception:
             pass  # Silently ignore if local templates cannot be resolved
@@ -1010,7 +1071,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
     def _template_completer(self, text: str, template_type: str) -> list[str]:
         """Generic completer for different template types."""
-        available_templates = self._get_available_templates(template_type)
+        available_templates = self.template_loader.get_available_templates(template_type, os.path.dirname(self.chat_name))
         if not text:
             return available_templates
         return [t for t in available_templates if t.startswith(text)]
@@ -1029,4 +1090,4 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
     def complete_LOAD_BLUEPRINT(self, text, line, begidx, endidx):
         """Completer for the LOAD_BLUEPRINT command."""
-        return self._template_completer(text, "blueprint")
+        return self._template_completer(text, "blueprint")