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

ara_cli/__init__.py

@@ -1,3 +1,3 @@
 from .version import __version__
 
-whitelisted_commands = ["RERUN", "SEND", "EXTRACT", "LOAD_IMAGE", "CHOOSE_MODEL", "CURRENT_MODEL", "LIST_MODELS"]
+whitelisted_commands = ["RERUN", "SEND", "EXTRACT", "LOAD_IMAGE", "CHOOSE_MODEL", "CHOOSE_EXTRACTION_MODEL", "CURRENT_MODEL", "CURRENT_EXTRACTION_MODEL", "LIST_MODELS"]

ara_cli/ara_command_action.py

@@ -165,6 +165,7 @@ def prompt_action(args):
     classifier = args.classifier
     param = args.parameter
     init = args.steps
+    write = getattr(args, 'write', False)
 
     def handle_init():
         from ara_cli.prompt_handler import initialize_prompt_templates
@@ -192,7 +193,7 @@ def prompt_action(args):
     def handle_extract():
         from ara_cli.prompt_extractor import extract_and_save_prompt_results
         from ara_cli.update_config_prompt import update_artefact_config_prompt_files
-        extract_and_save_prompt_results(classifier, param)
+        extract_and_save_prompt_results(classifier, param, write=write)
         print(f"automatic update after extract")
         update_artefact_config_prompt_files(classifier, param, automatic_update=True)
 
@@ -294,53 +295,30 @@ def fetch_templates_action(args):
 
 
 def read_action(args):
-    from ara_cli.artefact_reader import ArtefactReader
-    from ara_cli.file_classifier import FileClassifier
+    from ara_cli.commands.read_command import ReadCommand
+    from ara_cli.list_filter import ListFilter
 
     classifier = args.classifier
     artefact_name = args.parameter
     read_mode = args.read_mode
 
-    file_classifier = FileClassifier(os)
-    classified_artefacts = ArtefactReader.read_artefacts()
-    artefacts = classified_artefacts.get(classifier, [])
-    all_artefact_names = [a.title for a in artefacts]
-
-    if artefact_name not in all_artefact_names:
-        suggest_close_name_matches(
-                artefact_name,
-                all_artefact_names
-            )
-        return
-
-    target_artefact = next(filter(
-        lambda x: x.title == artefact_name, artefacts
-    ))
+    list_filter = ListFilter(
+        include_content=args.include_content,
+        exclude_content=args.exclude_content,
+        include_extension=args.include_extension,
+        exclude_extension=args.exclude_extension,
+        include_tags=args.include_tags,
+        exclude_tags=args.exclude_tags
+    )
 
-    artefacts_by_classifier = {classifier: []}
+    command = ReadCommand(
+        classifier=classifier,
+        artefact_name=artefact_name,
+        read_mode=read_mode,
+        list_filter=list_filter
+    )
 
-    match read_mode:
-        case "branch":
-            ArtefactReader.step_through_value_chain(
-                artefact_name=artefact_name,
-                classifier=classifier,
-                artefacts_by_classifier=artefacts_by_classifier,
-                classified_artefacts=classified_artefacts
-            )
-            file_classifier.print_classified_files(artefacts_by_classifier, print_content=True)
-        case "children":
-            artefacts = ArtefactReader.find_children(
-                artefact_name=artefact_name,
-                classifier=classifier,
-                classified_artefacts=classified_artefacts
-            )
-            file_classifier.print_classified_files(
-                files_by_classifier=artefacts,
-                print_content=True
-            )
-        case _:
-            artefacts_by_classifier[classifier].append(target_artefact)
-            file_classifier.print_classified_files(artefacts_by_classifier, print_content=True)
+    command.execute()
 
 
 def reconnect_action(args):
@@ -615,11 +593,13 @@ def extract_action(args):
     from ara_cli.commands.extract_command import ExtractCommand
 
     filename = args.filename
-    skip_queries = args.skip_queries
+    force = args.force
+    write = getattr(args, 'write', False)
     print(filename)
     command = ExtractCommand(
         file_name=filename,
-        skip_queries=skip_queries,
+        force=force,
+        write=write,
         output=lambda msg: print(msg, file=sys.stdout),
         error_output=lambda msg: print(msg, file=sys.stderr)
     )

ara_cli/ara_command_parser.py

@@ -254,6 +254,13 @@ def prompt_parser(subparsers):
         ).completer = ArtefactCompleter()
         if step == "chat":
             add_chat_arguments(step_parser)
+        if step == "extract":
+            step_parser.add_argument(
+                "-w",
+                "--write",
+                action="store_true",
+                help="Overwrite existing files without using LLM for merging."
+            )
 
 
 def chat_parser(subparsers):
@@ -287,6 +294,8 @@ def read_parser(subparsers):
         "parameter", help="Filename of artefact"
     ).completer = ArtefactCompleter()
 
+    add_filter_flags(read_parser)
+
     branch_group = read_parser.add_mutually_exclusive_group()
     branch_group.add_argument(
         "-b",
@@ -429,10 +438,16 @@ def extract_parser(subparsers):
         help="Input file to extract from."
     )
     extract_parser.add_argument(
-        "--skip-queries", "-s",
+        "--force", "-f",
         action="store_true",
         help="Answer queries with yes when extracting."
     )
+    extract_parser.add_argument(
+        "-w",
+        "--write",
+        action="store_true",
+        help="Overwrite existing files without using LLM for merging."
+    )
 
 
 class CustomHelpFormatter(argparse.HelpFormatter):

ara_cli/artefact_lister.py

@@ -1,9 +1,13 @@
 from ara_cli.file_classifier import FileClassifier
 from ara_cli.artefact_reader import ArtefactReader
 from ara_cli.file_lister import list_files_in_directory
-from ara_cli.artefact_models.artefact_model import Artefact
 from ara_cli.list_filter import ListFilter, filter_list
 from ara_cli.artefact_fuzzy_search import suggest_close_name_matches
+from ara_cli.artefact_models.artefact_data_retrieval import (
+    artefact_content_retrieval,
+    artefact_path_retrieval,
+    artefact_tags_retrieval,
+)
 import os
 
 
@@ -11,43 +15,18 @@ class ArtefactLister:
     def __init__(self, file_system=None):
         self.file_system = file_system or os
 
-    @staticmethod
-    def artefact_content_retrieval(artefact: Artefact):
-        content = artefact.serialize()
-        return content
-
-    @staticmethod
-    def artefact_path_retrieval(artefact: Artefact):
-        return artefact.file_path
-
-    @staticmethod
-    def artefact_tags_retrieval(artefact: Artefact):
-        final_tags = []
-
-        if not artefact:
-            return []
-
-        final_tags.extend([f"user_{user}" for user in artefact.users])
-        final_tags.append(artefact.status)
-        final_tags.extend(artefact.tags)
-
-        return final_tags
-
     def filter_artefacts(self, classified_files: list, list_filter: ListFilter):
         filtered_list = filter_list(
             list_to_filter=classified_files,
             list_filter=list_filter,
-            content_retrieval_strategy=ArtefactLister.artefact_content_retrieval,
-            file_path_retrieval=ArtefactLister.artefact_path_retrieval,
-            tag_retrieval=ArtefactLister.artefact_tags_retrieval
+            content_retrieval_strategy=artefact_content_retrieval,
+            file_path_retrieval=artefact_path_retrieval,
+            tag_retrieval=artefact_tags_retrieval,
         )
         return filtered_list
 
     def list_files(
-        self,
-        tags=None,
-        navigate_to_target=False,
-        list_filter: ListFilter | None = None
+        self, tags=None, navigate_to_target=False, list_filter: ListFilter | None = None
     ):
         artefact_list = ArtefactReader.read_artefacts(tags=tags)
         artefact_list = self.filter_artefacts(artefact_list, list_filter)
@@ -60,20 +39,18 @@ class ArtefactLister:
         file_classifier.print_classified_files(filtered_artefact_list)
 
     def list_branch(
-        self,
-        classifier,
-        artefact_name,
-        list_filter: ListFilter | None = None
+        self, classifier, artefact_name, list_filter: ListFilter | None = None
     ):
         file_classifier = FileClassifier(os)
         classified_artefacts = file_classifier.classify_files()
         artefact_info = classified_artefacts.get(classifier, [])
-        matching_artefact_info = [p for p in artefact_info if p["title"] == artefact_name]
+        matching_artefact_info = [
+            p for p in artefact_info if p["title"] == artefact_name
+        ]
 
         if not matching_artefact_info:
             suggest_close_name_matches(
-                artefact_name,
-                [info["title"] for info in artefact_info]
+                artefact_name, [info["title"] for info in artefact_info]
             )
 
         artefacts_by_classifier = {classifier: []}
@@ -82,29 +59,28 @@ class ArtefactLister:
             classifier=classifier,
             artefacts_by_classifier=artefacts_by_classifier,
         )
-        artefacts_by_classifier = self.filter_artefacts(artefacts_by_classifier, list_filter)
+        artefacts_by_classifier = self.filter_artefacts(
+            artefacts_by_classifier, list_filter
+        )
         file_classifier.print_classified_files(artefacts_by_classifier)
 
     def list_children(
-        self,
-        classifier,
-        artefact_name,
-        list_filter: ListFilter | None = None
+        self, classifier, artefact_name, list_filter: ListFilter | None = None
     ):
         file_classifier = FileClassifier(os)
         classified_artefacts = file_classifier.classify_files()
         artefact_info = classified_artefacts.get(classifier, [])
-        matching_artefact_info = [p for p in artefact_info if p["title"] == artefact_name]
+        matching_artefact_info = [
+            p for p in artefact_info if p["title"] == artefact_name
+        ]
 
         if not matching_artefact_info:
             suggest_close_name_matches(
-                artefact_name,
-                [info["title"] for info in artefact_info]
+                artefact_name, [info["title"] for info in artefact_info]
             )
 
         child_artefacts = ArtefactReader.find_children(
-            artefact_name=artefact_name,
-            classifier=classifier
+            artefact_name=artefact_name, classifier=classifier
         )
 
         child_artefacts = self.filter_artefacts(child_artefacts, list_filter)
@@ -112,25 +88,23 @@ class ArtefactLister:
         file_classifier.print_classified_files(child_artefacts)
 
     def list_data(
-        self,
-        classifier,
-        artefact_name,
-        list_filter: ListFilter | None = None
+        self, classifier, artefact_name, list_filter: ListFilter | None = None
     ):
         file_classifier = FileClassifier(os)
         classified_artefact_info = file_classifier.classify_files()
         artefact_info_dict = classified_artefact_info.get(classifier, [])
 
-        matching_info = [info for info in artefact_info_dict if info["title"] == artefact_name]
+        matching_info = [
+            info for info in artefact_info_dict if info["title"] == artefact_name
+        ]
 
         if not matching_info:
             suggest_close_name_matches(
-                artefact_name,
-                [info["title"] for info in artefact_info_dict]
+                artefact_name, [info["title"] for info in artefact_info_dict]
             )
             return
 
         artefact_info = matching_info[0]
-        data_dir = os.path.splitext(artefact_info["file_path"])[0] + '.data'
+        data_dir = os.path.splitext(artefact_info["file_path"])[0] + ".data"
         if os.path.exists(data_dir):
             list_files_in_directory(data_dir, list_filter)

ara_cli/artefact_models/artefact_data_retrieval.py

@@ -0,0 +1,23 @@
+from ara_cli.artefact_models.artefact_model import Artefact
+
+
+def artefact_content_retrieval(artefact: Artefact):
+    content = artefact.serialize()
+    return content
+
+
+def artefact_path_retrieval(artefact: Artefact):
+    return artefact.file_path
+
+
+def artefact_tags_retrieval(artefact: Artefact):
+    final_tags = []
+
+    if not artefact:
+        return []
+
+    final_tags.extend([f"user_{user}" for user in artefact.users])
+    final_tags.append(artefact.status)
+    final_tags.extend(artefact.tags)
+
+    return final_tags

ara_cli/artefact_renamer.py

@@ -1,9 +1,10 @@
-import os
 from functools import lru_cache
 from ara_cli.classifier import Classifier
 from ara_cli.artefact_link_updater import ArtefactLinkUpdater
 from ara_cli.template_manager import DirectoryNavigator
+import os
 import re
+import warnings
 
 
 class ArtefactRenamer:
@@ -22,6 +23,8 @@ class ArtefactRenamer:
         return re.compile(pattern)
 
     def rename(self, old_name, new_name, classifier):
+        import shutil
+
         original_directory = self.navigate_to_target()
 
         if not new_name:
@@ -47,7 +50,8 @@ class ArtefactRenamer:
         if self.file_system.path.exists(new_file_path):
             raise FileExistsError(f"The new file name {new_file_path} already exists.")
         if self.file_system.path.exists(new_dir_path):
-            raise FileExistsError(f"The new directory name {new_dir_path} already exists.")
+            warnings.warn(f"The new directory name {new_dir_path} already exists. It will be replaced by the artefact's data directory or removed entirely.", UserWarning)
+            shutil.rmtree(new_dir_path)
 
         # Perform the renaming of the file and directory
         self.file_system.rename(old_file_path, new_file_path)

ara_cli/chat.py

@@ -9,13 +9,15 @@ from ara_cli.file_loaders.text_file_loader import TextFileLoader
 
 
 extract_parser = argparse.ArgumentParser()
-extract_parser.add_argument('-s', '--skip-queries', action='store_true', help='Force extraction')
+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')
 
 
+
 class Chat(cmd2.Cmd):
     CATEGORY_CHAT_CONTROL = "Chat control commands"
     CATEGORY_LLM_CONTROL = "Language model controls"
@@ -813,7 +815,8 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
         command = ExtractCommand(
             file_name=self.chat_name,
-            skip_queries=args.skip_queries,
+            force=args.force,
+            write=args.write,
             output=self.poutput,
             error_output=self.perror
         )

ara_cli/commands/extract_command.py

@@ -3,15 +3,16 @@ from ara_cli.prompt_extractor import extract_responses
 import os
 
 class ExtractCommand(Command):
-    def __init__(self, file_name, skip_queries=False, output=None, error_output=None):
+    def __init__(self, file_name, force=False, write=False, output=None, error_output=None):
         self.file_name = file_name
-        self.skip_queries = skip_queries
+        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, skip_queries=self.skip_queries)
+            extract_responses(self.file_name, True, force=self.force, write=self.write)
             if self.output:
                 self.output("End of extraction")
         except Exception as e:

ara_cli/commands/read_command.py

@@ -0,0 +1,104 @@
+from ara_cli.commands.command import Command
+from ara_cli.artefact_reader import ArtefactReader
+from ara_cli.file_classifier import FileClassifier
+from ara_cli.list_filter import ListFilter, filter_list
+from ara_cli.artefact_models.artefact_data_retrieval import (
+    artefact_content_retrieval, 
+    artefact_path_retrieval, 
+    artefact_tags_retrieval
+)
+from ara_cli.artefact_fuzzy_search import suggest_close_name_matches
+import os
+
+
+class ReadCommand(Command):
+    def __init__(
+        self,
+        classifier: str,
+        artefact_name: str,
+        read_mode: str = "default",
+        list_filter: ListFilter = None,
+        output=None
+    ):
+        self.classifier = classifier
+        self.artefact_name = artefact_name
+        self.read_mode = read_mode
+        self.list_filter = list_filter or ListFilter()
+        self.output = output or print
+
+    def execute(self) -> bool:
+        """Execute the read command and return success status."""
+        file_classifier = FileClassifier(os)
+        classified_artefacts = ArtefactReader.read_artefacts()
+        artefacts = classified_artefacts.get(self.classifier, [])
+        all_artefact_names = [a.title for a in artefacts]
+
+        if self.artefact_name not in all_artefact_names:
+            suggest_close_name_matches(
+                self.artefact_name,
+                all_artefact_names
+            )
+            return False
+
+        target_artefact = next(filter(
+            lambda x: x.title == self.artefact_name, artefacts
+        ))
+
+        artefacts_by_classifier = {self.classifier: []}
+
+        try:
+            match self.read_mode:
+                case "branch":
+                    self._handle_branch_mode(
+                        classified_artefacts, artefacts_by_classifier
+                    )
+                case "children":
+                    artefacts_by_classifier = self._handle_children_mode(
+                        classified_artefacts
+                    )
+                case _:
+                    self._handle_default_mode(
+                        target_artefact, artefacts_by_classifier
+                    )
+
+            # Apply filtering and print results
+            filtered_artefacts = self._apply_filtering(artefacts_by_classifier)
+            file_classifier.print_classified_files(
+                filtered_artefacts, print_content=True
+            )
+            return True
+
+        except Exception as e:
+            self.output(f"Error reading artefact: {e}")
+            return False
+
+    def _handle_branch_mode(self, classified_artefacts, artefacts_by_classifier):
+        """Handle branch read mode."""
+        ArtefactReader.step_through_value_chain(
+            artefact_name=self.artefact_name,
+            classifier=self.classifier,
+            artefacts_by_classifier=artefacts_by_classifier,
+            classified_artefacts=classified_artefacts
+        )
+
+    def _handle_children_mode(self, classified_artefacts):
+        """Handle children read mode."""
+        return ArtefactReader.find_children(
+            artefact_name=self.artefact_name,
+            classifier=self.classifier,
+            classified_artefacts=classified_artefacts
+        )
+
+    def _handle_default_mode(self, target_artefact, artefacts_by_classifier):
+        """Handle default read mode."""
+        artefacts_by_classifier[self.classifier].append(target_artefact)
+
+    def _apply_filtering(self, artefacts_by_classifier):
+        """Apply list filtering to artefacts."""
+        return filter_list(
+            list_to_filter=artefacts_by_classifier,
+            list_filter=self.list_filter,
+            content_retrieval_strategy=artefact_content_retrieval,
+            file_path_retrieval=artefact_path_retrieval,
+            tag_retrieval=artefact_tags_retrieval
+        )

