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

ara_cli/prompt_handler.py

@@ -256,6 +256,8 @@ def initialize_prompt_templates(classifier, parameter):
     # Mark the relevant artefact in the givens list
     generate_config_prompt_givens_file(prompt_data_path, "config.prompt_givens.md", artefact_to_mark=f"{parameter}.{classifier}")
 
+    generate_config_prompt_global_givens_file(prompt_data_path, "config.prompt_global_givens.md")
+
 
 def write_template_files_to_config(template_type, config_file, base_template_path):
     template_path = os.path.join(base_template_path, template_type)
@@ -383,10 +385,16 @@ def extract_and_load_markdown_files(md_prompt_file_path):
 
 
 def load_givens(file_path):
-    content = "### GIVENS\n\n"
+    content = ""
     image_data_list = []
     markdown_items = extract_and_load_markdown_files(file_path)
 
+    # Only proceed and add the header if there are marked items to load.
+    if not markdown_items:
+        return "", []
+
+    content = "### GIVENS\n\n"
+
     for item in markdown_items:
         if item.lower().endswith(('.png', '.jpeg', '.jpg')):
             with open(item, "rb") as image_file:
@@ -449,7 +457,7 @@ def collect_file_content_by_extension(prompt_data_path, extensions):
         files = find_files_with_endings(prompt_data_path, [ext])
         for file_name in files:
             file_path = join(prompt_data_path, file_name)
-            if ext == ".prompt_givens.md":
+            if ext in [".prompt_givens.md", ".prompt_global_givens.md"]:
                 givens, image_data = load_givens(file_path)
                 combined_content += givens
                 image_data_list.extend(image_data)
@@ -494,7 +502,7 @@ def create_and_send_custom_prompt(classifier, parameter):
     prompt_data_path = f"ara/{sub_directory}/{parameter}.data/prompt.data"
     prompt_file_path_markdown = join(prompt_data_path, f"{classifier}.prompt.md")
 
-    extensions = [".blueprint.md", ".rules.md", ".prompt_givens.md", ".intention.md", ".commands.md"]
+    extensions = [".blueprint.md", ".rules.md", ".prompt_givens.md", ".prompt_global_givens.md", ".intention.md", ".commands.md"]
     combined_content_markdown, image_data_list = collect_file_content_by_extension(prompt_data_path, extensions)
 
     with open(prompt_file_path_markdown, 'w', encoding='utf-8') as file:
