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

ara_cli/file_loaders/image_processor.py

@@ -0,0 +1,89 @@
+import os
+import base64
+import tempfile
+import requests
+from typing import Optional, Tuple
+import re
+from ara_cli.prompt_handler import describe_image
+
+
+class ImageProcessor:
+    """Handles image processing operations"""
+    
+    @staticmethod
+    def process_base64_image(image_ref: str, base64_pattern: re.Pattern) -> Optional[Tuple[str, str]]:
+        """Process base64 encoded image and return description"""
+        base64_match = base64_pattern.match(image_ref)
+        if not base64_match:
+            return None
+            
+        image_format = base64_match.group(1)
+        base64_data = base64_match.group(2)
+        image_data = base64.b64decode(base64_data)
+        
+        # Create a temporary file to send to LLM
+        with tempfile.NamedTemporaryFile(suffix=f'.{image_format}', delete=False) as tmp_file:
+            tmp_file.write(image_data)
+            tmp_file_path = tmp_file.name
+        
+        try:
+            description = describe_image(tmp_file_path)
+            return f"Image: (base64 embedded {image_format} image)\n[{description}]", None
+        finally:
+            os.unlink(tmp_file_path)
+    
+    @staticmethod
+    def process_url_image(image_ref: str) -> Tuple[str, Optional[str]]:
+        """Process image from URL and return description"""
+        if not image_ref.startswith(('http://', 'https://')):
+            return "", None
+            
+        try:
+            response = requests.get(image_ref, timeout=10)
+            response.raise_for_status()
+            
+            # Determine file extension from content-type
+            content_type = response.headers.get('content-type', '')
+            ext = ImageProcessor._get_extension_from_content_type(content_type, image_ref)
+            
+            # Create temporary file
+            with tempfile.NamedTemporaryFile(suffix=ext, delete=False) as tmp_file:
+                tmp_file.write(response.content)
+                tmp_file_path = tmp_file.name
+            
+            try:
+                description = describe_image(tmp_file_path)
+                return f"Image: {image_ref}\n[{description}]", None
+            finally:
+                os.unlink(tmp_file_path)
+                
+        except Exception as e:
+            error_msg = f"Could not download image: {str(e)}"
+            return f"Image: {image_ref}\n[{error_msg}]", error_msg
+    
+    @staticmethod
+    def process_local_image(image_ref: str, base_dir: str) -> Tuple[str, Optional[str]]:
+        """Process local image file and return description"""
+        if os.path.isabs(image_ref):
+            local_image_path = image_ref
+        else:
+            local_image_path = os.path.join(base_dir, image_ref)
+        
+        if os.path.exists(local_image_path):
+            description = describe_image(local_image_path)
+            return f"Image: {image_ref}\n[{description}]", None
+        else:
+            error_msg = f"Image file not found"
+            return f"Image: {image_ref}\n[{error_msg}]", f"Local image not found: {local_image_path}"
+    
+    @staticmethod
+    def _get_extension_from_content_type(content_type: str, url: str) -> str:
+        """Determine file extension from content type or URL"""
+        if 'image/jpeg' in content_type:
+            return '.jpg'
+        elif 'image/png' in content_type:
+            return '.png'
+        elif 'image/gif' in content_type:
+            return '.gif'
+        else:
+            return os.path.splitext(url)[1] or '.png'

ara_cli/file_loaders/markdown_reader.py

