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

ara_cli/template_loader.py

@@ -0,0 +1,245 @@
+
+import os
+import glob
+from ara_cli.template_manager import TemplatePathManager
+from ara_cli.ara_config import ConfigManager
+from ara_cli.directory_navigator import DirectoryNavigator
+
+
+class TemplateLoader:
+    """Handles template loading logic shared between CLI and chat commands"""
+
+    def __init__(self, chat_instance=None):
+        self.chat_instance = chat_instance
+
+    def load_template(self, template_name: str, template_type: str, chat_file_path: str, default_pattern: str | None = None) -> bool:
+        if not template_name:
+            if default_pattern:
+                return self.load_template_from_prompt_data(template_type, default_pattern, chat_file_path)
+            else:
+                print(f"A template name is required for template type '{template_type}'.")
+                return False
+        return self.load_template_from_global_or_local(template_name, template_type, chat_file_path)
+
+    def get_plural_template_type(self, template_type: str) -> str:
+        """Determines the plural form of a template type."""
+        plurals = {"commands": "commands", "rules": "rules"}
+        return plurals.get(template_type, f"{template_type}s")
+
+    def load_template_from_global_or_local(self, template_name: str, template_type: str, chat_file_path: str) -> bool:
+        """Load template from global or local directories"""
+        plural = self.get_plural_template_type(template_type)
+
+        if template_name.startswith("global/"):
+            return self._load_global_template(template_name, template_type, plural, chat_file_path)
+        else:
+            return self._load_local_template(template_name, template_type, plural, chat_file_path)
+
+    def _choose_file_for_cli(self, files: list[str], pattern: str) -> str | None:
+        """CLI-compatible file selection method"""
+        if len(files) <= 1:
+            return files[0] if files else None
+
+        if pattern in ["*", "global/*"] or "*" in pattern:
+            files.sort()
+            print("Multiple files found:")
+            for i, file in enumerate(files):
+                print(f"{i + 1}: {os.path.basename(file)}")
+
+            try:
+                choice = input("Please choose a file to load (enter number): ")
+                choice_index = int(choice) - 1
+                if 0 <= choice_index < len(files):
+                    return files[choice_index]
+                else:
+                    print("Invalid choice. Aborting load.")
+                    return None
+            except (ValueError, KeyboardInterrupt):
+                print("Invalid input. Aborting load.")
+                return None
+        else:
+            return files[0]
+
+    def _load_global_template(self, template_name: str, template_type: str, plural: str, chat_file_path: str) -> bool:
+        """Load template from global directory"""
+        directory = f"{TemplatePathManager.get_template_base_path()}/prompt-modules/{plural}/"
+        template_file = template_name.removeprefix("global/")
+        file_pattern = os.path.join(directory, template_file)
+        matching_files = glob.glob(file_pattern)
+
+        if not matching_files:
+            print(f"No {template_type} template '{template_file}' found in global templates.")
+            return False
+
+        # Choose file based on context
+        if self.chat_instance:
+            file_path = self.chat_instance.choose_file_to_load(matching_files, template_file)
+        else:
+            file_path = self._choose_file_for_cli(matching_files, template_file)
+
+        if file_path is None:
+            return False
+
+        return self._load_file_to_chat(file_path, template_type, chat_file_path)
+
+    def _load_local_template(self, template_name: str, template_type: str, plural: str, chat_file_path: str) -> bool:
+        """Load template from local custom directory"""
+        ara_config = ConfigManager.get_config()
+        navigator = DirectoryNavigator()
+
+        original_directory = os.getcwd()
+        navigator.navigate_to_target()
+        local_templates_path = ara_config.local_prompt_templates_dir
+        os.chdir("..")
+        local_templates_path = os.path.join(os.getcwd(), local_templates_path)
+        os.chdir(original_directory)
+
+        custom_prompt_templates_subdir = ara_config.custom_prompt_templates_subdir
+        template_directory = f"{local_templates_path}/{custom_prompt_templates_subdir}/{plural}"
+        file_pattern = os.path.join(template_directory, template_name)
+        matching_files = glob.glob(file_pattern)
+
+        if not matching_files:
+            print(f"No {template_type} template '{template_name}' found in local templates.")
+            return False
+
+        # Choose file based on context
+        if self.chat_instance:
+            file_path = self.chat_instance.choose_file_to_load(matching_files, template_name)
+        else:
+            file_path = self._choose_file_for_cli(matching_files, template_name)
+
+        if file_path is None:
+            return False
+
+        return self._load_file_to_chat(file_path, template_type, chat_file_path)
+
+    def load_template_from_prompt_data(self, template_type: str, default_pattern: str, chat_file_path: str) -> bool:
+        """Load template from prompt.data directory with selection"""
+        directory_path = os.path.join(os.path.dirname(chat_file_path), "prompt.data")
+        file_pattern = os.path.join(directory_path, default_pattern)
+        matching_files = glob.glob(file_pattern)
+
+        if not matching_files:
+            print(f"No {template_type} file found in prompt.data directory.")
+            return False
+
+        # Choose file based on context
+        if self.chat_instance:
+            file_path = self.chat_instance.choose_file_to_load(matching_files, default_pattern)
+        else:
+            file_path = self._choose_file_for_cli(matching_files, "*")
+
+        if file_path is None:
+            return False
+
+        return self._load_file_to_chat(file_path, template_type, chat_file_path)
+
+    def _load_file_to_chat(self, file_path: str, template_type: str, chat_file_path: str) -> bool:
+        """Load a file into the chat file"""
+        if self.chat_instance:
+            # Use chat instance methods
+            self.chat_instance.add_prompt_tag_if_needed(chat_file_path)
+            if self.chat_instance.load_file(file_path):
+                print(f"Loaded {template_type} from {os.path.basename(file_path)} into {os.path.basename(chat_file_path)}")
+                return True
+        else:
+            # Direct file loading for CLI usage
+            try:
+                with open(file_path, 'r', encoding='utf-8') as template_file:
+                    template_content = template_file.read()
+
+                # Add prompt tag if needed
+                self._add_prompt_tag_if_needed(chat_file_path)
+
+                # Append template content with newlines for separation
+                with open(chat_file_path, 'a', encoding='utf-8') as chat_file:
+                    chat_file.write(f"\n{template_content}\n")
+
+                print(f"Loaded {template_type} from {os.path.basename(file_path)} into {os.path.basename(chat_file_path)}")
+                return True
+            except Exception as e:
+                print(f"Error loading {template_type} from {file_path}: {e}")
+                return False
+
+        return False
+
+    def _add_prompt_tag_if_needed(self, chat_file_path: str):
+        """Add prompt tag if needed for CLI usage"""
+        from ara_cli.chat import Chat
+
+        with open(chat_file_path, '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
+        if lines:
+            last_line = lines[-1].strip()
+            if last_line != "" and last_line != '\n':
+                append = f"\n{append}"
+
+        with open(chat_file_path, 'a', encoding='utf-8') as file:
+            file.write(append)
+
+    def _find_project_root(self, start_path: str) -> str | None:
+        """
+        Finds the project root by searching for an 'ara' directory,
+        starting from the given path and moving upwards.
+        """
+        current_dir = start_path
+        while True:
+            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 = ""):
+        """
+        Scans a given path for items and adds them to the provided set,
+        optionally prepending a prefix.
+        """
+        if not os.path.isdir(search_path):
+            return
+        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, context_path: str) -> list[str]:
+        """
+        Scans for available global and project-local custom templates.
+        This method safely searches for template files without changing the
+        current directory, making it safe for use in autocompleters.
+        Args:
+            template_type: The type of template to search for (e.g., 'rules').
+            context_path: The directory path to start the search for project root from.
+        Returns:
+            A sorted list of unique template names. Global templates are
+            prefixed with 'global/'.
+        """
+        plural_type = self.get_plural_template_type(template_type)
+        templates = set()
+
+        # 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/")
+        except Exception:
+            pass  # Silently ignore if global templates are not found
+
+        # 2. Find Local Custom Templates
+        try:
+            project_root = self._find_project_root(context_path)
+            if project_root:
+                config = ConfigManager.get_config()
+                local_templates_base = os.path.join(project_root, config.local_prompt_templates_dir)
+                custom_dir = os.path.join(local_templates_base, 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
+
+        return sorted(list(templates))

ara_cli/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "0.1.9.95"   # fith parameter like .0 for local install test purposes only. official numbers should be 4 digit numbers
+__version__ = "0.1.10.0"   # fith parameter like .0 for local install test purposes only. official numbers should be 4 digit numbers

{ara_cli-0.1.9.95.dist-info → ara_cli-0.1.10.0.dist-info}/METADATA

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.95
+Version: 0.1.10.0
 Summary: Powerful, open source command-line tool for managing, structuring and automating software development artifacts in line with Business-Driven Development (BDD) and AI-assisted processes
 Description-Content-Type: text/markdown
+Requires-Dist: langfuse
 Requires-Dist: litellm
 Requires-Dist: llama-index
 Requires-Dist: llama-index-llms-openai

{ara_cli-0.1.9.95.dist-info → ara_cli-0.1.10.0.dist-info}/RECORD

@@ -1,49 +1,51 @@
-ara_cli/__init__.py,sha256=CzGZUcf4WQP051xeNziNKQj8oNr-n_lZCW5_cR_WNVw,455
-ara_cli/__main__.py,sha256=J5DCDLRZ6UcpYwM1-NkjaLo4PTetcSj2dB4HrrftkUw,2064
-ara_cli/ara_command_action.py,sha256=uyMN05ZYffWqN9nwL53MmQ_yHpuxHVqZ_scAMEoD1jw,21516
-ara_cli/ara_command_parser.py,sha256=A1lMc9Gc0EMJt-380PTcv3aKoxbXGfx5gGax-sZqV3I,21020
-ara_cli/ara_config.py,sha256=VJeage_v-446OtSXIfpazUbetpH7kGNv8Un1lKYx5ZE,9321
-ara_cli/artefact_autofix.py,sha256=w6erUYrpPiwtHToiZEfjkDgDDPPSA9zaNc7w2NqrZ2M,20730
-ara_cli/artefact_creator.py,sha256=wchIq1w636ui_kRCfNWPffqiIiXqSb49pgTpQj3KzA0,6132
-ara_cli/artefact_deleter.py,sha256=Co4wwCH3yW8H9NrOq7_2p5571EeHr0TsfE-H8KqoOfY,1900
-ara_cli/artefact_fuzzy_search.py,sha256=iBlDqjZf-_D3VUjFf7ZwkiQbpQDcwRndIU7aG_sRTgE,2668
+ara_cli/__init__.py,sha256=DuzXKimZ6JtUEnp48qCQcnojDflBtYjT6Na_twO5EzM,505
+ara_cli/__main__.py,sha256=sumQaIYg6wJdcT-nQjJpK9DGaBUTszjPrgZLPN2bUVs,3520
+ara_cli/ara_command_action.py,sha256=VJSReKfgUQk62DeMcY4EN228FvgF1m8NiHf-ckrigdA,24450
+ara_cli/ara_command_parser.py,sha256=4_LXxj9w7eAY8d_s8pMlKmxtMr9cX9y2pD5azNeJjsg,22288
+ara_cli/ara_config.py,sha256=vZsY2zYJdlSExRE84L5LqRH3DjveeuMSmG5fC8HDIVc,9794
+ara_cli/artefact_autofix.py,sha256=9j_bh0HGnN6HVT9OGKVp85VgDklpx3XpSc9MxBCldU4,25050
+ara_cli/artefact_creator.py,sha256=fRrDaGZvOqJqDb_DLXqMTed2XfIvQMIHjLgOuHOi3Qg,5973
+ara_cli/artefact_deleter.py,sha256=T1vS2s3k_BW86Sd8FExx8nC3BIL05xE9KZLkeZsZrKM,1891
+ara_cli/artefact_fuzzy_search.py,sha256=XMzbMBOJ2YrgFi566jYNB3XeRAmJh7-zqV2QJYbhtlc,3006
 ara_cli/artefact_link_updater.py,sha256=nKdxTpDKqWTOAMD8viKmUaklSFGWzJZ8S8E8xW_ADuM,3775
 ara_cli/artefact_lister.py,sha256=M-ggazAgZ-OLeW9NB48r_sd6zPx0p4hEpeS63qHwI1A,4176
-ara_cli/artefact_reader.py,sha256=Pho0_Eqm7kD9CNbVMhKb6mkNM0I3iJiCJXbXmVp1DJU,7827
+ara_cli/artefact_reader.py,sha256=-6E1VhIlh2oJE1Rn8ARcHRc_E9N4uk8cEViKMoywm6E,7753
 ara_cli/artefact_renamer.py,sha256=8S4QWD19_FGKsKlWojnu_RUOxx0u9rmLugydM4s4VDc,4219
 ara_cli/artefact_scan.py,sha256=msPCm-vPWOAZ_e_z5GylXxq1MtNlmJ4zvKrsdOFCWF4,4813
-ara_cli/chat.py,sha256=i2v-Ctem66sgO-HUV3kvMbk4wfotsc2oNet_i1-wfAI,39901
+ara_cli/chat.py,sha256=Vp1HzSaaUsfOldOjxJc0ff68lQJWiIet0LJ22jjMYUs,40776
 ara_cli/classifier.py,sha256=zWskj7rBYdqYBGjksBm46iTgVU5IIf2PZsJr4qeiwVU,1878
 ara_cli/codefusionretriever.py,sha256=fCHgXdIBRzkVAnapX-KI2NQ44XbrrF4tEQmn5J6clUI,1980
 ara_cli/codehierachieretriever.py,sha256=Xd3EgEWWhkSf1TmTWtf8X5_YvyE_4B66nRrqarwSiTU,1182
 ara_cli/commandline_completer.py,sha256=b00Dqb5n7SecpxYIDLxAfYhp8X6e3c8a5qYz6ko0i3E,1192
 ara_cli/directory_navigator.py,sha256=6QbSAjJrJ5a6Lutol9J4HFgVDMiAQ672ny9TATrh04U,3318
-ara_cli/file_classifier.py,sha256=A7wilPtIFm81iMgvqD0PjkOVL_QMUc9TB2w2Z9UcPcM,4001
+ara_cli/error_handler.py,sha256=nNaJSq82f3xiz_QFRKPg5kX_-oI-UoFdRJ2OTj1AR18,4019
+ara_cli/file_classifier.py,sha256=nUcNrhflUydCyCRbXHjEEXYwwwfUm65lYnNEvc86fpM,4026
 ara_cli/file_lister.py,sha256=0C-j8IzajXo5qlvnuy5WFfe43ALwJ-0JFh2K6Xx2ccw,2332
 ara_cli/filename_validator.py,sha256=Aw9PL8d5-Ymhp3EY6lDrUBk3cudaNqo1Uw5RzPpI1jA,118
 ara_cli/global_file_lister.py,sha256=IIrtFoN5KYyJ3jVPanXZJ4UbYZfSdONRwxkZzvmq6-k,2806
 ara_cli/list_filter.py,sha256=qKGwwQsrWe7L5FbdxEbBYD1bbbi8c-RMypjXqXvLbgs,5291
 ara_cli/output_suppressor.py,sha256=nwiHaQLwabOjMoJOeUESBnZszGMxrQZfJ3N2OvahX7Y,389
 ara_cli/prompt_chat.py,sha256=kd_OINDQFit6jN04bb7mzgY259JBbRaTaNp9F-webkc,1346
-ara_cli/prompt_extractor.py,sha256=-_17aVYXYH6kPX5FOSb9T8lbEkKPXE6nlHWq1pvO_Og,8423
-ara_cli/prompt_handler.py,sha256=8a9fcMwE_C6ntbw7UeroNJeU5LxrxEppiUtvYNUTB2U,23292
+ara_cli/prompt_extractor.py,sha256=WloRgfcEdIVq37BpdWAd2X3EMu0bcNN_Wuws1T2YiUg,8418
+ara_cli/prompt_handler.py,sha256=N0zH5k9T6udKAbMolxEAaAwiFo03h5aF-IY3BmMLEos,27924
 ara_cli/prompt_rag.py,sha256=ydlhe4CUqz0jdzlY7jBbpKaf_5fjMrAZKnriKea3ZAg,7485
 ara_cli/run_file_lister.py,sha256=XbrrDTJXp1LFGx9Lv91SNsEHZPP-PyEMBF_P4btjbDA,2360
 ara_cli/tag_extractor.py,sha256=k2yRl7dAMZ4YTARzUke4wgY0oEIOmWkOHGet7nXB6uw,3317
+ara_cli/template_loader.py,sha256=uEpYOchT5d-OO5r-W0-h605Xilvuv56i1VKSy4_9NaE,10734
 ara_cli/template_manager.py,sha256=l2c785YHB7m0e2TjE0CX-nwXrS4v3EiT9qrS5KuatAc,7105
 ara_cli/update_config_prompt.py,sha256=moqj2Kha7S7fEGzTReU0v2y8UjXC8QfnoiieOQr35C4,5157
-ara_cli/version.py,sha256=rYDZfGIzWScBRjMjgeqPAsdSGThurJ7PgpedF2Ekr2U,146
+ara_cli/version.py,sha256=AvikXK1EI29z3MY864MZ0oxZJZ4-tSdFYdogqQEkDac,146
 ara_cli/artefact_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ara_cli/artefact_models/artefact_data_retrieval.py,sha256=CooXOJBYWSyiViN2xkC8baS8OUaslry3YGVVUeDxRAU,527
 ara_cli/artefact_models/artefact_load.py,sha256=IXzWxP-Q_j_oDGMno0m-OuXCQ7Vd5c_NctshGr4ROBw,621
 ara_cli/artefact_models/artefact_mapping.py,sha256=8aD0spBjkJ8toMAmFawc6UTUxB6-tEEViZXv2I-r88Q,1874
 ara_cli/artefact_models/artefact_model.py,sha256=qSbcrmFWAYgBqcNl9QARI1_uLQJm-TPVgP5q2AEFnjE,15983
-ara_cli/artefact_models/artefact_templates.py,sha256=8HNM-TsNvKgTpruOBs751yRDXJypTiJhc1tkWCiYG7s,9830
+ara_cli/artefact_models/artefact_templates.py,sha256=CFa_vIA-cnbZEHuACd24vNJB_7LueQi-8x7ga_AyLKI,9830
 ara_cli/artefact_models/businessgoal_artefact_model.py,sha256=GYT5S2xEnQHwv-k-lEeX5NMSqA-UEfV3PhNjgPDUJpw,4698
 ara_cli/artefact_models/capability_artefact_model.py,sha256=SZqHx4O2mj4urn77Stnj4_Jxtlq3-LgBBU9SMkByppI,3079
 ara_cli/artefact_models/epic_artefact_model.py,sha256=h9pC00ZxCL-t_NMjwTCeOnIJZPa9hhB-R05wr110LXs,5619
 ara_cli/artefact_models/example_artefact_model.py,sha256=UXrKbaPotg1jwcrVSdCeo-XH4tTD_-U1e3giaBn5_xg,1384
-ara_cli/artefact_models/feature_artefact_model.py,sha256=FrR7_xydOmMySAz0QpWgrNFF6UcbFsDj7Ji1R2dc82g,19179
+ara_cli/artefact_models/feature_artefact_model.py,sha256=iUCrdgH_VhRCBVyCQARpl9cWzavC310lKZHWLofsq9s,20256
 ara_cli/artefact_models/issue_artefact_model.py,sha256=v6CpKnkqiUh6Wch2kkEmyyW49c8ysdy1qz8l1Ft9uJA,2552
 ara_cli/artefact_models/keyfeature_artefact_model.py,sha256=J9oXLsCAo22AW31D5Z104y02ss0S0O4tPCcd09zYCD0,4066
 ara_cli/artefact_models/serialize_helper.py,sha256=Wks30wy-UrwJURetydKykLgJkdGRgXFHkDT24vHe5tU,595
@@ -52,7 +54,7 @@ ara_cli/artefact_models/userstory_artefact_model.py,sha256=2awH31ROtm7j4T44Bv4cy
 ara_cli/artefact_models/vision_artefact_model.py,sha256=frjaUJj-mmIlVHEhzAQztCGs-CtvNu_odSborgztfzo,5251
 ara_cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ara_cli/commands/command.py,sha256=Y_2dNeuxRjbyI3ScXNv55lptSe8Hs_ya78L0nPYNZHA,154
-ara_cli/commands/extract_command.py,sha256=qpi2_ac3DyxS7FiOz4GsTtRR4xtpegckUmfXzDOwymM,858
+ara_cli/commands/extract_command.py,sha256=CzUOwDembG587PYbxg5rge4XSfdsuTyOPUvkobkXCIs,573
 ara_cli/commands/load_command.py,sha256=H3CfeHIL-criDU5oi4BONTSpyzJ4m8DzJ0ZCIiAZFeI,2204
 ara_cli/commands/load_image_command.py,sha256=g9-PXAYdqx5Ed1PdVo-FIb4CyJGEpRFbgQf9Dxg6DmM,886
 ara_cli/commands/read_command.py,sha256=bo1BvRWuNKdFqBNN1EWORNrX_yuFAOyBruDUolHq1Vc,3791
@@ -140,29 +142,30 @@ ara_cli/templates/specification_breakdown_files/template.step.md,sha256=nzDRl9Xo
 ara_cli/templates/specification_breakdown_files/template.technology.exploration.md,sha256=zQyiJcmbUfXdte-5uZwZUpT6ey0zwfZ00P4VwI97jQk,2274
 ara_cli/templates/specification_breakdown_files/template.technology.md,sha256=bySiksz-8xtq0Nnj4svqe2MgUftWrVkbK9AcrDUE3KY,952
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_ara_command_action.py,sha256=JTLqXM9BSMlU33OQgrk_sZnoowFJZKZAx8q-st-wa34,25821
+tests/test_ara_command_action.py,sha256=gLXFAW6K0qCkNKvWvmbshfpJqczvdgBoNGT4rugF7JI,27181
 tests/test_ara_config.py,sha256=RbVhS0SS1lr_SVopEMT1Fake5a-4rWN8MprgJtgI-FA,15883
-tests/test_artefact_autofix.py,sha256=pApZ-N0dW8Ujt-cNLbgvd4bhiIIK8oXb-saLf6QlA-8,25022
+tests/test_artefact_autofix.py,sha256=vcN11CY6XJq97N0php4OW-rPbEMEh_nYFISrg-pN1mE,38332
 tests/test_artefact_fuzzy_search.py,sha256=5Sh3_l9QK8-WHn6JpGPU1b6h4QEnl2JoMq1Tdp2cj1U,1261
 tests/test_artefact_link_updater.py,sha256=biqbEp2jCOz8giv72hu2P2hDfeJfJ9OrVGdAv5d9cK4,2191
 tests/test_artefact_lister.py,sha256=35R13UU-YsX1HOsEN8M2-vIiCUA9RSBm6SwestDaFhE,20388
 tests/test_artefact_reader.py,sha256=660K-d8ed-j8hulsUB_7baPD2-hhbg9TffUR5yVc4Uo,927
 tests/test_artefact_renamer.py,sha256=lSnKCCfoFGgKhTdDZrEaeBq1xJAak1QoqH5aSeOe9Ro,3494
 tests/test_artefact_scan.py,sha256=uNWgrt7ieZ4ogKACsPqzAsh59JF2BhTKSag31hpVrTQ,16887
-tests/test_chat.py,sha256=sf4mXmOjXZeaYPNSYXSyfz0b5pZA6Mq7_R3gWjQaJw4,56152
+tests/test_chat.py,sha256=D2HRRTdnvcDvB9TWz4O91ZONbLJL6w4v8TRTDwjtzzI,86104
 tests/test_classifier.py,sha256=grYGPksydNdPsaEBQxYHZTuTdcJWz7VQtikCKA6BNaQ,1920
 tests/test_directory_navigator.py,sha256=7G0MVrBbtBvbrFUpL0zb_9EkEWi1dulWuHsrQxMJxDY,140
-tests/test_file_classifier.py,sha256=kLWPiePu3F5mkVuI_lK_2QlLh2kXD_Mt2K8KZZ1fAnA,10940
-tests/test_file_creator.py,sha256=D3G7MbgE0m8JmZihxnTryxLco6iZdbV--2CGc0L20FM,2109
+tests/test_file_classifier.py,sha256=4O1C_iDpGGm35b7aI-HIJd5kkWxFUOrI2n4lEpiDNTM,11855
+tests/test_file_creator.py,sha256=tgBCq6KPv-qMSDhj9AZvQIJABiAqgpFRnEg1fqbVrTI,2013
 tests/test_file_lister.py,sha256=Q9HwhKKx540EPzTmfzOCnvtAgON0aMmpJE2eOe1J3EA,4324
 tests/test_global_file_lister.py,sha256=ycvf2YL8q5QSEMwcnQfUdoWnQQ8xTSyEtccAeXwl6QU,5487
 tests/test_list_filter.py,sha256=fJA3d_SdaOAUkE7jn68MOVS0THXGghy1fye_64Zvo1U,7964
-tests/test_prompt_handler.py,sha256=kW8FU09ho4I5qC-f4G9r4ZgI-NlqdOkTmAazG7FaTrw,32299
+tests/test_prompt_handler.py,sha256=9s1zavcW81uz8wOBM_2X2KqdLNoc3E9bt0Oqt2-Sgmk,33926
 tests/test_tag_extractor.py,sha256=nSiAYlTKZ7TLAOtcJpwK5zTWHhFYU0tI5xKnivLc1dU,2712
+tests/test_template_loader.py,sha256=R7s8HJZbKqja-1TRBMBkVKPTgajofUjjRKUJq7a3_Oc,7427
 tests/test_template_manager.py,sha256=qliEeYgAEakn8JIqIHa8u0Ht6DY4L3T6DcHBXkjzR4I,4167
 tests/test_update_config_prompt.py,sha256=xsqj1WTn4BsG5Q2t-sNPfu7EoMURFcS-hfb5VSXUnJc,6765
-ara_cli-0.1.9.95.dist-info/METADATA,sha256=ZVJWS_s9Xmdeftrsy6337QTfO_BVESYERmL5r_2tT3s,6789
-ara_cli-0.1.9.95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.95.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.95.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
-ara_cli-0.1.9.95.dist-info/RECORD,,
+ara_cli-0.1.10.0.dist-info/METADATA,sha256=9DcNT8mkoI9D6aDt0gRORWFl_MagH7yTw_ISo4uc_Tw,6813
+ara_cli-0.1.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.10.0.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.10.0.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
+ara_cli-0.1.10.0.dist-info/RECORD,,

tests/test_ara_command_action.py

@@ -1,5 +1,6 @@
 import pytest
 from unittest.mock import patch, MagicMock, call, mock_open
+from ara_cli.error_handler import AraValidationError
 from ara_cli.ara_command_action import (
     check_validity,
     create_action,
@@ -16,6 +17,12 @@ from ara_cli.ara_command_action import (
 )
 
 
+@pytest.fixture
+def mock_handle_errors():
+    with patch("ara_cli.ara_command_action.handle_errors", lambda context: (lambda f: f)):
+        yield
+
+
 @pytest.fixture
 def mock_dependencies():
     with patch(
@@ -28,8 +35,10 @@ def mock_dependencies():
         "ara_cli.template_manager.SpecificationBreakdownAspects"
     ) as MockSpecificationBreakdownAspects, patch(
         "ara_cli.artefact_fuzzy_search.find_closest_rule"
-    ) as mock_find_closest_rule:
-        yield MockArtefactCreator, MockClassifier, mock_is_valid_filename, MockSpecificationBreakdownAspects, mock_find_closest_rule
+    ) as mock_find_closest_rule, patch(
+        "ara_cli.artefact_reader.ArtefactReader"
+    ) as MockArtefactReader:
+        yield MockArtefactCreator, MockClassifier, mock_is_valid_filename, MockSpecificationBreakdownAspects, mock_find_closest_rule, MockArtefactReader
 
 
 @pytest.fixture
@@ -102,65 +111,70 @@ def mock_suggest_close_name_matches():
         yield mock_suggest_close_name_matches
 
 
-@pytest.mark.parametrize(
-    "condition, error_message",
-    [(True, "This should not be printed"),
-     (False, "This is a test error message")],
-)
-def test_check_validity(condition, error_message):
-    with patch("sys.exit") as mock_exit, patch("builtins.print") as mock_print:
-        if condition:
-            check_validity(condition, error_message)
-            mock_exit.assert_not_called()
-            mock_print.assert_not_called()
-        else:
-            check_validity(condition, error_message)
-            mock_exit.assert_called_once_with(1)
-            mock_print.assert_called_once_with(error_message)
+def test_check_validity_with_true_condition():
+    """Test that check_validity does nothing when condition is True."""
+    # This should not raise any exception
+    check_validity(True, "This should not be printed")
 
 
-@pytest.mark.parametrize(
-    "classifier_valid, filename_valid",
-    [(True, True), (False, True), (True, False), (False, False)],
-)
-def test_create_action_validity_checks(
-    mock_dependencies, classifier_valid, filename_valid
-):
-    (
-        MockArtefactCreator,
-        MockClassifier,
-        mock_is_valid_filename,
-        MockSpecificationBreakdownAspects,
-        mock_find_closest_rule,
-    ) = mock_dependencies
+def test_check_validity_with_false_condition():
+    """Test that check_validity raises AraValidationError when condition is False."""
+    error_message = "This is a test error message"
+
+    with pytest.raises(AraValidationError, match=error_message):
+        check_validity(False, error_message)
+
+
+def test_check_validity_error_message_content():
+    """Test that the raised exception contains the correct error message."""
+    error_message = "Custom validation error"
+
+    with pytest.raises(AraValidationError) as exc_info:
+        check_validity(False, error_message)
+
+    assert str(exc_info.value) == error_message
+
+
+def setup_create_args_and_mocks(classifier_valid, filename_valid, mock_dependencies):
+    (MockArtefactCreator, MockClassifier, mock_is_valid_filename, _, _, MockArtefactReader) = mock_dependencies
     MockClassifier.is_valid_classifier.return_value = classifier_valid
     mock_is_valid_filename.return_value = filename_valid
-    mock_find_closest_rule.return_value = None
+    MockArtefactReader.read_artefact.return_value = (None, None)
 
     args = MagicMock()
     args.classifier = "test_classifier"
     args.parameter = "test_parameter"
+    return args
 
+# Test for valid classifier and filename
+def test_create_action_with_valid_params(mock_handle_errors, mock_dependencies):
+    args = setup_create_args_and_mocks(True, True, mock_dependencies)
     with patch("ara_cli.ara_command_action.check_validity") as mock_check_validity:
-        if classifier_valid and filename_valid:
-            create_action(args)
-            mock_check_validity.assert_any_call(
-                True, "Invalid classifier provided. Please provide a valid classifier."
-            )
-            mock_check_validity.assert_any_call(
-                True, "Invalid filename provided. Please provide a valid filename."
-            )
-        else:
-            create_action(args)
-            if not classifier_valid:
-                mock_check_validity.assert_any_call(
-                    False,
-                    "Invalid classifier provided. Please provide a valid classifier.",
-                )
-            if not filename_valid:
-                mock_check_validity.assert_any_call(
-                    False, "Invalid filename provided. Please provide a valid filename."
-                )
+        create_action(args)
+        mock_check_validity.assert_any_call(True, "Invalid classifier provided. Please provide a valid classifier.")
+        mock_check_validity.assert_any_call(True, "Invalid filename provided. Please provide a valid filename.")
+
+# Test for invalid classifier
+def test_create_action_with_invalid_classifier(mock_handle_errors, mock_dependencies):
+    args = setup_create_args_and_mocks(False, True, mock_dependencies)
+    with patch("ara_cli.ara_command_action.check_validity") as mock_check_validity:
+        create_action(args)
+        mock_check_validity.assert_any_call(False, "Invalid classifier provided. Please provide a valid classifier.")
+
+# Test for invalid filename
+def test_create_action_with_invalid_filename(mock_handle_errors, mock_dependencies):
+    args = setup_create_args_and_mocks(True, False, mock_dependencies)
+    with patch("ara_cli.ara_command_action.check_validity") as mock_check_validity:
+        create_action(args)
+        mock_check_validity.assert_any_call(False, "Invalid filename provided. Please provide a valid filename.")
+
+# Test for both invalid classifier and filename
+def test_create_action_with_invalid_classifier_and_filename(mock_handle_errors, mock_dependencies):
+    args = setup_create_args_and_mocks(False, False, mock_dependencies)
+    with patch("ara_cli.ara_command_action.check_validity") as mock_check_validity:
+        create_action(args)
+        mock_check_validity.assert_any_call(False, "Invalid classifier provided. Please provide a valid classifier.")
+        mock_check_validity.assert_any_call(False, "Invalid filename provided. Please provide a valid filename.")
 
 
 @pytest.mark.parametrize(
@@ -406,7 +420,7 @@ def test_read_status_action(classifier, artefact_name, artefact_exists, status,
         # Verify behavior
         if not artefact_exists:
             # Should suggest close matches when artefact not found
-            mock_suggest_close_name_matches.assert_called_once_with(artefact_name, all_artefact_names)
+            mock_suggest_close_name_matches.assert_called_once_with(artefact_name, all_artefact_names, report_as_error=True)
             mock_open.assert_not_called()
         else:
             # Should open the file and read content