@@ -561,4 +569,16 @@ def generate_config_prompt_givens_file(prompt_data_path, config_prompt_givens_na
 
         # Write the updated listing back to the file
         with open(config_prompt_givens_path, 'w', encoding='utf-8') as file:
-            file.write("".join(updated_listing))
+            file.write("".join(updated_listing))
+
+def generate_config_prompt_global_givens_file(prompt_data_path, config_prompt_givens_name, artefact_to_mark=None):
+    from ara_cli.global_file_lister import generate_global_markdown_listing
+    config_prompt_givens_path = os.path.join(prompt_data_path, config_prompt_givens_name)
+    config = ConfigManager.get_config()
+
+    if not hasattr(config, 'global_dirs') or not config.global_dirs:
+        return
+
+    dir_list = [path for d in config.global_dirs for path in d.values()]
+    print(f"used {dir_list} for global prompt givens file listing with absolute paths")
+    generate_global_markdown_listing(dir_list, config.ara_prompt_given_list_includes, config_prompt_givens_path)

ara_cli/template_manager.py

@@ -129,6 +129,7 @@ class SpecificationBreakdownAspects:
         if aspect not in self.VALID_ASPECTS:
             raise ValueError(f"{aspect} does not exist. Please choose one of the {self.VALID_ASPECTS} list.")
 
+
     def create(self, artefact_name='artefact_name', classifier='classifier', aspect='specification_breakdown_aspect'):
         original_directory = os.getcwd()
         navigator = DirectoryNavigator()
@@ -139,8 +140,17 @@ class SpecificationBreakdownAspects:
         data_dir = self.file_manager.get_data_directory_path(artefact_name, classifier)
         self.file_manager.create_directory(artefact_file_path, data_dir)
         self.file_manager.copy_aspect_templates_to_directory(aspect, print_relative_to=original_directory)
+        
         if (aspect == "step"):
-            steps = self.file_manager.generate_behave_steps(artefact_name)
-            self.file_manager.save_behave_steps_to_file(artefact_name, steps)
-
-        os.chdir(original_directory)
+            # Instead of generating from behave command, read from the template file
+            template_file_path = f"{aspect}.md"
+            try:
+                with open(template_file_path, 'r', encoding='utf-8') as file:
+                    steps_content = file.read()
+                self.file_manager.save_behave_steps_to_file(artefact_name, steps_content)
+            except FileNotFoundError:
+                # Fallback to the original behavior if template doesn't exist
+                steps = self.file_manager.generate_behave_steps(artefact_name)
+                self.file_manager.save_behave_steps_to_file(artefact_name, steps)
+
+        os.chdir(original_directory)

ara_cli/update_config_prompt.py

@@ -103,6 +103,7 @@ def handle_existing_file(file_path, tmp_file_path, generate_file_func, automatic
 
 
 def update_artefact_config_prompt_files(classifier, param, automatic_update=False):
+    from ara_cli.prompt_handler import generate_config_prompt_global_givens_file
     sub_directory = Classifier.get_sub_directory(classifier)
     artefact_data_path = os.path.join("ara", sub_directory, f"{param}.data")
     prompt_data_path = os.path.join(artefact_data_path, "prompt.data")
@@ -111,13 +112,18 @@ def update_artefact_config_prompt_files(classifier, param, automatic_update=Fals
 
     givens_file_name = "config.prompt_givens.md"
     givens_tmp_file_name = "config.prompt_givens_tmp.md"
+    global_givens_file_name = "config.prompt_global_givens.md"
+    global_givens_tmp_file_name = "config.prompt_global_givens_tmp.md"
     template_file_name = "config.prompt_templates.md"
     template_tmp_file_name = "config.prompt_templates_tmp.md"
 
     prompt_config_givens = os.path.join(prompt_data_path, givens_file_name)
     prompt_config_givens_tmp = os.path.join(prompt_data_path, givens_tmp_file_name)
+    prompt_config_global_givens = os.path.join(prompt_data_path, global_givens_file_name)
+    prompt_config_global_givens_tmp = os.path.join(prompt_data_path, global_givens_tmp_file_name)
     prompt_config_templates = os.path.join(prompt_data_path, template_file_name)
     prompt_config_templates_tmp = os.path.join(prompt_data_path, template_tmp_file_name)
 
     handle_existing_file(prompt_config_givens, prompt_config_givens_tmp, generate_config_prompt_givens_file, automatic_update)
-    handle_existing_file(prompt_config_templates, prompt_config_templates_tmp, generate_config_prompt_template_file, automatic_update)
+    handle_existing_file(prompt_config_global_givens, prompt_config_global_givens_tmp, generate_config_prompt_global_givens_file, automatic_update)
+    handle_existing_file(prompt_config_templates, prompt_config_templates_tmp, generate_config_prompt_template_file, automatic_update)

ara_cli/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "0.1.9.94"   # 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.94.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.94
+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
@@ -13,6 +13,7 @@ Requires-Dist: json-repair
 Requires-Dist: argparse
 Requires-Dist: argcomplete
 Requires-Dist: cmd2>=2.5
+Requires-Dist: charset-normalizer
 Requires-Dist: pydantic
 Requires-Dist: pydantic_ai
 Requires-Dist: python-docx

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

@@ -1,48 +1,50 @@
-ara_cli/__init__.py,sha256=oieeo07y5FLq0tmPzWZdp65j6tN8NOucSjSzrJw8qrQ,203
-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=5uBo_flNgZSk7B9lmyfvzWyxfIQzb13LbieCpJfdZJI,8765
-ara_cli/artefact_autofix.py,sha256=WVTiIR-jo4YKmmz4eS3qTFvl45W1YKwAk1XSuz9QX10,20015
-ara_cli/artefact_creator.py,sha256=0Ory6cB-Ahkw-BDNb8QHnTbp_OHGABdkb9bhwcEdcIc,6063
-ara_cli/artefact_deleter.py,sha256=Co4wwCH3yW8H9NrOq7_2p5571EeHr0TsfE-H8KqoOfY,1900
-ara_cli/artefact_fuzzy_search.py,sha256=iBlDqjZf-_D3VUjFf7ZwkiQbpQDcwRndIU7aG_sRTgE,2668
+ara_cli/ara_config.py,sha256=VJeage_v-446OtSXIfpazUbetpH7kGNv8Un1lKYx5ZE,9321
+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=t17TCmx9xvKj5wrnUOJBqjWoSjEVOFrVd8RivChVX50,37980
+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_handler.py,sha256=6yfiMFNHGHANREAsjT8dv9jKxBKeazPkF7xQQI4l6vQ,22312
+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=YwrN6AYPpl6ZrW8BVQpVXx8yTRf-oNpJUIKeg4NAggs,6606
-ara_cli/update_config_prompt.py,sha256=Oy9vNTw6UhDohyTEfSKkqE5ifEMPlmWNYkKHgUrK_pY,4607
-ara_cli/version.py,sha256=MWb524qaDHLrSJsHhOq7o0m78CPLFil9qeyel6kPW-A,146
+ara_cli/template_manager.py,sha256=l2c785YHB7m0e2TjE0CX-nwXrS4v3EiT9qrS5KuatAc,7105
+ara_cli/update_config_prompt.py,sha256=moqj2Kha7S7fEGzTReU0v2y8UjXC8QfnoiieOQr35C4,5157
+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
@@ -51,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
@@ -59,8 +61,12 @@ ara_cli/file_loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 ara_cli/file_loaders/binary_file_loader.py,sha256=1HHH1Nk4lEM83CTnf4z9wYz6rMLgpxydFoRcSgkBHmQ,940
 ara_cli/file_loaders/document_file_loader.py,sha256=VxGFChYyM9K-e6eOCK3yk5jQuEXgz01Mh_NoA6CA_RM,1017
 ara_cli/file_loaders/document_reader.py,sha256=SD9_5-XJ6homKUes6o8GWcG--X63UslfAosPbrJZQvo,7721
+ara_cli/file_loaders/document_readers.py,sha256=aG7xrUJwLxWpuFTYlvxzDqoS00Idpvwzt865L0OuQcA,8124
 ara_cli/file_loaders/file_loader.py,sha256=bc1BrMG4pEtwsZLm3Ct53YsMPgnbSaEvZEd8isRDYRY,1711
-ara_cli/file_loaders/text_file_loader.py,sha256=x_ZqnOUb2glpdxziceWCBX8oEBk7JZhAluLRRvBjuQs,6626
+ara_cli/file_loaders/file_loaders.py,sha256=9QqArTRDmcUUar58JEr-qnpiAtH9ySP-MV9bvooQNpI,4290
+ara_cli/file_loaders/image_processor.py,sha256=laPThh-i0-obYyS_linQTMcTUwuxMxrSjedGRYb8cIA,3462
+ara_cli/file_loaders/markdown_reader.py,sha256=R-hvvc9Sj9pWwENqJ0j6wrW0eN1tUqEKWcK2YUFsvsU,2542
+ara_cli/file_loaders/text_file_loader.py,sha256=62U59RkWgAML0U0P-sUeFsK51mJM8Fu54gGlnmMwYpY,6804
 ara_cli/templates/agile.artefacts,sha256=nTA8dp98HWKAD-0qhmNpVYIfkVGoJshZqMJGnphiOsE,7932
 ara_cli/templates/template.businessgoal.prompt_log.md,sha256=xF6bkgj_GqAAqHxJWJiQNt11mEuSGemIqoZ2wOo6dI0,214
 ara_cli/templates/template.capability.prompt_log.md,sha256=eO8EzrHgb2vYJ-DP1jGzAfDlMo8nY75hZDfhh0s40uQ,208
@@ -135,28 +141,29 @@ 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_config.py,sha256=H5GwDbab0GMSa6IbHdruzmbsHy5Ia0xX0uteJdfZ9Rg,14277
-tests/test_artefact_autofix.py,sha256=pApZ-N0dW8Ujt-cNLbgvd4bhiIIK8oXb-saLf6QlA-8,25022
+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=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=cCNIuYiSGoNtjgjyFiTvkMHJgCmMNXQhpawNc23-fmM,57037
+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
-tests/test_prompt_handler.py,sha256=3-lYBvyHLQgD29MODkXB3YylUWXmRCYdAwrQrtlW8WU,30871
+tests/test_prompt_handler.py,sha256=kW8FU09ho4I5qC-f4G9r4ZgI-NlqdOkTmAazG7FaTrw,32299
 tests/test_tag_extractor.py,sha256=nSiAYlTKZ7TLAOtcJpwK5zTWHhFYU0tI5xKnivLc1dU,2712
-tests/test_template_manager.py,sha256=q-LMHRG4rHkD6ON6YW4cpZxUx9hul6Or8wVVRC2kb-8,4099
+tests/test_template_manager.py,sha256=qliEeYgAEakn8JIqIHa8u0Ht6DY4L3T6DcHBXkjzR4I,4167
 tests/test_update_config_prompt.py,sha256=xsqj1WTn4BsG5Q2t-sNPfu7EoMURFcS-hfb5VSXUnJc,6765
-ara_cli-0.1.9.94.dist-info/METADATA,sha256=CPz0aDXI8_4hJtbN9tm56-aNUNEum3G01dD9DMIwGdg,6755
-ara_cli-0.1.9.94.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.94.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.94.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
-ara_cli-0.1.9.94.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

tests/test_ara_config.py

@@ -115,6 +115,34 @@ class TestARAconfig:
         assert config.glossary_dir == "./glossary"
         assert "Warning: Value for 'glossary_dir' is missing or empty. Using default." in mock_stdout.getvalue()
 
+    @patch('sys.stdout', new_callable=StringIO)
+    def test_validator_with_empty_llm_config(self, mock_stdout):
+        """Tests validator when llm_config is empty, setting default and extraction to None."""
+        config = ARAconfig(llm_config={})
+        assert config.llm_config == {}
+        assert config.default_llm is None
+        assert config.extraction_llm is None
+        assert "Warning: 'llm_config' is empty" in mock_stdout.getvalue()
+
+    @patch('sys.stdout', new_callable=StringIO)
+    def test_validator_with_invalid_default_llm(self, mock_stdout):
+        """Tests that an invalid default_llm is reverted to the first available model."""
+        config = ARAconfig(default_llm="non_existent_model")
+        first_llm = next(iter(config.llm_config))
+        assert config.default_llm == first_llm
+        output = mock_stdout.getvalue()
+        assert "Warning: The configured 'default_llm' ('non_existent_model') does not exist" in output
+        assert f"-> Reverting to the first available model: '{first_llm}'" in output
+
+    @patch('sys.stdout', new_callable=StringIO)
+    def test_validator_with_invalid_extraction_llm(self, mock_stdout):
+        """Tests that an invalid extraction_llm is reverted to the default_llm."""
+        config = ARAconfig(default_llm="gpt-4o", extraction_llm="non_existent_model")
+        assert config.extraction_llm == "gpt-4o"
+        output = mock_stdout.getvalue()
+        assert "Warning: The configured 'extraction_llm' ('non_existent_model') does not exist" in output
+        assert "-> Reverting to the 'default_llm' value: 'gpt-4o'" in output
+
 # --- Test Helper Functions ---
 
 class TestEnsureDirectoryExists: