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

ara_cli/artefact_reader.py

@@ -1,3 +1,4 @@
+from . import error_handler
 from ara_cli.classifier import Classifier
 from ara_cli.file_classifier import FileClassifier
 from ara_cli.artefact_models.artefact_model import Artefact
@@ -12,8 +13,7 @@ class ArtefactReader:
     @staticmethod
     def read_artefact_data(artefact_name, classifier, classified_file_info = None) -> tuple[str, dict[str, str]]:
         if not Classifier.is_valid_classifier(classifier):
-            print("Invalid classifier provided. Please provide a valid classifier.")
-            return None, None
+            raise ValueError("Invalid classifier provided. Please provide a valid classifier.")
 
         if not classified_file_info:
             file_classifier = FileClassifier(os)
@@ -74,7 +74,6 @@ class ArtefactReader:
 
     @staticmethod
     def read_artefacts(classified_artefacts=None, file_system=os, tags=None) -> Dict[str, List[Artefact]]:
-        from ara_cli.artefact_models.artefact_load import artefact_from_content
 
         if classified_artefacts is None:
             file_classifier = FileClassifier(file_system)
@@ -89,7 +88,7 @@ class ArtefactReader:
                     artefact = ArtefactReader.read_artefact(title, artefact_type, classified_artefacts)
                     artefacts[artefact_type].append(artefact)
                 except Exception as e:
-                    print(f"Failed to read {artefact_type} '{title}' with an error: ", e)
+                    error_handler.report_error(e, f"reading {artefact_type} '{title}'")
                     continue
         return artefacts
 
@@ -143,7 +142,7 @@ class ArtefactReader:
         ArtefactReader._ensure_classifier_key(classifier, artefacts_by_classifier)
 
         artefact = ArtefactReader._find_artefact_by_name(
-            artefact_name, 
+            artefact_name,
             classified_artefacts.get(classifier, [])
         )
 

ara_cli/chat.py

@@ -1,8 +1,8 @@
 import os
 import argparse
 import cmd2
+from . import error_handler
 from ara_cli.prompt_handler import send_prompt
-from ara_cli.file_loaders.markdown_reader import MarkdownReader
 
 from ara_cli.file_loaders.document_file_loader import DocumentFileLoader
 from ara_cli.file_loaders.binary_file_loader import BinaryFileLoader
@@ -17,12 +17,6 @@ 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')
 
-
-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.')
@@ -32,7 +26,6 @@ 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):
     CATEGORY_CHAT_CONTROL = "Chat control commands"
     CATEGORY_LLM_CONTROL = "Language model controls"
@@ -64,7 +57,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             ".jpg": "image/jpeg",
             ".jpeg": "image/jpeg",
         }
-    
+
     DOCUMENT_TYPE_EXTENSIONS = [".docx", ".doc", ".odt", ".pdf"]
 
     def __init__(
@@ -507,6 +500,13 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         self.last_result = True
         return True
 
+    def onecmd(self, *args, **kwargs):
+        try:
+            return super().onecmd(*args, **kwargs)
+        except Exception as e:
+            error_handler.report_error(e)
+        return False
+
     def onecmd_plus_hooks(self, line, orig_rl_history_length):
         # store the full line for use with default()
         self.full_input = line
@@ -832,8 +832,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,
-            error_output=self.perror
+            output=self.poutput
         )
         command.execute()
 
@@ -919,7 +918,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
         artefact = template_artefact_of_type(''.join(template_name))
         if not artefact:
-            return
+            raise ValueError(f"No template for '{template_name}' found.")
         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:
@@ -927,7 +926,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         print(f"Loaded {template_name} artefact template")
 
     def complete_LOAD_TEMPLATE(self, text, line, begidx, endidx):
-        return self._complete_classifiers(self, text, line, begidx, endidx)
+        return self._complete_classifiers(text, line, begidx, endidx)
 
     def _complete_classifiers(self, text, line, begidx, endidx):
         from ara_cli.classifier import Classifier

ara_cli/commands/extract_command.py

@@ -3,20 +3,13 @@ from ara_cli.prompt_extractor import extract_responses
 import os
 
 class ExtractCommand(Command):
-    def __init__(self, file_name, force=False, write=False, output=None, error_output=None):
+    def __init__(self, file_name, force=False, write=False, output=None):
         self.file_name = file_name
         self.force = force
         self.write = write
         self.output = output    # Callable for standard output (optional)
-        self.error_output = error_output  # Callable for errors (optional)
 
     def execute(self, *args, **kwargs):
-        try:
-            extract_responses(self.file_name, True, force=self.force, write=self.write)
-            if self.output:
-                self.output("End of extraction")
-        except Exception as e:
-            if self.error_output:
-                self.error_output(f"Extraction failed: {e}")
-            else:
-                raise
+        extract_responses(self.file_name, True, force=self.force, write=self.write)
+        if self.output:
+            self.output("End of extraction")

ara_cli/error_handler.py

@@ -0,0 +1,134 @@
+import sys
+import traceback
+from typing import Optional
+from enum import Enum
+from functools import wraps
+
+
+RED = '\033[91m'
+RESET = '\033[0m'
+
+
+class ErrorLevel(Enum):
+    INFO = "INFO"
+    WARNING = "WARNING"
+    ERROR = "ERROR"
+    CRITICAL = "CRITICAL"
+
+
+class AraError(Exception):
+    """Base exception class for ARA CLI errors"""
+
+    def __init__(
+        self, message: str, error_code: int = 1, level: ErrorLevel = ErrorLevel.ERROR
+    ):
+        self.message = message
+        self.error_code = error_code
+        self.level = level
+        super().__init__(self.message)
+
+
+class AraValidationError(AraError):
+    """Raised when validation fails"""
+
+    def __init__(self, message: str):
+        super().__init__(message, error_code=2, level=ErrorLevel.ERROR)
+
+
+class AraConfigurationError(AraError):
+    """Raised when configuration is invalid"""
+
+    def __init__(self, message: str):
+        super().__init__(message, error_code=4, level=ErrorLevel.ERROR)
+
+
+class ErrorHandler:
+    """Centralized error handler for ARA CLI"""
+
+    def __init__(self, debug_mode: bool = False):
+        self.debug_mode = debug_mode
+
+    def handle_error(self, error: Exception, context: Optional[str] = None) -> None:
+        """Handle any error with standardized output"""
+        if isinstance(error, AraError):
+            self._handle_ara_error(error, context)
+        else:
+            self._handle_generic_error(error, context)
+
+    def _handle_ara_error(self, error: AraError, context: Optional[str] = None) -> None:
+        """Handle ARA-specific errors"""
+        self._report_ara_error(error, context)
+
+        sys.exit(error.error_code)
+
+    def _handle_generic_error(
+        self, error: Exception, context: Optional[str] = None
+    ) -> None:
+        """Handle generic Python errors"""
+        self._report_generic_error(error, context)
+
+        sys.exit(1)
+
+
+    def report_error(self, error: Exception, context: Optional[str] = None) -> None:
+        """Report error with standardized formatting but don't exit"""
+        if isinstance(error, AraError):
+            self._report_ara_error(error, context)
+        else:
+            self._report_generic_error(error, context)
+
+
+    def _report_ara_error(self, error: AraError, context: Optional[str] = None) -> None:
+        """Report ARA-specific errors without exiting"""
+        error_prefix = f"[{error.level.value}]"
+
+        if context:
+            print(f"{RED}{error_prefix} {context}: {error.message}{RESET}", file=sys.stderr)
+        else:
+            print(f"{RED}{error_prefix} {error.message}{RESET}", file=sys.stderr)
+
+        if self.debug_mode:
+            traceback.print_exc()
+
+
+    def _report_generic_error(self, error: Exception, context: Optional[str] = None) -> None:
+        """Report generic Python errors without exiting"""
+        error_type = type(error).__name__
+
+        if context:
+            print(f"{RED}[ERROR] {context}: {error_type}: {str(error)}{RESET}", file=sys.stderr)
+        else:
+            print(f"{RED}[ERROR] {error_type}: {str(error)}{RESET}", file=sys.stderr)
+
+        if self.debug_mode:
+            traceback.print_exc()
+
+
+    def validate_and_exit(
+        self, condition: bool, message: str, error_code: int = 1
+    ) -> None:
+        """Validate condition and exit with error if false"""
+        if not condition:
+            raise AraValidationError(message)
+
+
+def handle_errors(_func=None, context: Optional[str] = None, error_handler: Optional[ErrorHandler] = None):
+    """Decorator to handle errors in action functions"""
+
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            nonlocal error_handler
+            if error_handler is None:
+                error_handler = ErrorHandler()
+
+            try:
+                return func(*args, **kwargs)
+            except Exception as e:
+                error_handler.handle_error(e, context or func.__name__)
+
+        return wrapper
+
+    if callable(_func):
+        return decorator(_func)
+    return decorator