ara_cli/prompt_extractor.py

@@ -16,7 +16,7 @@ def extract_code_blocks_md(markdown_text):
     return code_blocks
 
 
-def extract_responses(document_path, relative_to_ara_root=False, skip_queries=False):
+def extract_responses(document_path, relative_to_ara_root=False, force=False, write=False):
     print(f"Debug: Starting extraction from {document_path}")
     block_extraction_counter = 0
 
@@ -50,7 +50,7 @@ def extract_responses(document_path, relative_to_ara_root=False, skip_queries=Fa
             block_lines = block_lines[1:]  # Remove first line again after removing filename line
             block = '\n'.join(block_lines)
 
-            handle_existing_file(file_path, block, skip_queries)
+            handle_existing_file(file_path, block, force, write)
             block_extraction_counter += 1
 
             # Update the markdown content
@@ -79,7 +79,7 @@ def extract_responses(document_path, relative_to_ara_root=False, skip_queries=Fa
             artefact_path = artefact.file_path
             directory = os.path.dirname(artefact_path)
             os.makedirs(directory, exist_ok=True)
-            handle_existing_file(artefact_path, serialized_artefact, skip_queries)
+            handle_existing_file(artefact_path, serialized_artefact, force, write)
 
             os.chdir(original_directory)
 
@@ -182,13 +182,28 @@ def create_prompt_for_file_modification(content_str, filename):
     return prompt_text
 
 
-def handle_existing_file(filename, block_content, skip_query=False):
+def handle_existing_file(filename, block_content, skip_query=False, write=False):
     if not os.path.isfile(filename):
         print(f"File {filename} does not exist, attempting to create")
         create_file_if_not_exist(filename, block_content, skip_query)
+    elif write:
+        print(f"File {filename} exists. Overwriting without LLM merge as requested.")
+        try:
+            directory = os.path.dirname(filename)
+            if directory:
+                os.makedirs(directory, exist_ok=True)
+            with open(filename, 'w', encoding='utf-8', errors='replace') as file:
+                file.write(block_content)
+            print(f"File {filename} overwritten successfully.")
+        except OSError as e:
+            print(f"Error: {e}")
+            print(f"Failed to overwrite file {filename} due to an OS error")
     else:
         print(f"File {filename} exists, creating modification prompt")
         prompt_text = create_prompt_for_file_modification(block_content, filename)
+        if prompt_text is None:
+            return
+
         messages = [{"role": "user", "content": prompt_text}]
         response = ""
 
@@ -199,12 +214,12 @@ def handle_existing_file(filename, block_content, skip_query=False):
         modify_and_save_file(response, filename)
 
 
-def extract_and_save_prompt_results(classifier, param):
+def extract_and_save_prompt_results(classifier, param, write=False):
     sub_directory = Classifier.get_sub_directory(classifier)
     prompt_log_file = f"ara/{sub_directory}/{param}.data/{classifier}.prompt_log.md"
     print(f"Extract marked sections from: {prompt_log_file}")
 
-    extract_responses(prompt_log_file)
+    extract_responses(prompt_log_file, write=write)
 
 
 def update_markdown(original_content, block_content, filename):

ara_cli/tag_extractor.py

@@ -1,6 +1,10 @@
 import os
 from ara_cli.list_filter import ListFilter, filter_list
-from ara_cli.artefact_lister import ArtefactLister
+from ara_cli.artefact_models.artefact_data_retrieval import (
+    artefact_content_retrieval,
+    artefact_path_retrieval,
+    artefact_tags_retrieval,
+)
 
 
 class TagExtractor:
@@ -10,7 +14,9 @@ class TagExtractor:
     def filter_column(self, tags_set, filtered_artefacts):
         status_tags = {"to-do", "in-progress", "review", "done", "closed"}
 
-        artefacts_to_process = self._get_artefacts_without_status_tags(filtered_artefacts, status_tags)
+        artefacts_to_process = self._get_artefacts_without_status_tags(
+            filtered_artefacts, status_tags
+        )
         self._add_non_status_tags_to_set(tags_set, artefacts_to_process, status_tags)
 
     def _get_artefacts_without_status_tags(self, filtered_artefacts, status_tags):
@@ -28,7 +34,9 @@ class TagExtractor:
 
     def _add_non_status_tags_to_set(self, tags_set, artefacts, status_tags):
         for artefact in artefacts:
-            tags = [tag for tag in (artefact.tags + [artefact.status]) if tag is not None]
+            tags = [
+                tag for tag in (artefact.tags + [artefact.status]) if tag is not None
+            ]
             for tag in tags:
                 if self._is_skipped_tag(tag, status_tags):
                     continue
@@ -36,23 +44,25 @@ class TagExtractor:
 
     def _is_skipped_tag(self, tag, status_tags):
         return (
-            tag in status_tags
-            or tag.startswith("priority_")
-            or tag.startswith("user_")
+            tag in status_tags or tag.startswith("priority_") or tag.startswith("user_")
         )
 
     def add_to_tags_set(self, tags_set, filtered_artefacts):
         for artefact_list in filtered_artefacts.values():
             for artefact in artefact_list:
                 user_tags = [f"user_{tag}" for tag in artefact.users]
-                tags = [tag for tag in (artefact.tags + [artefact.status] + user_tags) if tag is not None]
+                tags = [
+                    tag
+                    for tag in (artefact.tags + [artefact.status] + user_tags)
+                    if tag is not None
+                ]
                 tags_set.update(tags)
 
     def extract_tags(
         self,
         navigate_to_target=False,
         filtered_extra_column=False,
-        list_filter: ListFilter | None = None
+        list_filter: ListFilter | None = None,
     ):
         from ara_cli.template_manager import DirectoryNavigator
         from ara_cli.artefact_reader import ArtefactReader
@@ -66,9 +76,9 @@ class TagExtractor:
         filtered_artefacts = filter_list(
             list_to_filter=artefacts,
             list_filter=list_filter,
-            content_retrieval_strategy=ArtefactLister.artefact_content_retrieval,
-            file_path_retrieval=ArtefactLister.artefact_path_retrieval,
-            tag_retrieval=ArtefactLister.artefact_tags_retrieval
+            content_retrieval_strategy=artefact_content_retrieval,
+            file_path_retrieval=artefact_path_retrieval,
+            tag_retrieval=artefact_tags_retrieval,
         )
 
         unique_tags = set()

ara_cli/version.py

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

{ara_cli-0.1.9.93.dist-info → ara_cli-0.1.9.94.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.93
+Version: 0.1.9.94
 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
@@ -108,22 +108,22 @@ ara autofix
 
 ## Command Overview
 
-| Action             | Description                                                                 |
-|--------------------|-----------------------------------------------------------------------------|
-| create             | Create a classified artefact with data directory                            |
-| delete             | Delete an artefact and its data directory                                   |
-| rename             | Rename an artefact and its data directory                                   |
-| list, list-tags    | List artefacts, show tags, filter by content, extension, hierarchy etc.     |
-| prompt, chat       | Use AI-powered chat and prompt templates for artefact management            |
-| template           | Print artefact templates in the terminal                                    |
-| fetch-templates    | Download and manage reusable prompt templates                               |
-| read               | Output artefact contents and their full contribution chain                  |
-| reconnect          | Connect artefacts to parent artefacts                                       |
-| read-status, set-status | Query and assign status to artefacts                                   |
-| read-user, set-user     | Query and assign responsible users                                     |
-| classifier-directory    | Show directory of artefact classifiers                                 |
-| scan               | Scan the ARA tree for incompatible or inconsistent artefacts                |
-| autofix            | Automatically correct artefact issues with LLM assistance                   |
+| Action                  | Description                                                             |
+| ----------------------- | ----------------------------------------------------------------------- |
+| create                  | Create a classified artefact with data directory                        |
+| delete                  | Delete an artefact and its data directory                               |
+| rename                  | Rename an artefact and its data directory                               |
+| list, list-tags         | List artefacts, show tags, filter by content, extension, hierarchy etc. |
+| prompt, chat            | Use AI-powered chat and prompt templates for artefact management        |
+| template                | Print artefact templates in the terminal                                |
+| fetch-templates         | Download and manage reusable prompt templates                           |
+| read                    | Output artefact contents and their full contribution chain              |
+| reconnect               | Connect artefacts to parent artefacts                                   |
+| read-status, set-status | Query and assign status to artefacts                                    |
+| read-user, set-user     | Query and assign responsible users                                      |
+| classifier-directory    | Show directory of artefact classifiers                                  |
+| scan                    | Scan the ARA tree for incompatible or inconsistent artefacts            |
+| autofix                 | Automatically correct artefact issues with LLM assistance               |
 
 See `ara -h` for the complete list of commands and usage examples.
 

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

@@ -1,18 +1,18 @@
-ara_cli/__init__.py,sha256=0zl7IegxTid26EBGLav_fXZ4CCIV3H5TfAoFQiOHjvg,148
+ara_cli/__init__.py,sha256=oieeo07y5FLq0tmPzWZdp65j6tN8NOucSjSzrJw8qrQ,203
 ara_cli/__main__.py,sha256=J5DCDLRZ6UcpYwM1-NkjaLo4PTetcSj2dB4HrrftkUw,2064
-ara_cli/ara_command_action.py,sha256=_LHE2V5hbJxN7ccYiptuPktRfbTnXmQEt_D_FxDBlBY,22456
-ara_cli/ara_command_parser.py,sha256=I-e9W-QwTIMKMzlHycSlCWCyBFQfiFYvGre1XsDbrFI,20573
+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=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/artefact_link_updater.py,sha256=nKdxTpDKqWTOAMD8viKmUaklSFGWzJZ8S8E8xW_ADuM,3775
-ara_cli/artefact_lister.py,sha256=jhk4n4eqp7hDIq07q43QzS7-36BM3OfZ4EABxCeOGcw,4764
+ara_cli/artefact_lister.py,sha256=M-ggazAgZ-OLeW9NB48r_sd6zPx0p4hEpeS63qHwI1A,4176
 ara_cli/artefact_reader.py,sha256=Pho0_Eqm7kD9CNbVMhKb6mkNM0I3iJiCJXbXmVp1DJU,7827
-ara_cli/artefact_renamer.py,sha256=Hnz_3zD9xxnBa1FHyUE6mIktLk_9ttP2rFRvQIkmz-o,4061
+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=mbpv5XQOcJSAUBJxCrfmyl7W5a0GhQU9cblxiTJNpP8,37841
+ara_cli/chat.py,sha256=t17TCmx9xvKj5wrnUOJBqjWoSjEVOFrVd8RivChVX50,37980
 ara_cli/classifier.py,sha256=zWskj7rBYdqYBGjksBm46iTgVU5IIf2PZsJr4qeiwVU,1878
 ara_cli/codefusionretriever.py,sha256=fCHgXdIBRzkVAnapX-KI2NQ44XbrrF4tEQmn5J6clUI,1980
 ara_cli/codehierachieretriever.py,sha256=Xd3EgEWWhkSf1TmTWtf8X5_YvyE_4B66nRrqarwSiTU,1182
@@ -24,15 +24,16 @@ ara_cli/filename_validator.py,sha256=Aw9PL8d5-Ymhp3EY6lDrUBk3cudaNqo1Uw5RzPpI1jA
 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=Sk1aQkvn8W_YNcGhfChsbT19wUAWEJmOHTr3mveyQww,7754
+ara_cli/prompt_extractor.py,sha256=-_17aVYXYH6kPX5FOSb9T8lbEkKPXE6nlHWq1pvO_Og,8423
 ara_cli/prompt_handler.py,sha256=6yfiMFNHGHANREAsjT8dv9jKxBKeazPkF7xQQI4l6vQ,22312
 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=TGdaQOVnjy25R0zDsAifB67C5oom0Fwo24s0_fr5A_I,3151
+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=UYGRHXHl4vgX5k6OLDjyffvrV4jDkHj_fVeKiGqQ8XU,146
+ara_cli/version.py,sha256=MWb524qaDHLrSJsHhOq7o0m78CPLFil9qeyel6kPW-A,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
@@ -50,9 +51,10 @@ 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=TfKuOnKQzJ8JPpJyKDm7qhm5mvbZnHspCem8g6YgACo,835
+ara_cli/commands/extract_command.py,sha256=qpi2_ac3DyxS7FiOz4GsTtRR4xtpegckUmfXzDOwymM,858
 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
 ara_cli/file_loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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
@@ -138,11 +140,11 @@ tests/test_ara_config.py,sha256=H5GwDbab0GMSa6IbHdruzmbsHy5Ia0xX0uteJdfZ9Rg,1427
 tests/test_artefact_autofix.py,sha256=pApZ-N0dW8Ujt-cNLbgvd4bhiIIK8oXb-saLf6QlA-8,25022
 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=VCEOCgDgnAOeUUgIoGAbWgz60hf9UT-tdHg18LGfB34,22656
+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=-2vs3ORlym0yv05BLSCNX-6tNYXqoZiBFar8gswPuw8,57072
+tests/test_chat.py,sha256=cCNIuYiSGoNtjgjyFiTvkMHJgCmMNXQhpawNc23-fmM,57037
 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
@@ -153,8 +155,8 @@ tests/test_prompt_handler.py,sha256=3-lYBvyHLQgD29MODkXB3YylUWXmRCYdAwrQrtlW8WU,
 tests/test_tag_extractor.py,sha256=nSiAYlTKZ7TLAOtcJpwK5zTWHhFYU0tI5xKnivLc1dU,2712
 tests/test_template_manager.py,sha256=q-LMHRG4rHkD6ON6YW4cpZxUx9hul6Or8wVVRC2kb-8,4099
 tests/test_update_config_prompt.py,sha256=xsqj1WTn4BsG5Q2t-sNPfu7EoMURFcS-hfb5VSXUnJc,6765
-ara_cli-0.1.9.93.dist-info/METADATA,sha256=BEbyd6dizmW-wO3XCdsyU9t2FrgKvQdIPMhAcxm8__M,6739
-ara_cli-0.1.9.93.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.93.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.93.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
-ara_cli-0.1.9.93.dist-info/RECORD,,
+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,,

tests/test_artefact_lister.py

@@ -2,6 +2,11 @@ import pytest
 from unittest.mock import MagicMock, patch
 from ara_cli.artefact_lister import ArtefactLister
 from ara_cli.list_filter import ListFilter
+from ara_cli.artefact_models.artefact_data_retrieval import (
+    artefact_content_retrieval,
+    artefact_path_retrieval,
+    artefact_tags_retrieval,
+)
 
 
 @pytest.fixture
@@ -9,66 +14,6 @@ def artefact_lister():
     return ArtefactLister()
 
 
-@pytest.mark.parametrize(
-    "users, status, tags, expected_tags",
-    [
-        # Normal case with all fields populated
-        (
-            ["john", "alice"],
-            "in-progress",
-            ["important", "urgent"],
-            ["user_john", "user_alice", "in-progress", "important", "urgent"]
-        ),
-        # Case with empty users
-        (
-            [],
-            "to-do",
-            ["feature", "backend"],
-            ["to-do", "feature", "backend"]
-        ),
-        # Case with empty tags
-        (
-            ["bob"],
-            "done",
-            [],
-            ["user_bob", "done"]
-        ),
-        # Case with all empty fields
-        (
-            [],
-            "",
-            [],
-            [""]
-        ),
-        # Case with None values for tags (should handle gracefully)
-        (
-            ["admin"],
-            "closed",
-            None,
-            ["user_admin", "closed"]
-        ),
-    ]
-)
-def test_artefact_tags_retrieval(users, status, tags, expected_tags):
-    # Create a mock artefact with the specified attributes
-    artefact_mock = MagicMock()
-    artefact_mock.users = users
-    artefact_mock.status = status
-    artefact_mock.tags = tags if tags is not None else []
-
-    # Call the method under test
-    result = ArtefactLister.artefact_tags_retrieval(artefact_mock)
-
-    # Verify the result
-    assert result == expected_tags
-
-
-def test_artefact_tags_retrieval_with_none():
-    # Test with None artefact
-    result = ArtefactLister.artefact_tags_retrieval(None)
-    assert result == []
-
-
 @pytest.mark.parametrize(
     "classified_files, list_filter, filter_result",
     [
@@ -76,39 +21,36 @@ def test_artefact_tags_retrieval_with_none():
         (
             {"type1": [MagicMock(), MagicMock()]},
             None,
-            {"type1": [MagicMock(), MagicMock()]}
+            {"type1": [MagicMock(), MagicMock()]},
         ),
         # Case 2: Filter with include tags
         (
             {"type1": [MagicMock(), MagicMock()]},
             ListFilter(include_tags=["tag1"]),
-            {"type1": [MagicMock()]}
+            {"type1": [MagicMock()]},
         ),
         # Case 3: Filter with exclude tags
         (
             {"type1": [MagicMock(), MagicMock()], "type2": [MagicMock()]},
             ListFilter(exclude_tags=["tag2"]),
-            {"type1": [MagicMock()], "type2": []}
+            {"type1": [MagicMock()], "type2": []},
         ),
         # Case 4: Empty result after filtering
         (
             {"type1": [MagicMock(), MagicMock()]},
             ListFilter(include_tags=["nonexistent"]),
-            {"type1": []}
+            {"type1": []},
         ),
         # Case 5: Multiple artefact types
         (
             {"type1": [MagicMock()], "type2": [MagicMock(), MagicMock()]},
             ListFilter(exclude_extension=[".txt"]),
-            {"type1": [], "type2": [MagicMock()]}
+            {"type1": [], "type2": [MagicMock()]},
         ),
     ],
 )
 def test_filter_artefacts(
-    artefact_lister,
-    classified_files,
-    list_filter,
-    filter_result
+    artefact_lister, classified_files, list_filter, filter_result
 ):
     # Mock the filter_list function
     with patch("ara_cli.artefact_lister.filter_list") as mock_filter_list:
@@ -121,9 +63,9 @@ def test_filter_artefacts(
         mock_filter_list.assert_called_once_with(
             list_to_filter=classified_files,
             list_filter=list_filter,
-            content_retrieval_strategy=ArtefactLister.artefact_content_retrieval,
-            file_path_retrieval=ArtefactLister.artefact_path_retrieval,
-            tag_retrieval=ArtefactLister.artefact_tags_retrieval
+            content_retrieval_strategy=artefact_content_retrieval,
+            file_path_retrieval=artefact_path_retrieval,
+            tag_retrieval=artefact_tags_retrieval,
         )
 
         # Verify the structure matches (don't compare the actual MagicMock objects)
@@ -132,30 +74,6 @@ def test_filter_artefacts(
             assert len(result[key]) == len(filter_result[key])
 
 
-@pytest.mark.parametrize("artefact_content", ["content1", "content2", "content3"])
-def test_artefact_content_retrieval(artefact_content):
-    artefact_mock = MagicMock()
-    artefact_mock.serialize.return_value = artefact_content  # Mock serialize()
-
-    content = ArtefactLister.artefact_content_retrieval(artefact_mock)
-    assert content == artefact_content
-
-
-@pytest.mark.parametrize(
-    "file_path",
-    [
-        ("./ara/userstories/test.userstory"),
-        ("./ara/epics/test.epic"),
-    ],
-)
-def test_artefact_path_retrieval(file_path):
-    artefact_mock = MagicMock()
-    artefact_mock.file_path = file_path
-
-    path = ArtefactLister.artefact_path_retrieval(artefact_mock)
-    assert path == file_path
-
-
 @pytest.mark.parametrize(
     "tags, navigate_to_target, list_filter, mock_artefacts, filtered_artefacts, expected_filtered",
     [
@@ -476,20 +394,21 @@ def test_list_data_artefact_found_data_exists(artefact_lister):
     classified_artefacts = {
         "epic": [
             {"title": "Epic1", "file_path": "path/to/Epic1.epic"},
-            {"title": "Epic2", "file_path": "path/to/Epic2.epic"}
+            {"title": "Epic2", "file_path": "path/to/Epic2.epic"},
         ]
     }
-    
-    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, \
-         patch("ara_cli.artefact_lister.suggest_close_name_matches") as mock_suggest, \
-         patch("ara_cli.artefact_lister.os") as mock_os, \
-         patch("ara_cli.artefact_lister.list_files_in_directory") as mock_list_files:
+
+    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, patch(
+        "ara_cli.artefact_lister.suggest_close_name_matches"
+    ) as mock_suggest, patch("ara_cli.artefact_lister.os") as mock_os, patch(
+        "ara_cli.artefact_lister.list_files_in_directory"
+    ) as mock_list_files:
 
         # Configure mocks
         mock_classifier_instance = MagicMock()
         mock_file_classifier.return_value = mock_classifier_instance
         mock_classifier_instance.classify_files.return_value = classified_artefacts
-        
+
         mock_os.path.splitext.return_value = ("path/to/Epic1", ".epic")
         mock_os.path.exists.return_value = True
 
@@ -510,20 +429,21 @@ def test_list_data_artefact_found_data_not_exists(artefact_lister):
     classified_artefacts = {
         "epic": [
             {"title": "Epic1", "file_path": "path/to/Epic1.epic"},
-            {"title": "Epic2", "file_path": "path/to/Epic2.epic"}
+            {"title": "Epic2", "file_path": "path/to/Epic2.epic"},
         ]
     }
-    
-    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, \
-         patch("ara_cli.artefact_lister.suggest_close_name_matches") as mock_suggest, \
-         patch("ara_cli.artefact_lister.os") as mock_os, \
-         patch("ara_cli.artefact_lister.list_files_in_directory") as mock_list_files:
+
+    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, patch(
+        "ara_cli.artefact_lister.suggest_close_name_matches"
+    ) as mock_suggest, patch("ara_cli.artefact_lister.os") as mock_os, patch(
+        "ara_cli.artefact_lister.list_files_in_directory"
+    ) as mock_list_files:
 
         # Configure mocks
         mock_classifier_instance = MagicMock()
         mock_file_classifier.return_value = mock_classifier_instance
         mock_classifier_instance.classify_files.return_value = classified_artefacts
-        
+
         mock_os.path.splitext.return_value = ("path/to/Epic1", ".epic")
         mock_os.path.exists.return_value = False
 
@@ -544,14 +464,15 @@ def test_list_data_artefact_not_found(artefact_lister):
     classified_artefacts = {
         "epic": [
             {"title": "Epic1", "file_path": "path/to/Epic1.epic"},
-            {"title": "Epic2", "file_path": "path/to/Epic2.epic"}
+            {"title": "Epic2", "file_path": "path/to/Epic2.epic"},
         ]
     }
-    
-    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, \
-         patch("ara_cli.artefact_lister.suggest_close_name_matches") as mock_suggest, \
-         patch("ara_cli.artefact_lister.os") as mock_os, \
-         patch("ara_cli.artefact_lister.list_files_in_directory") as mock_list_files:
+
+    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, patch(
+        "ara_cli.artefact_lister.suggest_close_name_matches"
+    ) as mock_suggest, patch("ara_cli.artefact_lister.os") as mock_os, patch(
+        "ara_cli.artefact_lister.list_files_in_directory"
+    ) as mock_list_files:
 
         # Configure mocks
         mock_classifier_instance = MagicMock()
@@ -562,10 +483,7 @@ def test_list_data_artefact_not_found(artefact_lister):
         artefact_lister.list_data(classifier, artefact_name, list_filter)
 
         # Verify interactions
-        mock_suggest.assert_called_once_with(
-            artefact_name,
-            ["Epic1", "Epic2"]
-        )
+        mock_suggest.assert_called_once_with(artefact_name, ["Epic1", "Epic2"])
         mock_os.path.splitext.assert_not_called()
         mock_os.path.exists.assert_not_called()
         mock_list_files.assert_not_called()
@@ -578,20 +496,21 @@ def test_list_data_with_filter(artefact_lister):
     classified_artefacts = {
         "userstory": [
             {"title": "Story1", "file_path": "path/to/Story1.userstory"},
-            {"title": "Story2", "file_path": "path/to/Story2.userstory"}
+            {"title": "Story2", "file_path": "path/to/Story2.userstory"},
         ]
     }
-    
-    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, \
-         patch("ara_cli.artefact_lister.suggest_close_name_matches") as mock_suggest, \
-         patch("ara_cli.artefact_lister.os") as mock_os, \
-         patch("ara_cli.artefact_lister.list_files_in_directory") as mock_list_files:
+
+    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, patch(
+        "ara_cli.artefact_lister.suggest_close_name_matches"
+    ) as mock_suggest, patch("ara_cli.artefact_lister.os") as mock_os, patch(
+        "ara_cli.artefact_lister.list_files_in_directory"
+    ) as mock_list_files:
 
         # Configure mocks
         mock_classifier_instance = MagicMock()
         mock_file_classifier.return_value = mock_classifier_instance
         mock_classifier_instance.classify_files.return_value = classified_artefacts
-        
+
         mock_os.path.splitext.return_value = ("path/to/Story1", ".userstory")
         mock_os.path.exists.return_value = True
 
@@ -610,11 +529,12 @@ def test_list_data_empty_artefact_list(artefact_lister):
     artefact_name = "Epic1"
     list_filter = None
     classified_artefacts = {"epic": []}
-    
-    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, \
-         patch("ara_cli.artefact_lister.suggest_close_name_matches") as mock_suggest, \
-         patch("ara_cli.artefact_lister.os") as mock_os, \
-         patch("ara_cli.artefact_lister.list_files_in_directory") as mock_list_files:
+
+    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, patch(
+        "ara_cli.artefact_lister.suggest_close_name_matches"
+    ) as mock_suggest, patch("ara_cli.artefact_lister.os") as mock_os, patch(
+        "ara_cli.artefact_lister.list_files_in_directory"
+    ) as mock_list_files:
 
         # Configure mocks
         mock_classifier_instance = MagicMock()

tests/test_chat.py

@@ -635,14 +635,14 @@ def test_load_file(temp_chat_file, file_name, file_type, mime_type):
             patch.object(chat, 'load_text_file', return_value=True) as mock_load_text, \
             patch.object(chat, 'load_document_file', return_value=True) as mock_load_document:
 
-        chat.load_file(file_name=file_name, prefix="p-", suffix="-s", block_delimiter="b", extract_images=False)
+        chat.load_file(file_name=file_name, prefix="p-", suffix="-f", block_delimiter="b", extract_images=False)
 
         if file_type == "binary":
             mock_load_binary.assert_called_once_with(
                 file_path=file_name,
                 mime_type=mime_type,
                 prefix="p-",
-                suffix="-s"
+                suffix="-f"
             )
             mock_load_text.assert_not_called()
             mock_load_document.assert_not_called()
@@ -652,7 +652,7 @@ def test_load_file(temp_chat_file, file_name, file_type, mime_type):
             mock_load_document.assert_called_once_with(
                 file_path=file_name,
                 prefix="p-",
-                suffix="-s",
+                suffix="-f",
                 block_delimiter="b",
                 extract_images=False
             )
@@ -661,7 +661,7 @@ def test_load_file(temp_chat_file, file_name, file_type, mime_type):
             mock_load_text.assert_called_once_with(
                 file_path=file_name,
                 prefix="p-",
-                suffix="-s",
+                suffix="-f",
                 block_delimiter="b",
                 extract_images=False
             )
@@ -714,7 +714,7 @@ def test_load_helper(monkeypatch, capsys, temp_chat_file, directory, pattern, fi
     def mock_input(prompt):
         return user_input
 
-    def mock_load_file(self, file_path, prefix="", suffix=""):
+    def mock_load_file(self, file_path):
         return True
 
     monkeypatch.setattr(glob, 'glob', mock_glob)
@@ -750,7 +750,7 @@ def test_load_helper_with_exclude(monkeypatch, capsys, temp_chat_file, directory
     def mock_input(prompt):
         return user_input
 
-    def mock_load_file(self, file_path, prefix="", suffix=""):
+    def mock_load_file(self, file_path):
         return True
 
     monkeypatch.setattr(glob, 'glob', mock_glob)
@@ -907,7 +907,7 @@ def test_load_image(capsys, temp_chat_file, file_name, is_image, expected_mime):
         chat = Chat(temp_chat_file.name, reset=False)
 
     with patch.object(chat, 'load_binary_file', return_value=True) as mock_load_binary:
-        chat.load_image(file_name=file_name, prefix="p-", suffix="-s")
+        chat.load_image(file_name=file_name, prefix="p-", suffix="-f")
 
         if is_image:
             # FIX: The called method's parameter is `file_path`, not `file_name`.
@@ -915,7 +915,7 @@ def test_load_image(capsys, temp_chat_file, file_name, is_image, expected_mime):
                 file_path=file_name,
                 mime_type=expected_mime,
                 prefix="p-",
-                suffix="-s"
+                suffix="-f"
             )
         else:
             mock_load_binary.assert_not_called()
@@ -1232,13 +1232,14 @@ def test_do_EXTRACT(MockExtractCommand, temp_chat_file):
     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
         chat = Chat(temp_chat_file.name, reset=False)
 
-    # FIX: The `onecmd_plus_hooks` method requires the `orig_rl_history_length` argument.
+    # The `onecmd_plus_hooks` method requires the `orig_rl_history_length` argument.
     # We can pass a dummy value like 0 for the test.
     chat.onecmd_plus_hooks("EXTRACT", orig_rl_history_length=0)
 
     MockExtractCommand.assert_called_once_with(
         file_name=chat.chat_name,
-        skip_queries=False,
+        force=False,
+        write=False,
         output=chat.poutput,
         error_output=chat.perror
     )