@@ -0,0 +1,75 @@
+import os
+import re
+from typing import Optional
+from charset_normalizer import from_path
+from ara_cli.file_loaders.image_processor import ImageProcessor
+
+
+class MarkdownReader:
+    """Handles markdown file reading with optional image extraction"""
+
+    def __init__(self, file_path: str):
+        self.file_path = file_path
+        self.base_dir = os.path.dirname(file_path)
+        self.image_processor = ImageProcessor()
+
+    def read(self, extract_images: bool = False) -> str:
+        """Read markdown file and optionally extract/describe images"""
+        # Detect and use the most appropriate encoding
+        result = from_path(self.file_path).best()
+        if not result:
+            print(f"Failed to detect encoding for {self.file_path}")
+            return ""
+        content = str(result)
+
+        if not extract_images:
+            return content
+
+        return self._process_images(content)
+
+    def _process_images(self, content: str) -> str:
+        """Process all images in markdown content"""
+        # Pattern to match markdown images: ![alt text](url or path)
+        image_pattern = re.compile(r"!\[([^\]]*)\]\(([^\)]+)\)")
+        base64_pattern = re.compile(r"data:image/([^;]+);base64,([^)]+)")
+
+        # Process each image reference
+        for match in image_pattern.finditer(content):
+            image_ref = match.group(2)
+            replacement = self._process_single_image(image_ref, base64_pattern)
+
+            if replacement:
+                content = content.replace(match.group(0), replacement, 1)
+
+        return content
+
+    def _process_single_image(
+        self, image_ref: str, base64_pattern: re.Pattern
+    ) -> Optional[str]:
+        """Process a single image reference"""
+        try:
+            # Try base64 first
+            result = self.image_processor.process_base64_image(
+                image_ref, base64_pattern
+            )
+            if result:
+                return result[0]
+
+            # Try URL
+            result, error = self.image_processor.process_url_image(image_ref)
+            if result:
+                if error:
+                    print(f"Warning: {error}")
+                return result
+
+            # Try local file
+            result, error = self.image_processor.process_local_image(
+                image_ref, self.base_dir
+            )
+            if error:
+                print(f"Warning: {error}")
+            return result
+
+        except Exception as e:
+            print(f"Warning: Could not process image {image_ref}: {e}")
+            return None

ara_cli/file_loaders/text_file_loader.py

@@ -4,21 +4,15 @@ import base64
 import tempfile
 from typing import Optional, Tuple
 import requests
+from charset_normalizer import from_path
 from ara_cli.prompt_handler import describe_image
 from ara_cli.file_loaders.file_loader import FileLoader
 
 
 class TextFileLoader(FileLoader):
     """Loads text files"""
-
-    def load(
-        self,
-        file_path: str,
-        prefix: str = "",
-        suffix: str = "",
-        block_delimiter: str = "",
-        extract_images: bool = False
-    ) -> bool:
+    def load(self, file_path: str, prefix: str = "", suffix: str = "",
+             block_delimiter: str = "", extract_images: bool = False, **kwargs) -> bool:
         """Load text file with optional markdown image extraction"""
 
         is_md_file = file_path.lower().endswith('.md')
@@ -27,8 +21,12 @@ class TextFileLoader(FileLoader):
             reader = MarkdownReader(file_path)
             file_content = reader.read(extract_images=True)
         else:
-            with open(file_path, 'r', encoding='utf-8', errors='replace') as file:
-                file_content = file.read()
+            # Use charset-normalizer to detect encoding
+            encoded_content = from_path(file_path).best()
+            if not encoded_content:
+                print(f"Failed to detect encoding for {file_path}")
+                return False
+            file_content = str(encoded_content)
 
         if block_delimiter:
             file_content = f"{block_delimiter}\n{file_content}\n{block_delimiter}"

ara_cli/global_file_lister.py

