ara-cli 0.1.9.65__py3-none-any.whl → 0.1.9.67__py3-none-any.whl

ara_cli/ara_command_action.py

@@ -576,22 +576,32 @@ def scan_action(args):
 def autofix_action(args):
     from ara_cli.artefact_autofix import parse_report, apply_autofix, read_report_file
 
-    content = read_report_file()
+    # If the user passes --non-deterministic, only_deterministic_fix becomes False.
+    # If the user passes --deterministic, only_non_deterministic_fix becomes False.
+    # If no flags are passed, both are True, and all fixes are attempted.
+    run_deterministic = not args.non_deterministic
+    run_non_deterministic = not args.deterministic
 
+    content = read_report_file()
     if not content:
         return False
 
     issues = parse_report(content)
-
     if not issues:
         print("No issues found in the report. Nothing to fix.")
         return
 
-    # print("Found issues to fix:")
+    # print("\nStarting autofix process...")
     for classifier, files in issues.items():
         print(f"\nClassifier: {classifier}")
         for file_path, reason in files:
-            print(f"Attempting to fix {file_path} for reason: {reason}")
-            apply_autofix(file_path, classifier, reason)
+            apply_autofix(
+                file_path,
+                classifier,
+                reason,
+                deterministic=run_deterministic,
+                non_deterministic=run_non_deterministic
+            )
 
     print("\nAutofix process completed. Please review the changes.")
+

ara_cli/ara_command_parser.py

@@ -229,7 +229,10 @@ def scan_parser(subparsers):
 
 
 def autofix_parser(subparsers):
-    subparsers.add_parser("autofix", help="Fix ARA tree with llm models for scanned artefacts with ara scan command.")
+    autofix_parser = subparsers.add_parser("autofix", help="Fix ARA tree with llm models for scanned artefacts with ara scan command.")
+    determinism_group = autofix_parser.add_mutually_exclusive_group()
+    determinism_group.add_argument("--deterministic", "-d", action="store_true", help="Run only deterministic fixes e.g Title-FileName Mismatch fix")
+    determinism_group.add_argument("--non-deterministic", "-nd", action="store_true", help="Run only non-deterministic fixes")
 
 
 class CustomHelpFormatter(argparse.HelpFormatter):

ara_cli/ara_config.py

@@ -42,9 +42,9 @@ class ARAconfig(BaseModel):
             "model": "openai/gpt-4o",
             "temperature": 0.8
         },