ara_cli/file_classifier.py

@@ -1,3 +1,4 @@
+from . import error_handler
 from ara_cli.classifier import Classifier
 from ara_cli.artefact_models.artefact_model import Artefact
 from ara_cli.artefact_fuzzy_search import find_closest_name_matches
@@ -33,8 +34,8 @@ class FileClassifier:
                     if byte > 127:
                         return True
         except Exception as e:
-            # Handle unexpected errors while reading the file in binary mode
-            print(f"Error while checking if file is binary: {e}")
+            error_handler.report_error(e, "checking if file is binary")
+            # print(f"Error while checking if file is binary: {e}")
         return False
 
     def read_file_with_fallback(self, file_path):

ara_cli/prompt_extractor.py

@@ -17,7 +17,7 @@ def extract_code_blocks_md(markdown_text):
 
 
 def extract_responses(document_path, relative_to_ara_root=False, force=False, write=False):
-    print(f"Debug: Starting extraction from {document_path}")
+    print(f"Starting extraction from '{document_path}'")
     block_extraction_counter = 0
 
     with open(document_path, 'r', encoding='utf-8', errors='replace') as file:

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.9.96"   # 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.9.96.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.95
+Version: 0.1.9.96
 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: litellm

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

@@ -1,49 +1,50 @@
-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/__init__.py,sha256=Kozfk9i2DfbDi8GTkXjbqIoIxWXmbDhxb_edRv73oUU,495
+ara_cli/__main__.py,sha256=1GaJ2LJPOfAKZVPaKIkJ0x1L2p8yGMAgckzoRn_6JvA,3474
+ara_cli/ara_command_action.py,sha256=iPDiIaN60TEpVCnOT6Esestu0fNJFzbyhNENQytbkEo,22822
 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/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=SCllSt821naybvF6K4afJEtZvFZq7UO52O4fOm0Ieic,39859
 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_extractor.py,sha256=WloRgfcEdIVq37BpdWAd2X3EMu0bcNN_Wuws1T2YiUg,8418
 ara_cli/prompt_handler.py,sha256=8a9fcMwE_C6ntbw7UeroNJeU5LxrxEppiUtvYNUTB2U,23292
 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_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=-IPlzWGTvEOC2B1-l8hULGEXt1iWj3_npgirLamZr10,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 +53,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,20 +141,20 @@ 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=UK1566DikkeXKzslw8h1it3UXqJEGLpxy02_Pch0Tfs,59433
 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
@@ -161,8 +162,8 @@ tests/test_prompt_handler.py,sha256=kW8FU09ho4I5qC-f4G9r4ZgI-NlqdOkTmAazG7FaTrw,
 tests/test_tag_extractor.py,sha256=nSiAYlTKZ7TLAOtcJpwK5zTWHhFYU0tI5xKnivLc1dU,2712
 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.9.96.dist-info/METADATA,sha256=rwUSTke0fhW8QCSyel4M0oASJkfy6AASVOkQMzdPBDo,6789
+ara_cli-0.1.9.96.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.9.96.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.9.96.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
+ara_cli-0.1.9.96.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