@@ -0,0 +1,61 @@
+import os
+import fnmatch
+from typing import List, Dict, Any
+
+# Ağaç yapımız için bir tip tanımı yapalım
+DirTree = Dict[str, Any]
+
+def _build_tree(root_path: str, patterns: List[str]) -> DirTree:
+    """Belirtilen yoldaki dizin yapısını temsil eden iç içe bir sözlük oluşturur."""
+    tree: DirTree = {'files': [], 'dirs': {}}
+    try:
+        for item in os.listdir(root_path):
+            item_path = os.path.join(root_path, item)
+            if os.path.isdir(item_path):
+                subtree = _build_tree(item_path, patterns)
+                # Sadece içinde dosya olan veya dosyası olan alt klasörleri ekle
+                if subtree['files'] or subtree['dirs']:
+                    tree['dirs'][item] = subtree
+            elif os.path.isfile(item_path):
+                # Dosyanın verilen desenlerden herhangi biriyle eşleşip eşleşmediğini kontrol et
+                if any(fnmatch.fnmatch(item, pattern) for pattern in patterns):
+                    tree['files'].append(item)
+    except OSError as e:
+        print(f"Warning: Could not access path {root_path}: {e}")
+    return tree
+
+def _write_tree_to_markdown(md_file, tree: DirTree, level: int):
+    """Ağaç veri yapısını markdown formatında dosyaya yazar."""
+    # Dosyaları girintili olarak yaz
+    indent = '    ' * level
+    for filename in sorted(tree['files']):
+        md_file.write(f"{indent}- [] {filename}\n")
+    
+    # Alt dizinler için başlık oluştur ve recursive olarak devam et
+    for dirname, subtree in sorted(tree['dirs'].items()):
+        # Alt başlıklar için girinti yok, sadece başlık seviyesi artıyor
+        md_file.write(f"{'    ' * (level -1)}{'#' * (level + 1)} {dirname}\n")
+        _write_tree_to_markdown(md_file, subtree, level + 1)
+
+def generate_global_markdown_listing(directories: List[str], file_patterns: List[str], output_file: str):
+    """
+    Global dizinler için hiyerarşik bir markdown dosya listesi oluşturur.
+    En üst başlık olarak mutlak yolu kullanır, alt öğeler için göreceli isimler kullanır.
+    """
+    with open(output_file, 'w', encoding='utf-8') as md_file:
+        for directory in directories:
+            abs_dir = os.path.abspath(directory)
+            
+            if not os.path.isdir(abs_dir):
+                print(f"Warning: Global directory not found: {abs_dir}")
+                md_file.write(f"# {directory}\n")
+                md_file.write(f"    - !! UYARI: Dizin bulunamadı: {abs_dir}\n\n")
+                continue
+
+            tree = _build_tree(abs_dir, file_patterns)
+            
+            # Sadece ağaç boş değilse yaz
+            if tree['files'] or tree['dirs']:
+                md_file.write(f"# {abs_dir}\n")
+                _write_tree_to_markdown(md_file, tree, 1)
+                md_file.write("\n")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.94
+Version: 0.1.9.95
 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.95.dist-info}/RECORD

@@ -1,10 +1,10 @@
-ara_cli/__init__.py,sha256=oieeo07y5FLq0tmPzWZdp65j6tN8NOucSjSzrJw8qrQ,203
+ara_cli/__init__.py,sha256=CzGZUcf4WQP051xeNziNKQj8oNr-n_lZCW5_cR_WNVw,455
 ara_cli/__main__.py,sha256=J5DCDLRZ6UcpYwM1-NkjaLo4PTetcSj2dB4HrrftkUw,2064
 ara_cli/ara_command_action.py,sha256=uyMN05ZYffWqN9nwL53MmQ_yHpuxHVqZ_scAMEoD1jw,21516
 ara_cli/ara_command_parser.py,sha256=A1lMc9Gc0EMJt-380PTcv3aKoxbXGfx5gGax-sZqV3I,21020
-ara_cli/ara_config.py,sha256=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/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_link_updater.py,sha256=nKdxTpDKqWTOAMD8viKmUaklSFGWzJZ8S8E8xW_ADuM,3775
@@ -12,7 +12,7 @@ ara_cli/artefact_lister.py,sha256=M-ggazAgZ-OLeW9NB48r_sd6zPx0p4hEpeS63qHwI1A,41
 ara_cli/artefact_reader.py,sha256=Pho0_Eqm7kD9CNbVMhKb6mkNM0I3iJiCJXbXmVp1DJU,7827
 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=i2v-Ctem66sgO-HUV3kvMbk4wfotsc2oNet_i1-wfAI,39901
 ara_cli/classifier.py,sha256=zWskj7rBYdqYBGjksBm46iTgVU5IIf2PZsJr4qeiwVU,1878
 ara_cli/codefusionretriever.py,sha256=fCHgXdIBRzkVAnapX-KI2NQ44XbrrF4tEQmn5J6clUI,1980
 ara_cli/codehierachieretriever.py,sha256=Xd3EgEWWhkSf1TmTWtf8X5_YvyE_4B66nRrqarwSiTU,1182
@@ -21,17 +21,18 @@ ara_cli/directory_navigator.py,sha256=6QbSAjJrJ5a6Lutol9J4HFgVDMiAQ672ny9TATrh04
 ara_cli/file_classifier.py,sha256=A7wilPtIFm81iMgvqD0PjkOVL_QMUc9TB2w2Z9UcPcM,4001
 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_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=rYDZfGIzWScBRjMjgeqPAsdSGThurJ7PgpedF2Ekr2U,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
@@ -59,8 +60,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
@@ -136,7 +141,7 @@ ara_cli/templates/specification_breakdown_files/template.technology.exploration.
 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_ara_config.py,sha256=RbVhS0SS1lr_SVopEMT1Fake5a-4rWN8MprgJtgI-FA,15883
 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
@@ -144,19 +149,20 @@ tests/test_artefact_lister.py,sha256=35R13UU-YsX1HOsEN8M2-vIiCUA9RSBm6SwestDaFhE
 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=sf4mXmOjXZeaYPNSYXSyfz0b5pZA6Mq7_R3gWjQaJw4,56152
 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_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.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,,

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:

tests/test_chat.py

@@ -10,6 +10,7 @@ from types import SimpleNamespace
 from ara_cli.chat import Chat
 from ara_cli.template_manager import TemplatePathManager
 from ara_cli.ara_config import ConfigManager
+from ara_cli.file_loaders.text_file_loader import TextFileLoader
 
 
 def get_default_config():
@@ -471,42 +472,28 @@ def test_determine_file_path(temp_chat_file):
             mock_exists.reset_mock()
 
 
-@pytest.mark.parametrize("file_name, file_content, prefix, suffix, block_delimiter, expected_content", [
-    ("document.txt", "Hello World", "", "", "", "Hello World\n"),
-    ("document.txt", "Hello World", "Prefix-", "-Suffix", "", "Prefix-Hello World-Suffix\n"),
-    ("document.txt", "Hello World", "", "", "---", "---\nHello World\n---\n"),
-    ("document.txt", "Hello World", "Prefix", "Suffix", "---", "Prefix---\nHello World\n---Suffix\n"),
+@pytest.mark.parametrize("file_name, expected_content", [
+    ("document.txt", "Hello World\n"),
+    ("another_document.txt", "Another World\n"),
 ])
-def test_load_text_file(temp_chat_file, file_name, file_content, prefix, suffix, block_delimiter, expected_content):
-    mock_config = get_default_config()
+def test_load_text_file(temp_chat_file, file_name, expected_content):
+    # Create a mock config
+    mock_config = MagicMock()
+
+    # Patch the get_config method to return the mock config
     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
         chat = Chat(temp_chat_file.name, reset=False)
 
-    with patch.object(chat, 'determine_file_path', return_value=file_name):
-        with patch("builtins.open", mock_open(read_data=file_content)) as mock_file:
-            result = chat.load_text_file(file_name, prefix, suffix, block_delimiter)
-
-            assert result is True
-
-            mock_file.assert_any_call(file_name, 'r', encoding='utf-8', errors="replace")
-
-            mock_file.assert_any_call(chat.chat_name, 'a', encoding='utf-8')
-
-            mock_file().write.assert_called_once_with(expected_content)
-
-
-# def test_load_text_file_file_not_found(temp_chat_file):
-#     mock_config = get_default_config()
-#     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
-#         chat = Chat(temp_chat_file.name, reset=False)
-
-#     with patch.object(chat, 'determine_file_path', return_value=None):
-#         with patch("builtins.open", mock_open()) as mock_file:
-#             result = chat.load_text_file("nonexistent.txt")
+    # Mock the TextFileLoader
+    with patch.object(TextFileLoader, 'load', return_value=True) as mock_load:
+        # Call the load_text_file method
+        result = chat.load_text_file(file_name)
 
-#     assert result is False
+        # Check that the load method was called once
+        mock_load.assert_called_once()
 
-#     mock_file.assert_not_called()
+        # Check that the result is True
+        assert result is True
 
 
 @pytest.mark.parametrize(