-        "gpt-4.5-preview": {
+        "gpt-4.1": {
             "provider": "openai",
-            "model": "openai/gpt-4.5-preview",
+            "model": "openai/gpt-4.1",
             "temperature": 0.8,
         },
         "o3-mini": {
@@ -52,9 +52,14 @@ class ARAconfig(BaseModel):
             "model": "openai/o3-mini",
             "temperature": 1.0,
         },
-        "claude-3.7": {
+        "opus-4": {
+            "provider": "anthropic",
+            "model": "anthropic/claude-opus-4-20250514",
+            "temperature": 0.8,
+        },
+        "sonnet-4": {
             "provider": "anthropic",
-            "model": "anthropic/claude-3-7-sonnet-20250219",
+            "model": "anthropic/claude-sonnet-4-20250514",
             "temperature": 0.8,
         },
         "together-ai-llama-2": {
@@ -67,21 +72,6 @@ class ARAconfig(BaseModel):
             "model": "groq/llama3-70b-8192",
             "temperature": 0.8,
         },
-        "opus-4": {
-            "provider": "anthropic",
-            "model": "anthropic/claude-opus-4-20250514",
-            "temperature": 0.8,
-        },
-        "sonnet-3.7": {
-            "provider": "anthropic",
-            "model": "anthropic/claude-3-7-sonnet-20250219",
-            "temperature": 0.8,
-        },
-        "sonnet-4": {
-            "provider": "anthropic",
-            "model": "anthropic/claude-sonnet-4-20250514",
-            "temperature": 0.8,
-        },
     }
     default_llm: Optional[str] = "gpt-4o"
 

ara_cli/artefact_autofix.py

@@ -1,3 +1,6 @@
+import os
+from typing import Dict, List, Tuple
+
 def read_report_file():
     file_path = "incompatible_artefacts_report.md"
     try:
@@ -5,12 +8,11 @@ def read_report_file():
             content = f.read()
     except OSError:
         print('Artefact scan results file not found. Did you run the "ara scan" command?')
-        return
-
+        return None
     return content
 
 
-def parse_report(content: str) -> dict:
+def parse_report(content: str) -> Dict[str, List[Tuple[str, str]]]:
     """
     Parses the incompatible artefacts report and returns structured data.
     Returns a dictionary where keys are artefact classifiers, and values are lists of (file_path, reason) tuples.
@@ -20,31 +22,27 @@ def parse_report(content: str) -> dict:
     current_classifier = None
 
     if not lines or lines[0] != "# Artefact Check Report":
-        return issues  # Geçersiz rapor formatı
+        return issues
 
     if len(lines) >= 3 and lines[2] == "No problems found.":
-        return issues  # Hiç sorun bulunamadı
+        return issues
 
-    for line in lines[1:]:  # Başlıktan sonraki satırları işle
+    for line in lines[1:]:
         line = line.strip()
         if not line:
             continue
 
-        # Classifier başlığı tespiti (## ile başlayan)
         if line.startswith("## "):
             current_classifier = line[3:].strip()
             issues[current_classifier] = []
 
-        # Dosya listesi tespiti (- ile başlayan)
         elif line.startswith("- ") and current_classifier is not None:
-            # Format: "- `file_path`: reason"
             parts = line.split("`", 2)
             if len(parts) < 3:
-                continue  # Geçersiz format
+                continue
 
             file_path = parts[1]
-            reason = parts[2].split(
-                ":", 1)[1].strip() if ":" in parts[2] else ""
+            reason = parts[2].split(":", 1)[1].strip() if ":" in parts[2] else ""
             issues[current_classifier].append((file_path, reason))
 
     return issues
@@ -53,7 +51,7 @@ def parse_report(content: str) -> dict:
 def read_artefact(file_path):
     """Reads the artefact text from the given file path."""
     try:
-        with open(file_path, 'r') as file:
+        with open(file_path, 'r', encoding="utf-8") as file:
             return file.read()
     except FileNotFoundError:
         print(f"File not found: {file_path}")
@@ -82,7 +80,7 @@ def construct_prompt(artefact_type, reason, file_path, artefact_text):
     from ara_cli.artefact_models.artefact_model import ArtefactType
 
     prompt = (
-        f"Correct the following {artefact_type} artefact to fix the issue: {reason}. "
+        f"Correct the following {artefact_type.value} artefact to fix the issue: {reason}. "
         "Provide the corrected artefact. Do not reformulate the artefact, "
         "just fix the pydantic model errors, use correct grammar. "
         "You should follow the name of the file "
@@ -113,33 +111,81 @@ def run_agent(prompt, artefact_class):
     from pydantic_ai import Agent
     # gpt-4o
     # anthropic:claude-3-7-sonnet-20250219
-    agent = Agent(model="anthropic:claude-3-7-sonnet-20250219",
+    # anthropic:claude-4-sonnet-20250514
+    agent = Agent(model="anthropic:claude-4-sonnet-20250514",
                   result_type=artefact_class, instrument=True)
     result = agent.run_sync(prompt)
     return result.data
 
 
 def write_corrected_artefact(file_path, corrected_text):
-    with open(file_path, 'w') as file:
+    with open(file_path, 'w', encoding="utf-8") as file:
         file.write(corrected_text)
     print(f"Fixed artefact at {file_path}")
 
 
-def apply_autofix(file_path, classifier, reason):
+def fix_title_mismatch(file_path: str, artefact_text: str, artefact_class) -> str:
+    """
+    Deterministically fixes the title in the artefact text to match the filename.
+    """
+    base_name = os.path.basename(file_path)
+    correct_title_underscores, _ = os.path.splitext(base_name)
+    correct_title_spaces = correct_title_underscores.replace('_', ' ')
+
+    title_prefix = artefact_class._title_prefix()
+    
+    lines = artefact_text.splitlines()
+    new_lines = []
+    title_found_and_replaced = False
+
+    for line in lines:
+        if not title_found_and_replaced and line.strip().startswith(title_prefix):
+            new_lines.append(f"{title_prefix} {correct_title_spaces}")
+            title_found_and_replaced = True
+        else:
+            new_lines.append(line)
+    
+    if not title_found_and_replaced:
+        print(f"Warning: Title prefix '{title_prefix}' not found in {file_path}. Title could not be fixed.")
+        return artefact_text
+
+    return "\n".join(new_lines)
+
+
+def apply_autofix(file_path: str, classifier: str, reason: str, deterministic: bool, non_deterministic: bool) -> bool:
     artefact_text = read_artefact(file_path)
     if artefact_text is None:
-        return
+        return False
 
-    artefact_type, artefact_class = determine_artefact_type_and_class(
-        classifier)
+    artefact_type, artefact_class = determine_artefact_type_and_class(classifier)
     if artefact_type is None or artefact_class is None:
-        return
+        return False
 
-    prompt = construct_prompt(artefact_type, reason, file_path, artefact_text)
+    is_deterministic_issue = "Filename-Title Mismatch" in reason
 
-    try:
-        corrected_artefact = run_agent(prompt, artefact_class)
-        corrected_text = corrected_artefact.serialize()
+    if deterministic and is_deterministic_issue:
+        print(f"Attempting deterministic fix for {file_path}...")
+        corrected_text = fix_title_mismatch(file_path, artefact_text, artefact_class)
         write_corrected_artefact(file_path, corrected_text)
-    except Exception as e:
-        print(f"Failed to fix artefact at {file_path}: {e}")
+        return True
+
+    # Attempt non-deterministic fix if requested and the issue is NOT deterministic
+    if non_deterministic and not is_deterministic_issue:
+        print(f"Attempting non-deterministic (LLM) fix for {file_path}...")
+        prompt = construct_prompt(artefact_type, reason, file_path, artefact_text)
+        try:
+            corrected_artefact = run_agent(prompt, artefact_class)
+            corrected_text = corrected_artefact.serialize()
+            write_corrected_artefact(file_path, corrected_text)
+            return True
+        except Exception as e:
+            print(f"LLM agent failed to fix artefact at {file_path}: {e}")
+            return False
+    
+    # Log if a fix was skipped due to flags
+    if is_deterministic_issue and not deterministic:
+        print(f"Skipping deterministic fix for {file_path} as per request.")
+    elif not is_deterministic_issue and not non_deterministic:
+        print(f"Skipping non-deterministic fix for {file_path} as per request.")
+
+    return False

ara_cli/artefact_models/artefact_model.py

@@ -49,16 +49,13 @@ class Contribution(BaseModel):
 
     @model_validator(mode="after")
     def validate_parent(self) -> Self:
+
         artefact_name = self.artefact_name
         classifier = self.classifier
         rule = self.rule
 
         if artefact_name:
             artefact_name = replace_space_with_underscore(artefact_name)
-        if artefact_name and classifier:
-            artefact_name = artefact_name.removesuffix(f"_{classifier}")
-            artefact_name = artefact_name.removesuffix(f"_{classifier.capitalize()}")
-            self.artefact_name = artefact_name
         if not artefact_name or not classifier:
             self.artefact_name = None
             self.classifier = None

ara_cli/artefact_scan.py

@@ -1,4 +1,5 @@
 from textwrap import indent
+import os
 
 
 def check_file(file_path, artefact_class):
@@ -9,7 +10,16 @@ def check_file(file_path, artefact_class):
     except OSError as e:
         return False, f"File error: {e}"
     try:
-        artefact_class.deserialize(content)
+        artefact_instance = artefact_class.deserialize(content)
+
+        base_name = os.path.basename(file_path)
+        file_name_without_ext, _ = os.path.splitext(base_name)
+
+        if artefact_instance.title != file_name_without_ext:
+            reason = (f"Filename-Title Mismatch: The file name '{file_name_without_ext}' "
+                      f"does not match the artefact title '{artefact_instance.title}'.")
+            return False, reason
+
         return True, None
     except (ValidationError, ValueError, AssertionError) as e:
         return False, str(e)

ara_cli/prompt_handler.py

@@ -81,7 +81,8 @@ def send_prompt(prompt):
     completion = litellm.completion(
         **config_parameters,
         messages=prompt,
-        stream=True
+        stream=True,
+        max_tokens=8192
     )
     for chunk in completion:
         yield chunk
@@ -357,10 +358,8 @@ def prepend_system_prompt(message_list):
 def append_images_to_message(message, image_data_list):
     if not image_data_list:
         return message
-    new_content_list = [{"type": "text", "text": message}]
-    new_content_list.extend(image_data_list)
-    
-    message["content"] = new_content_list
+    message_content = message["content"]
+    message["content"] = message_content + image_data_list
 
     return message
 
@@ -380,23 +379,24 @@ def create_and_send_custom_prompt(classifier, parameter):
     append_headings(classifier, parameter, "prompt")
     write_prompt_result(classifier, parameter, prompt)
 
-    base_message = {
+    message = {
         "role": "user",
         "content": combined_content_markdown
     }
 
-    final_message = append_images_to_message(base_message, image_data_list)
-
-    message_list_to_send = [final_message]
+    message_list = [message]
 
+    message_list = append_images_to_message(message_list, image_data_list)
     append_headings(classifier, parameter, "result")
+
     artefact_data_path = f"ara/{sub_directory}/{parameter}.data/{classifier}.prompt_log.md"
     with open(artefact_data_path, 'a') as file:
-        for chunk in send_prompt(message_list_to_send):
-            content = chunk.choices[0].delta.content
-            if content:
-                file.write(content)
-                file.flush()
+        for chunk in send_prompt(message_list):
+            chunk_content = chunk.choices[0].delta.content
+            if not chunk_content:
+                continue
+            file.write(chunk_content)
+            file.flush()
     # write_prompt_result(classifier, parameter, response)
 
 

ara_cli/version.py

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

{ara_cli-0.1.9.65.dist-info → ara_cli-0.1.9.67.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.65
+Version: 0.1.9.67
 Requires-Dist: litellm
 Requires-Dist: llama-index
 Requires-Dist: llama-index-llms-openai

{ara_cli-0.1.9.65.dist-info → ara_cli-0.1.9.67.dist-info}/RECORD

@@ -1,9 +1,9 @@
 ara_cli/__init__.py,sha256=0zl7IegxTid26EBGLav_fXZ4CCIV3H5TfAoFQiOHjvg,148
 ara_cli/__main__.py,sha256=Z6XYWRLceIoZPvfC-X9EXouSZdtFOOe84kKVWJGA4r4,1861
-ara_cli/ara_command_action.py,sha256=NN1DrmTEbLAUUHIFINDaLyp8gmKZA9cFw4cED0CFe9U,21177
-ara_cli/ara_command_parser.py,sha256=HHPHLYzvn2bGVjwZ7fhdKgwiHHJDbERRdLcTe8G9B1Q,17588
-ara_cli/ara_config.py,sha256=_Arkr-b9XnrNHbBlFKb9tAo3OmdP4ZZiWvbY9m6Sbo0,4178
-ara_cli/artefact_autofix.py,sha256=T0TJ6vBxveMoOKm6c22c6D-iMuBHlCksvNLil_O6xaM,4885
+ara_cli/ara_command_action.py,sha256=dD97IeH7x5udKC_APk5TbuVXPiyU2XSBV2uqy52nQ9A,21625
+ara_cli/ara_command_parser.py,sha256=v8LUdkBSI2771gI53PdrxtD8YVjhk-7E8vgTEsTGnRM,17952
+ara_cli/ara_config.py,sha256=gOeaFR5Bkxk1EbN7qvJuHeaLICgy7irCREOIQD6_98M,3832
+ara_cli/artefact_autofix.py,sha256=-7XHl7j5O1kwWeBeIybnA4CI8v6SlXRNkV1KQ9nSWLQ,6817
 ara_cli/artefact_creator.py,sha256=tUNCNvfFYMheyF_viyrQhm2-43AkbHFoQaHui9ntvws,6002
 ara_cli/artefact_deleter.py,sha256=Co4wwCH3yW8H9NrOq7_2p5571EeHr0TsfE-H8KqoOfY,1900
 ara_cli/artefact_fuzzy_search.py,sha256=BBDe-IP75sWZjG6nTNFtVljjL01JlQUy5ccJBZ6Trow,2429
@@ -11,7 +11,7 @@ ara_cli/artefact_link_updater.py,sha256=itMS_Z64jE8bBly9WA01z8PqkBeNW6ntTO7ryMeC
 ara_cli/artefact_lister.py,sha256=jhk4n4eqp7hDIq07q43QzS7-36BM3OfZ4EABxCeOGcw,4764
 ara_cli/artefact_reader.py,sha256=_RqBY1f1DWH2DThXETYuHeTB2ip0wgYuGvHYI_D6EJ4,8062
 ara_cli/artefact_renamer.py,sha256=loIn1DF9kVnjhH7wP1v5qUvt3s0uKeWXuQPrHXenQGE,4025
-ara_cli/artefact_scan.py,sha256=7PH7TE2B2Py7wGQxl7EYM3r6Fr9kVLAFtNErP0QRoXM,1950
+ara_cli/artefact_scan.py,sha256=J3aCAOltVr1oS6Lwnv51gtZC_G8faORGTccFY3kkBX4,2368
 ara_cli/chat.py,sha256=7xTtPEDk052_wmIzoti7GavEJ1vpRxe5c084WQ1C7dg,28617
 ara_cli/classifier.py,sha256=zWskj7rBYdqYBGjksBm46iTgVU5IIf2PZsJr4qeiwVU,1878
 ara_cli/codefusionretriever.py,sha256=fCHgXdIBRzkVAnapX-KI2NQ44XbrrF4tEQmn5J6clUI,1980
@@ -25,16 +25,17 @@ ara_cli/list_filter.py,sha256=Not17hIngI37gZsLtIKxopB-BmyWoOGlBzSqBwh-Zpc,5273
 ara_cli/output_suppressor.py,sha256=ZByUwLH2DxOb-eJ31KQbtIziBKdykoyxvwxZ0tSammA,371
 ara_cli/prompt_chat.py,sha256=kd_OINDQFit6jN04bb7mzgY259JBbRaTaNp9F-webkc,1346
 ara_cli/prompt_extractor.py,sha256=a8LwPj6U8sG_v3SqDXQyPvDZQds4kHnYSO8eGissYJA,7503
-ara_cli/prompt_handler.py,sha256=1gz2VkK7zl0RAzit1UmxplNNd2Zu6J_7eHocgKiw_hQ,17473
+ara_cli/prompt_handler.py,sha256=3r7GeiOOoasZ4nz0AT51Sw5M_hyHq-RFTGPQIxT_CQk,17458
 ara_cli/prompt_rag.py,sha256=vmlt4-rSboWibwgO_KUF79TK99YXT5KXjmbD9FeWdZY,7449
 ara_cli/run_file_lister.py,sha256=XbrrDTJXp1LFGx9Lv91SNsEHZPP-PyEMBF_P4btjbDA,2360
 ara_cli/tag_extractor.py,sha256=4krQyvmLR2ffhe7N7lWC7QjaxXcb90HaQdmjnBiD8ak,2523
 ara_cli/template_manager.py,sha256=YXPj2jGNDb-diIHFEK_vGJ-ZucodnXSGAPofKTnOofI,6633
 ara_cli/update_config_prompt.py,sha256=PZgNIN3dTw6p80GyX8Sp5apkAhSoykwnkEbHo3IOkUo,4571
-ara_cli/version.py,sha256=1Z37icnDfTLV_xa6229A5btyIc1fDW2rl72E31bdi5s,146
+ara_cli/version.py,sha256=ijl3fM4h2e9CBlwsSPtThOSO0Gz29LkbJ34xKFGx-v0,146
+ara_cli/artefact_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ara_cli/artefact_models/artefact_load.py,sha256=dNcwZDW2Dk0bts9YnPZ0ESmWD2NbsLIvl4Z-qQeGmTQ,401
 ara_cli/artefact_models/artefact_mapping.py,sha256=8aD0spBjkJ8toMAmFawc6UTUxB6-tEEViZXv2I-r88Q,1874
-ara_cli/artefact_models/artefact_model.py,sha256=SRVfeHVKCMJ8L9lqPzAr_MgI4m7mGdcYx0SE2ja-NEI,14949
+ara_cli/artefact_models/artefact_model.py,sha256=nZZS6WyVuODblLnVTH6VZli--eFrDiwNMtjwHTs2KBI,14703
 ara_cli/artefact_models/artefact_templates.py,sha256=Vd7SwoRVKNGKZmxBKS6f9FE1ThUOCqZLScu0ClPfIu8,8321
 ara_cli/artefact_models/businessgoal_artefact_model.py,sha256=jqYFMXjWle0YW9RvcFLDBAwy61bdT5VuDT_6lTOFzMw,4853
 ara_cli/artefact_models/capability_artefact_model.py,sha256=SZqHx4O2mj4urn77Stnj4_Jxtlq3-LgBBU9SMkByppI,3079
@@ -130,28 +131,28 @@ ara_cli/templates/specification_breakdown_files/template.step.exploration.md,sha
 ara_cli/templates/specification_breakdown_files/template.step.md,sha256=nzDRl9Xo-fJKeDKxIRh9njidV1SOd2ZOPi7eM3YG9DU,1052
 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
-ara_cli/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ara_cli/tests/test_ara_autofix.py,sha256=8AaSuherD2dvo2wMFafgHnkLhSnMs6ZW6RtX-5VKsls,4248
-ara_cli/tests/test_ara_command_action.py,sha256=Y5MrG6VjXgebliKfdFaCaS8i3GoZCGSLpj3AWCbL5Lk,25695
-ara_cli/tests/test_ara_config.py,sha256=1LWby_iSestTIIqK-1clggL8kmbGGbtlYfsxAHaMMF8,2232
-ara_cli/tests/test_artefact_fuzzy_search.py,sha256=5Sh3_l9QK8-WHn6JpGPU1b6h4QEnl2JoMq1Tdp2cj1U,1261
-ara_cli/tests/test_artefact_link_updater.py,sha256=gN5KFF1uY7OoBh8Mr5jWpqXp02YCU5OSIpSU76Rm4Gs,2137
-ara_cli/tests/test_artefact_lister.py,sha256=VCEOCgDgnAOeUUgIoGAbWgz60hf9UT-tdHg18LGfB34,22656
-ara_cli/tests/test_artefact_reader.py,sha256=660K-d8ed-j8hulsUB_7baPD2-hhbg9TffUR5yVc4Uo,927
-ara_cli/tests/test_artefact_renamer.py,sha256=syL3qH8pPRmxPkpmKXInZ7WTI8X487YJXsgiZOtv2C4,3490
-ara_cli/tests/test_artefact_scan.py,sha256=I2rpSoRQ2auBbWjmGnm7VdTSS811tkAgUyK2dS69KVQ,4780
-ara_cli/tests/test_chat.py,sha256=V75baLk2ZFz5WDSFTlvdbmMb6Dm7o12xoFEulmMgMDI,46765
-ara_cli/tests/test_classifier.py,sha256=grYGPksydNdPsaEBQxYHZTuTdcJWz7VQtikCKA6BNaQ,1920
-ara_cli/tests/test_directory_navigator.py,sha256=7G0MVrBbtBvbrFUpL0zb_9EkEWi1dulWuHsrQxMJxDY,140
-ara_cli/tests/test_file_classifier.py,sha256=hbGp0-_A_LgQ0pGv1jWDEIyCgvDyfChcvvVfbxjNY2U,10938
-ara_cli/tests/test_file_creator.py,sha256=G257M1duenDrgLCSql3wVWNuzcxyQqLQDybfbxiGYN0,2100
-ara_cli/tests/test_file_lister.py,sha256=f6B_vIv-wAulKH2ZGgNg4SG79XqGGbfwoIvZlbEnYyM,4306
-ara_cli/tests/test_list_filter.py,sha256=gSRKirTtFuhRS3QlFHqWl89WvCvAdVEnFsCWTYmgB2o,7928
-ara_cli/tests/test_tag_extractor.py,sha256=nSiAYlTKZ7TLAOtcJpwK5zTWHhFYU0tI5xKnivLc1dU,2712
-ara_cli/tests/test_template_manager.py,sha256=bRxka6cxHsCAOvXjfG8MrVO8qSZXhxW01tnph80UtNk,3143
-ara_cli/tests/test_update_config_prompt.py,sha256=vSsLvc18HZdVjVM93qXWVbJt752xTLL6VGjSVCrPufk,6729
-ara_cli-0.1.9.65.dist-info/METADATA,sha256=nVFr74izr8-FxmQELehwrjkkIUwOQHDkAfwXeeMAFmQ,415
-ara_cli-0.1.9.65.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.65.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.65.dist-info/top_level.txt,sha256=zzee_PwFmKqfBi9XgIunP6xy2S4TIt593CLLxenNaAE,8
-ara_cli-0.1.9.65.dist-info/RECORD,,
+tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/test_ara_autofix.py,sha256=EFVzhVTNPDRVxpoK0CY6OAM88EjZTRXh-uxFGS1AVWk,10695
+tests/test_ara_command_action.py,sha256=Y5MrG6VjXgebliKfdFaCaS8i3GoZCGSLpj3AWCbL5Lk,25695
+tests/test_ara_config.py,sha256=1LWby_iSestTIIqK-1clggL8kmbGGbtlYfsxAHaMMF8,2232
+tests/test_artefact_fuzzy_search.py,sha256=5Sh3_l9QK8-WHn6JpGPU1b6h4QEnl2JoMq1Tdp2cj1U,1261
+tests/test_artefact_link_updater.py,sha256=gN5KFF1uY7OoBh8Mr5jWpqXp02YCU5OSIpSU76Rm4Gs,2137
+tests/test_artefact_lister.py,sha256=VCEOCgDgnAOeUUgIoGAbWgz60hf9UT-tdHg18LGfB34,22656
+tests/test_artefact_reader.py,sha256=660K-d8ed-j8hulsUB_7baPD2-hhbg9TffUR5yVc4Uo,927
+tests/test_artefact_renamer.py,sha256=N9JnnKBEJChTYEdltHoiDnn5UCNQUPj9H9YqOvLzbH0,3458
+tests/test_artefact_scan.py,sha256=7w4wqCj8VEwk676JiSqh0FCAOT-kFq624u2JDrhzpuw,5860
+tests/test_chat.py,sha256=-00mni6Kik_RO8BGUpWqaL4S0wt2MbUBi5jD06dSHJM,47538
+tests/test_classifier.py,sha256=grYGPksydNdPsaEBQxYHZTuTdcJWz7VQtikCKA6BNaQ,1920
+tests/test_directory_navigator.py,sha256=7G0MVrBbtBvbrFUpL0zb_9EkEWi1dulWuHsrQxMJxDY,140
+tests/test_file_classifier.py,sha256=hbGp0-_A_LgQ0pGv1jWDEIyCgvDyfChcvvVfbxjNY2U,10938
+tests/test_file_creator.py,sha256=D3G7MbgE0m8JmZihxnTryxLco6iZdbV--2CGc0L20FM,2109
+tests/test_file_lister.py,sha256=f6B_vIv-wAulKH2ZGgNg4SG79XqGGbfwoIvZlbEnYyM,4306
+tests/test_list_filter.py,sha256=gSRKirTtFuhRS3QlFHqWl89WvCvAdVEnFsCWTYmgB2o,7928
+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=vSsLvc18HZdVjVM93qXWVbJt752xTLL6VGjSVCrPufk,6729
+ara_cli-0.1.9.67.dist-info/METADATA,sha256=LUsIQxYDmhuivLA0VNgiE2U47Y3jznv7C6D-z2IMOAc,415
+ara_cli-0.1.9.67.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.9.67.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.9.67.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
+ara_cli-0.1.9.67.dist-info/RECORD,,

{ara_cli-0.1.9.65.dist-info → ara_cli-0.1.9.67.dist-info}/top_level.txt

@@ -1 +1,2 @@
 ara_cli
+tests

tests/test_ara_autofix.py

@@ -0,0 +1,219 @@
+import pytest
+from unittest.mock import patch, mock_open, MagicMock
+from ara_cli.artefact_autofix import (
+    read_report_file,
+    parse_report,
+    apply_autofix,
+    read_artefact,
+    determine_artefact_type_and_class,
+    run_agent,
+    write_corrected_artefact,
+    construct_prompt,
+    fix_title_mismatch
+)
+from ara_cli.artefact_models.artefact_model import ArtefactType
+
+@pytest.fixture
+def mock_artefact_type():
+    """Provides a mock for the ArtefactType enum member."""
+    mock_type = MagicMock()
+    mock_type.value = "feature"
+    return mock_type
+
+@pytest.fixture
+def mock_artefact_class():
+    """Provides a mock for the Artefact class."""
+    mock_class = MagicMock()
+    mock_class._title_prefix.return_value = "Feature:"
+    # Mock the serialize method for the agent tests
+    mock_class.serialize.return_value = "llm corrected content"
+    return mock_class
+
+
+def test_read_report_file_success():
+    """Tests successful reading of the report file."""
+    mock_content = "# Artefact Check Report\n- `file.feature`: reason"
+    with patch("builtins.open", mock_open(read_data=mock_content)) as m:
+        content = read_report_file()
+        assert content == mock_content
+        m.assert_called_once_with("incompatible_artefacts_report.md", "r", encoding="utf-8")
+
+def test_read_report_file_not_found(capsys):
+    with patch("builtins.open", side_effect=OSError("File not found")):
+        content = read_report_file()
+        assert content is None
+        assert "Artefact scan results file not found" in capsys.readouterr().out
+
+def test_parse_report_with_issues():
+    content = "# Artefact Check Report\n\n## feature\n- `path/to/file.feature`: A reason\n"
+    expected = {"feature": [("path/to/file.feature", "A reason")]}
+    assert parse_report(content) == expected
+
+def test_parse_report_no_issues():
+    content = "# Artefact Check Report\n\nNo problems found.\n"
+    assert parse_report(content) == {}
+
+def test_parse_report_invalid_format():
+    assert parse_report("This is not a valid report") == {}
+
+def test_parse_report_invalid_line_format():
+    content = "# Artefact Check Report\n\n## feature\n- an invalid line\n"
+    assert parse_report(content) == {"feature": []}
+
+def test_read_artefact_success():
+    mock_content = "Feature: My Feature"
+    with patch("builtins.open", mock_open(read_data=mock_content)) as m:
+        content = read_artefact("file.feature")
+        assert content == mock_content
+        m.assert_called_once_with("file.feature", 'r', encoding="utf-8")
+
+def test_read_artefact_file_not_found(capsys):
+    with patch("builtins.open", side_effect=FileNotFoundError):
+        result = read_artefact("nonexistent.feature")
+        assert result is None
+        assert "File not found: nonexistent.feature" in capsys.readouterr().out
+
+@patch("ara_cli.artefact_models.artefact_mapping.artefact_type_mapping")
+def test_determine_artefact_type_and_class_no_class_found(mock_mapping, capsys):
+    mock_mapping.get.return_value = None
+    # The function returns (None, None) if the class is not in the mapping.
+    artefact_type, artefact_class = determine_artefact_type_and_class("feature")
+    assert artefact_type is None
+    assert artefact_class is None
+    # The print statement inside the function is called before returning, so this check is valid.
+    assert "No artefact class found for" in capsys.readouterr().out
+
+@patch("ara_cli.artefact_models.artefact_model.ArtefactType", side_effect=ValueError)
+def test_determine_artefact_type_and_class_invalid(mock_artefact_type_enum, capsys):
+    artefact_type, artefact_class = determine_artefact_type_and_class("invalid_classifier")
+    assert artefact_type is None
+    assert artefact_class is None
+    assert "Invalid classifier: invalid_classifier" in capsys.readouterr().out
+
+def test_write_corrected_artefact():
+    with patch("builtins.open", mock_open()) as m:
+        write_corrected_artefact("file.feature", "corrected content")
+        m.assert_called_once_with("file.feature", 'w', encoding="utf-8")
+        m().write.assert_called_once_with("corrected content")
+
+def test_construct_prompt_for_task():
+    prompt = construct_prompt(ArtefactType.task, "some reason", "file.task", "text")
+    assert "For task artefacts, if the action items looks like template or empty" in prompt
+
+@patch("ara_cli.artefact_autofix.run_agent")
+@patch("ara_cli.artefact_autofix.determine_artefact_type_and_class", return_value=(None, None))
+@patch("ara_cli.artefact_autofix.read_artefact", return_value="original text")
+def test_apply_autofix_exits_when_classifier_is_invalid(mock_read, mock_determine, mock_run_agent):
+    """Tests that apply_autofix exits early if the classifier is invalid."""
+    result = apply_autofix("file.feature", "invalid", "reason", deterministic=True, non_deterministic=True)
+    assert result is False
+    mock_read.assert_called_once_with("file.feature")
+    mock_determine.assert_called_once_with("invalid")
+    mock_run_agent.assert_not_called()
+
+@patch("ara_cli.artefact_autofix.run_agent")
+@patch("ara_cli.artefact_autofix.write_corrected_artefact")
+@patch("ara_cli.artefact_autofix.fix_title_mismatch", return_value="fixed text")
+@patch("ara_cli.artefact_autofix.determine_artefact_type_and_class")
+@patch("ara_cli.artefact_autofix.read_artefact", return_value="original text")
+def test_apply_autofix_for_title_mismatch_with_deterministic_flag(mock_read, mock_determine, mock_fix_title, mock_write, mock_run_agent, mock_artefact_type, mock_artefact_class):
+    """Tests that a deterministic fix is applied when the flag is True."""
+    mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
+    reason = "Filename-Title Mismatch: some details"
+    
+    result = apply_autofix("file.feature", "feature", reason, deterministic=True, non_deterministic=False)
+
+    assert result is True
+    mock_fix_title.assert_called_once_with("file.feature", "original text", mock_artefact_class)
+    mock_write.assert_called_once_with("file.feature", "fixed text")
+    mock_run_agent.assert_not_called()
+
+@patch("ara_cli.artefact_autofix.run_agent")
+@patch("ara_cli.artefact_autofix.write_corrected_artefact")
+@patch("ara_cli.artefact_autofix.fix_title_mismatch")
+@patch("ara_cli.artefact_autofix.determine_artefact_type_and_class")
+@patch("ara_cli.artefact_autofix.read_artefact", return_value="original text")
+def test_apply_autofix_skips_title_mismatch_without_deterministic_flag(mock_read, mock_determine, mock_fix_title, mock_write, mock_run_agent, mock_artefact_type, mock_artefact_class):
+    """Tests that a deterministic fix is skipped when the flag is False."""
+    mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
+    reason = "Filename-Title Mismatch: some details"
+    
+    result = apply_autofix("file.feature", "feature", reason, deterministic=False, non_deterministic=True)
+
+    assert result is False
+    mock_fix_title.assert_not_called()
+    mock_write.assert_not_called()
+    mock_run_agent.assert_not_called()
+
+@patch("ara_cli.artefact_autofix.write_corrected_artefact")
+@patch("ara_cli.artefact_autofix.run_agent")
+@patch("ara_cli.artefact_autofix.determine_artefact_type_and_class")
+@patch("ara_cli.artefact_autofix.read_artefact", return_value="original text")
+def test_apply_autofix_for_llm_fix_with_non_deterministic_flag(mock_read, mock_determine, mock_run_agent, mock_write, mock_artefact_type, mock_artefact_class):
+    """Tests that an LLM fix is applied when the non-deterministic flag is True."""
+    mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
+    mock_run_agent.return_value = mock_artefact_class
+    reason = "Pydantic validation error"
+
+    result = apply_autofix("file.feature", "feature", reason, deterministic=False, non_deterministic=True)
+
+    assert result is True
+    mock_run_agent.assert_called_once()
+    mock_write.assert_called_once_with("file.feature", "llm corrected content")
+
+@patch("ara_cli.artefact_autofix.write_corrected_artefact")
+@patch("ara_cli.artefact_autofix.run_agent")
+@patch("ara_cli.artefact_autofix.determine_artefact_type_and_class")
+@patch("ara_cli.artefact_autofix.read_artefact", return_value="original text")
+def test_apply_autofix_skips_llm_fix_without_non_deterministic_flag(mock_read, mock_determine, mock_run_agent, mock_write, mock_artefact_type, mock_artefact_class):
+    """Tests that an LLM fix is skipped when the non-deterministic flag is False."""
+    mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
+    reason = "Pydantic validation error"
+
+    result = apply_autofix("file.feature", "feature", reason, deterministic=True, non_deterministic=False)
+
+    assert result is False
+    mock_run_agent.assert_not_called()
+    mock_write.assert_not_called()
+
+@patch("ara_cli.artefact_autofix.run_agent", side_effect=Exception("LLM failed"))
+@patch("ara_cli.artefact_autofix.determine_artefact_type_and_class")
+@patch("ara_cli.artefact_autofix.read_artefact", return_value="original text")
+def test_apply_autofix_llm_exception(mock_read, mock_determine, mock_run_agent, capsys, mock_artefact_type, mock_artefact_class):
+    """Tests that an exception during an LLM fix is handled gracefully."""
+    mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
+    reason = "Pydantic validation error"
+
+    result = apply_autofix("file.feature", "feature", reason, deterministic=False, non_deterministic=True)
+
+    assert result is False
+    assert "LLM agent failed to fix artefact at file.feature: LLM failed" in capsys.readouterr().out
+
+# === Other Tests ===
+
+def test_fix_title_mismatch_success(mock_artefact_class):
+    artefact_text = "Feature: wrong title\nSome other content"
+    file_path = "path/to/correct_title.feature"
+    
+    expected_text = "Feature: correct title\nSome other content"
+    
+    result = fix_title_mismatch(file_path, artefact_text, mock_artefact_class)
+    
+    assert result == expected_text
+    mock_artefact_class._title_prefix.assert_called_once()
+
+def test_fix_title_mismatch_prefix_not_found(capsys, mock_artefact_class):
+    artefact_text = "No title prefix here"
+    file_path = "path/to/correct_title.feature"
+
+    result = fix_title_mismatch(file_path, artefact_text, mock_artefact_class)
+    
+    assert result == artefact_text # Should return original text
+    assert "Warning: Title prefix 'Feature:' not found" in capsys.readouterr().out
+
+@patch("pydantic_ai.Agent")
+def test_run_agent_exception_handling(mock_agent_class):
+    mock_agent_instance = mock_agent_class.return_value
+    mock_agent_instance.run_sync.side_effect = Exception("Agent error")
+    with pytest.raises(Exception, match="Agent error"):
+        run_agent("prompt", MagicMock())

{ara_cli/tests → tests}/test_artefact_renamer.py

@@ -1,8 +1,6 @@
-from mock import patch
-from unittest.mock import call, mock_open
+from unittest.mock import call, mock_open, patch, Mock
 from ara_cli.artefact_renamer import ArtefactRenamer
 from ara_cli.classifier import Classifier
-import mock
 import pytest
 import os
 import shutil
@@ -47,7 +45,7 @@ def test_rename_checks_new_name_provided():
 def test_update_title_in_artefact(mock_file, classifier, artefact_name, read_data_prefix, old_title, new_title):
     ar = ArtefactRenamer(os)
     read_data = f"{read_data_prefix}{old_title}\nOther content that remains unchanged."
-    mock_file.return_value.read = mock.Mock(return_value=read_data)
+    mock_file.return_value.read = Mock(return_value=read_data)
     artefact_path = f"path/to/{classifier}.artefact"
 
     # Ensure that the mock for get_artefact_title returns the prefix without an extra colon and space
@@ -76,7 +74,7 @@ def test_update_title_no_title_line(mock_get_artefact_title, mock_file):
     ar = ArtefactRenamer()
 
     read_data = "content that remains unchanged."
-    mock_file.return_value.read = mock.Mock(return_value=read_data)
+    mock_file.return_value.read = Mock(return_value=read_data)
     artefact_path = "path/to/artefact.vision"
 
     with pytest.raises(ValueError):

{ara_cli/tests → tests}/test_artefact_scan.py

@@ -5,13 +5,36 @@ from pydantic import ValidationError
 
 
 def test_check_file_valid():
+    """Tests the happy path where the file is valid and the title matches."""
+    mock_artefact_instance = MagicMock()
+    mock_artefact_instance.title = "dummy_path"
+
     mock_artefact_class = MagicMock()
-    mock_artefact_class.deserialize.return_value = None
+    mock_artefact_class.deserialize.return_value = mock_artefact_instance
 
     with patch("builtins.open", mock_open(read_data="valid content")):
-        is_valid, reason = check_file("dummy_path", mock_artefact_class)
-        assert is_valid is True
-        assert reason is None
+        is_valid, reason = check_file("dummy_path.feature", mock_artefact_class)
+        
+    assert is_valid is True
+    assert reason is None
+
+
+def test_check_file_title_mismatch():
+    """Tests the case where the filename and artefact title do not match."""
+    mock_artefact_instance = MagicMock()
+    mock_artefact_instance.title = "wrong_title"
+
+    mock_artefact_class = MagicMock()
+    mock_artefact_class.deserialize.return_value = mock_artefact_instance
+
+    with patch("builtins.open", mock_open(read_data="content")):
+        is_valid, reason = check_file("correct_path.feature", mock_artefact_class)
+
+    assert is_valid is False
+    assert "Filename-Title Mismatch" in reason
+
+    assert "'correct_path'" in reason
+    assert "'wrong_title'" in reason
 
 
 def test_check_file_value_error():
@@ -60,26 +83,30 @@ def test_find_invalid_files():
     mock_artefact_class = MagicMock()
     with patch("ara_cli.artefact_models.artefact_mapping.artefact_type_mapping", {"test_classifier": mock_artefact_class}):
         artefact_files = {
-            "test_classifier": [{"file_path": "file1.txt"}, {"file_path": "file2.txt"}, {"file_path": "templates/file3.txt"}]
+            "test_classifier": [
+                {"file_path": "file1.txt"},              # Should be checked
+                {"file_path": "file2.txt"},              # Should be checked
+                {"file_path": "templates/file3.txt"},    # Should be skipped
+                {"file_path": "some/path/file.data"}     # Should be skipped
+            ]
         }
 
         with patch("ara_cli.artefact_scan.check_file") as mock_check_file:
             mock_check_file.side_effect = [
-                (True, None),           # file1.txt
-                (False, "Invalid content")  # file2.txt
+                (True, None),              # for file1.txt
+                (False, "Invalid content") # for file2.txt
             ]
 
             invalid_files = find_invalid_files(
                 artefact_files, "test_classifier")
             assert len(invalid_files) == 1
             assert invalid_files[0] == ("file2.txt", "Invalid content")
+            assert mock_check_file.call_count == 2
             mock_check_file.assert_has_calls([
                 call("file1.txt", mock_artefact_class),
                 call("file2.txt", mock_artefact_class)
             ], any_order=False)
 
-# Tests for show_results
-
 
 def test_show_results_no_issues(capsys):
     invalid_artefacts = {}
@@ -126,4 +153,4 @@ def test_show_results_with_issues(capsys):
             call("- `file3.txt`: reason3\n"),
             call("\n")
         ]
-        handle.write.assert_has_calls(expected_writes, any_order=False)
+        handle.write.assert_has_calls(expected_writes, any_order=False)

{ara_cli/tests → tests}/test_chat.py

@@ -1,16 +1,15 @@
 import pytest
 import os
 import tempfile
-import mock
 import glob
 import cmd2
+import ara_cli
 from unittest.mock import patch, MagicMock, mock_open
 from types import SimpleNamespace
 from ara_cli.chat import Chat
 from ara_cli.template_manager import TemplatePathManager
 from ara_cli.ara_config import ConfigManager
 
-
 def get_default_config():
     return SimpleNamespace(
         ext_code_dirs=[
@@ -63,7 +62,7 @@ def temp_load_file():
 
 
 def test_handle_existing_chat_no_reset(temp_chat_file):
-    with mock.patch('builtins.input', return_value='n'):
+    with patch('builtins.input', return_value='n'):
         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=None)
@@ -71,7 +70,7 @@ def test_handle_existing_chat_no_reset(temp_chat_file):
 
 
 def test_handle_existing_chat_with_reset(temp_chat_file):
-    with mock.patch('builtins.input', return_value='y'):
+    with patch('builtins.input', return_value='y'):
         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=None)
@@ -931,36 +930,52 @@ def test_do_LOAD_COMMANDS(monkeypatch, temp_chat_file, commands_name, expected_d
 
 
 @pytest.mark.parametrize("template_name, template_type, default_pattern, custom_template_subdir, expected_directory, expected_pattern", [
-    ("global/test_command", "commands", "*.commands.md", "mocked_custom_modules_path", "mocked_template_base_path/prompt-modules/commands/", "test_command"),
-    ("local_command", "commands", "*.commands.md", "custom-prompt-modules", "/project/mocked_local_templates_path/custom-prompt-modules/commands", "local_command"),
-    ("local_command", "commands", "*.commands.md", "mocked_custom_modules_path", "/project/mocked_local_templates_path/mocked_custom_modules_path/commands", "local_command"),
+    ("local_command", "commands", "*.commands.md", "custom-prompt-modules", "/mocked_local_templates_path/custom-prompt-modules/commands", "local_command"),
+    ("local_command", "commands", "*.commands.md", "mocked_custom_modules_path", "/mocked_local_templates_path/mocked_custom_modules_path/commands", "local_command"),
+    ("local_rule", "rules", "*.rules.md", "custom-prompt-modules", "/mocked_local_templates_path/custom-prompt-modules/rules", "local_rule"),
+    ("local_rule", "rules", "*.rules.md", "mocked_custom_modules_path", "/mocked_local_templates_path/mocked_custom_modules_path/rules", "local_rule"),
+    ("local_intention", "intention", "*.intentions.md", "custom-prompt-modules", "/mocked_local_templates_path/custom-prompt-modules/intentions", "local_intention"),
+    ("local_intention", "intention", "*.intentions.md", "mocked_custom_modules_path", "/mocked_local_templates_path/mocked_custom_modules_path/intentions", "local_intention"),
+    ("local_blueprint", "blueprint", "*.blueprints.md", "custom-prompt-modules", "/mocked_local_templates_path/custom-prompt-modules/blueprints", "local_blueprint"),
+    ("local_blueprint", "blueprint", "*.blueprints.md", "mocked_custom_modules_path", "/mocked_local_templates_path/mocked_custom_modules_path/blueprints", "local_blueprint")
+])
+def test_load_template_local(monkeypatch, temp_chat_file, template_name, template_type, default_pattern, custom_template_subdir, expected_directory, expected_pattern):
+    expected_base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../"))
+    expected_directory_abs = expected_base_dir + expected_directory
+    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)
 
-    ("global/test_rule", "rules", "*.rules.md", "mocked_custom_modules_path", "mocked_template_base_path/prompt-modules/rules/", "test_rule"),
-    ("local_rule", "rules", "*.rules.md", "custom-prompt-modules", "/project/mocked_local_templates_path/custom-prompt-modules/rules", "local_rule"),
-    ("local_rule", "rules", "*.rules.md", "mocked_custom_modules_path", "/project/mocked_local_templates_path/mocked_custom_modules_path/rules", "local_rule"),
+    mock_local_templates_path = "mocked_local_templates_path"
 
-    ("global/test_intention", "intention", "*.intentions.md", "mocked_custom_modules_path", "mocked_template_base_path/prompt-modules/intentions/", "test_intention"),
-    ("local_intention", "intention", "*.intentions.md", "custom-prompt-modules", "/project/mocked_local_templates_path/custom-prompt-modules/intentions", "local_intention"),
-    ("local_intention", "intention", "*.intentions.md", "mocked_custom_modules_path", "/project/mocked_local_templates_path/mocked_custom_modules_path/intentions", "local_intention"),
+    monkeypatch.setattr(ConfigManager, 'get_config', lambda: MagicMock(local_prompt_templates_dir=mock_local_templates_path))
 
-    ("global/test_blueprint", "blueprint", "*.blueprints.md", "mocked_custom_modules_path", "mocked_template_base_path/prompt-modules/blueprints/", "test_blueprint"),
-    ("local_blueprint", "blueprint", "*.blueprints.md", "custom-prompt-modules", "/project/mocked_local_templates_path/custom-prompt-modules/blueprints", "local_blueprint"),
-    ("local_blueprint", "blueprint", "*.blueprints.md", "mocked_custom_modules_path", "/project/mocked_local_templates_path/mocked_custom_modules_path/blueprints", "local_blueprint")
+    config = chat.config
+    config.local_prompt_templates_dir = mock_local_templates_path
+    config.custom_prompt_templates_subdir = custom_template_subdir
+
+    chat.config = config
+
+    with patch.object(chat, '_load_helper') as mock_load_helper:
+        chat._load_template_from_global_or_local(template_name, template_type)
+        mock_load_helper.assert_called_once_with(expected_directory_abs, expected_pattern, template_type)
+
+@pytest.mark.parametrize("template_name, template_type, default_pattern, expected_directory, expected_pattern", [
+    ("global/test_command", "commands", "*.commands.md", "mocked_template_base_path/prompt-modules/commands/", "test_command"),
+    ("global/test_rule", "rules", "*.rules.md", "mocked_template_base_path/prompt-modules/rules/", "test_rule"),
+    ("global/test_intention", "intention", "*.intentions.md", "mocked_template_base_path/prompt-modules/intentions/", "test_intention"),
+    ("global/test_blueprint", "blueprint", "*.blueprints.md", "mocked_template_base_path/prompt-modules/blueprints/", "test_blueprint"),
 ])
-def test_load_template_from_global_or_local(monkeypatch, temp_chat_file, template_name, template_type, default_pattern, custom_template_subdir, expected_directory, expected_pattern):
+def test_load_template_from_global(monkeypatch, temp_chat_file, template_name, template_type, default_pattern, expected_directory, expected_pattern):
     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)
 
     mock_template_base_path = "mocked_template_base_path"
-    mock_local_templates_path = "mocked_local_templates_path"
 
     monkeypatch.setattr(TemplatePathManager, 'get_template_base_path', lambda: mock_template_base_path)
-    monkeypatch.setattr(ConfigManager, 'get_config', lambda: MagicMock(local_prompt_templates_dir=mock_local_templates_path))
 
     config = chat.config
-    config.local_prompt_templates_dir = mock_local_templates_path
-    config.custom_prompt_templates_subdir = custom_template_subdir
     chat.config = config
 
     with patch.object(chat, '_load_helper') as mock_load_helper:
@@ -1042,7 +1057,9 @@ def test_do_LOAD_TEMPLATE(temp_chat_file):
     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
         chat = Chat(temp_chat_file.name, reset=False)
     template_name = 'test_template'
-    directory = '/project/ara_cli/templates'
+
+    module_path = os.path.abspath(os.path.dirname(ara_cli.__file__))
+    directory = f'{module_path}/templates'
     pattern = f"template.{template_name}"
     file_type = "template"
     exclude_pattern = os.path.join(directory, "template.*.prompt_log.md")

{ara_cli/tests → tests}/test_file_creator.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch, mock_open
+from unittest.mock import Mock, patch, mock_open
 from pathlib import Path
 from ara_cli.artefact_creator import ArtefactCreator
 import pytest

{ara_cli/tests → tests}/test_template_manager.py

@@ -1,4 +1,4 @@
-from unittest.mock import patch
+from unittest.mock import patch, MagicMock
 from ara_cli.template_manager import SpecificationBreakdownAspects, ArtefactFileManager
 from ara_cli.directory_navigator import DirectoryNavigator
 
@@ -64,27 +64,43 @@ def test_copy_templates_to_directory(aspect, expect_exception, match_str):
                 mock_copy.assert_called()
                 mock_print.assert_called()
 
+@pytest.fixture
+def mock_file_manager():
+    with patch("ara_cli.template_manager.ArtefactFileManager") as MockFileManager:
+        yield MockFileManager.return_value
 
-@pytest.mark.parametrize(
-    "file_exists, dir_exists, raises, expected_exception, expected_message",
-    [
-        (True, True, False, None, None),
-        (True, False, False, None, None),
-        (False, False, True, ValueError, f"File .* does not exist. Please create it first.")
-    ]
-)
-def test_create(file_exists, dir_exists, raises, expected_exception, expected_message):
-    artefact_name = 'test_artefact'
-    classifier = 'capability'
-    aspect = 'technology'
+@pytest.fixture
+def mock_navigator():
+    with patch("ara_cli.template_manager.DirectoryNavigator") as MockNavigator:
+        mock_nav_instance = MockNavigator.return_value
+        yield mock_nav_instance
+
+@pytest.fixture
+def mock_classifier():
+    with patch("ara_cli.template_manager.Classifier") as MockClassifier:
+        MockClassifier.valid_classifiers = ['valid_classifier']
+        MockClassifier.is_valid_classifier.return_value = True
+        yield MockClassifier
+
+
+def test_create_valid_step_aspect(mock_file_manager, mock_navigator, mock_classifier):
     sba = SpecificationBreakdownAspects()
 
-    with patch('os.path.isfile', return_value=file_exists), \
-         patch('os.path.exists', return_value=dir_exists), \
-         patch('os.mkdir'), patch('os.chdir'), patch('shutil.copy'):
+    # Mock values returned by file_manager methods
+    mock_file_manager.get_artefact_file_path.return_value = "/tmp/path/file"
+    mock_file_manager.get_data_directory_path.return_value = "/tmp/path/data"
+    mock_file_manager.generate_behave_steps.return_value = ["step 1", "step 2"]
 
-        if raises:
-            with pytest.raises(expected_exception, match=expected_message):
-                sba.create(artefact_name, classifier, aspect)
-        else:
-            sba.create(artefact_name, classifier, aspect)
+    # Run the function
+    sba.create(artefact_name="my_artefact", classifier="valid_classifier", aspect="step")
+
+    # Assert navigator was used
+    mock_navigator.navigate_to_target.assert_called_once()
+
+    # Assert file_manager method calls
+    mock_file_manager.get_artefact_file_path.assert_called_once_with("my_artefact", "valid_classifier")
+    mock_file_manager.get_data_directory_path.assert_called_once_with("my_artefact", "valid_classifier")
+    mock_file_manager.create_directory.assert_called_once_with("/tmp/path/file", "/tmp/path/data")
+    mock_file_manager.copy_aspect_templates_to_directory.assert_called_once()
+    mock_file_manager.generate_behave_steps.assert_called_once_with("my_artefact")
+    mock_file_manager.save_behave_steps_to_file.assert_called_once_with("my_artefact", ["step 1", "step 2"])

ara_cli/tests/test_ara_autofix.py

@@ -1,113 +0,0 @@
-import pytest
-from unittest.mock import patch, mock_open, MagicMock
-from ara_cli.artefact_autofix import (
-    read_report_file,
-    parse_report,
-    apply_autofix,
-    read_artefact,
-    determine_artefact_type_and_class,
-    run_agent,
-    write_corrected_artefact
-)
-from ara_cli.ara_command_action import autofix_action
-
-
-def test_read_report_file():
-    mock_content = "# Artefact Check Report\n\n## classifier\n- `file_path`: reason\n"
-    with patch("builtins.open", mock_open(read_data=mock_content)) as m:
-        content = read_report_file()
-        assert content == mock_content
-        m.assert_called_once_with(
-            "incompatible_artefacts_report.md", "r", encoding="utf-8")
-
-
-def test_parse_report():
-    content = "# Artefact Check Report\n\n## classifier\n- `file_path`: reason\n"
-    expected_issues = {"classifier": [("file_path", "reason")]}
-    issues = parse_report(content)
-    assert issues == expected_issues
-
-
-@patch("ara_cli.artefact_autofix.run_agent")
-@patch("ara_cli.artefact_autofix.write_corrected_artefact")
-def test_apply_autofix(mock_write_corrected_artefact, mock_run_agent):
-    mock_run_agent.return_value.serialize.return_value = "corrected content"
-    with patch("ara_cli.artefact_autofix.read_artefact", return_value="artefact text"):
-        with patch("ara_cli.artefact_autofix.determine_artefact_type_and_class", return_value=("ArtefactType", MagicMock())):
-            apply_autofix("file_path", "classifier", "reason")
-            mock_run_agent.assert_called_once()
-            mock_write_corrected_artefact.assert_called_once_with(
-                "file_path", "corrected content")
-
-
-@patch("ara_cli.artefact_autofix.apply_autofix")
-@patch("ara_cli.artefact_autofix.parse_report")
-@patch("ara_cli.artefact_autofix.read_report_file")
-def test_autofix_action(mock_read_report_file, mock_parse_report, mock_apply_autofix, capsys):
-    mock_read_report_file.return_value = "# Artefact Check Report\n\n## classifier\n- `file_path`: reason\n"
-    mock_parse_report.return_value = {"classifier": [("file_path", "reason")]}
-
-    args = MagicMock()
-    autofix_action(args)
-
-    captured = capsys.readouterr()
-    assert "Attempting to fix file_path for reason: reason" in captured.out
-    mock_apply_autofix.assert_called_once_with(
-        "file_path", "classifier", "reason")
-
-
-def test_read_artefact():
-    mock_content = "artefact content"
-    with patch("builtins.open", mock_open(read_data=mock_content)) as m:
-        content = read_artefact("file_path")
-        assert content == mock_content
-        m.assert_called_once_with("file_path", "r")
-
-
-def test_read_report_file_not_found(capsys):
-    with patch("builtins.open", side_effect=OSError("File not found")):
-        content = read_report_file()
-        captured = capsys.readouterr()
-        assert content is None
-        assert "Artefact scan results file not found" in captured.out
-
-
-def test_parse_report_no_issues():
-    content = "# Artefact Check Report\n\nNo problems found.\n"
-    issues = parse_report(content)
-    assert issues == {}
-
-
-def test_parse_report_invalid_format():
-    content = "Invalid Format"
-    issues = parse_report(content)
-    assert issues == {}
-
-
-def test_determine_artefact_type_and_class_invalid():
-    artefact_type, artefact_class = determine_artefact_type_and_class(
-        "invalid_classifier")
-    assert artefact_type is None
-    assert artefact_class is None
-
-
-def test_write_corrected_artefact():
-    corrected_content = "corrected content"
-    with patch("builtins.open", mock_open()) as m:
-        write_corrected_artefact("file_path", corrected_content)
-        m.assert_called_once_with("file_path", "w")
-        handle = m()
-        handle.write.assert_called_once_with(corrected_content)
-
-
-@patch("ara_cli.artefact_autofix.read_artefact", return_value=None)
-def test_apply_autofix_file_not_found(mock_read_artefact):
-    apply_autofix("file_path", "classifier", "reason")
-    mock_read_artefact.assert_called_once_with("file_path")
-
-
-@patch("pydantic_ai.Agent")
-def test_run_agent_exception_handling(mock_agent):
-    mock_agent.return_value.run_sync.side_effect = Exception("Agent error")
-    with pytest.raises(Exception, match="Agent error"):
-        run_agent("prompt", MagicMock())