ara-cli 0.1.10.0__py3-none-any.whl → 0.1.13.3__py3-none-any.whl

ara_cli/artefact_autofix.py

@@ -140,16 +140,11 @@ def construct_prompt(artefact_type, reason, file_path, artefact_text):
 
 
 def run_agent(prompt, artefact_class):
-    from pydantic_ai import Agent
-
-    # gpt-4o
-    # anthropic:claude-3-7-sonnet-20250219
-    # anthropic:claude-4-sonnet-20250514
-    agent = Agent(
-        model="anthropic:claude-4-sonnet-20250514",
-        output_type=artefact_class,
-        instrument=True,
-    )
+    from ara_cli.llm_utils import create_pydantic_ai_agent
+
+    # Use the shared agent creation logic which respects configuration and validation
+    agent = create_pydantic_ai_agent(output_type=artefact_class, instrument=True)
+
     result = agent.run_sync(prompt)
     return result.output
 
@@ -161,7 +156,7 @@ def write_corrected_artefact(file_path, corrected_text):
 
 
 def ask_for_correct_contribution(
-    artefact_info: Optional[tuple[str, str]] = None
+    artefact_info: Optional[tuple[str, str]] = None,
 ) -> tuple[str, str]:
     """
     Ask the user to provide a valid contribution when no match can be found.
@@ -199,8 +194,12 @@ def ask_for_correct_contribution(
     return name, classifier
 
 
-def ask_for_contribution_choice(choices: List[str], artefact_info: Optional[tuple[str, str]] = None) -> Optional[str]:
-    artefact_name, artefact_classifier = artefact_info if artefact_info else (None, None)
+def ask_for_contribution_choice(
+    choices: List[str], artefact_info: Optional[tuple[str, str]] = None
+) -> Optional[str]:
+    artefact_name, artefact_classifier = (
+        artefact_info if artefact_info else (None, None)
+    )
     message = "Found multiple close matches for the contribution"
     if artefact_name and artefact_classifier:
         message += f" of the {artefact_classifier} '{artefact_name}'"
@@ -248,7 +247,11 @@ def ask_for_rule_choice(matches: List[str]) -> Optional[str]:
 
 
 def _update_rule(
-    artefact: Artefact, name: str, classifier: str, classified_file_info: dict, delete_if_not_found: bool = False
+    artefact: Artefact,
+    name: str,
+    classifier: str,
+    classified_file_info: dict,
+    delete_if_not_found: bool = False,
 ) -> None:
     """Updates the rule in the contribution if a close match is found."""
     rule = artefact.contribution.rule
@@ -317,7 +320,9 @@ def set_closest_contribution(
     classifier = contribution.classifier
     rule = contribution.rule
 
-    classified_file_info = populate_classified_artefact_info(classified_artefact_info=classified_file_info)
+    classified_file_info = populate_classified_artefact_info(
+        classified_artefact_info=classified_file_info
+    )
 
     all_artefact_names = extract_artefact_names_of_classifier(
         classified_files=classified_file_info, classifier=classifier
@@ -385,12 +390,12 @@ def fix_scenario_placeholder_mismatch(
     lines = artefact_text.splitlines()
     new_lines = []
     i = 0
-    
+
     while i < len(lines):
         line = lines[i]
         stripped_line = line.strip()
-        
-        if stripped_line.startswith('Scenario:'):
+
+        if stripped_line.startswith("Scenario:"):
             scenario_lines, next_index = _extract_scenario_block(lines, i)
             processed_lines = _process_scenario_block(scenario_lines)
             new_lines.extend(processed_lines)
@@ -398,7 +403,7 @@ def fix_scenario_placeholder_mismatch(
         else:
             new_lines.append(line)
             i += 1
-    
+
     return "\n".join(new_lines)
 
 
@@ -406,20 +411,20 @@ def _extract_scenario_block(lines: list, start_index: int) -> tuple[list, int]:
     """Extract all lines belonging to a scenario block."""
     scenario_lines = [lines[start_index]]
     j = start_index + 1
-    
+
     while j < len(lines):
         next_line = lines[j].strip()
         if _is_scenario_boundary(next_line):
             break
         scenario_lines.append(lines[j])
         j += 1
-    
+
     return scenario_lines, j
 
 
 def _is_scenario_boundary(line: str) -> bool:
     """Check if a line marks the boundary of a scenario block."""
-    boundaries = ['Scenario:', 'Scenario Outline:', 'Background:', 'Feature:']
+    boundaries = ["Scenario:", "Scenario Outline:", "Background:", "Feature:"]
     return any(line.startswith(boundary) for boundary in boundaries)
 
 
@@ -427,38 +432,38 @@ def _process_scenario_block(scenario_lines: list) -> list:
     """Process a scenario block and convert to outline if placeholders are found."""
     if not scenario_lines:
         return scenario_lines
-    
+
     first_line = scenario_lines[0]
     indentation = _get_line_indentation(first_line)
     placeholders = _extract_placeholders_from_scenario(scenario_lines[1:])
-    
+
     if not placeholders:
         return scenario_lines
-    
+
     return _convert_to_scenario_outline(scenario_lines, placeholders, indentation)
 
 
 def _get_line_indentation(line: str) -> str:
     """Get the indentation of a line."""
-    return line[:len(line) - len(line.lstrip())]
+    return line[: len(line) - len(line.lstrip())]
 
 
 def _extract_placeholders_from_scenario(step_lines: list) -> set:
     """Extract placeholders from scenario step lines, ignoring docstrings."""
     placeholders = set()
     in_docstring = False
-    
+
     for line in step_lines:
         step_line = line.strip()
         if not step_line:
             continue
-            
+
         in_docstring = _update_docstring_state(step_line, in_docstring)
-        
+
         if not in_docstring and '"""' not in step_line:
-            found = re.findall(r'<([^>]+)>', step_line)
+            found = re.findall(r"<([^>]+)>", step_line)
             placeholders.update(found)
-    
+
     return placeholders
 
 
@@ -469,34 +474,36 @@ def _update_docstring_state(line: str, current_state: bool) -> bool:
     return current_state
 
 
-def _convert_to_scenario_outline(scenario_lines: list, placeholders: set, indentation: str) -> list:
+def _convert_to_scenario_outline(
+    scenario_lines: list, placeholders: set, indentation: str
+) -> list:
     """Convert scenario lines to scenario outline format with examples table."""
     first_line = scenario_lines[0]
-    title = first_line.strip()[len('Scenario:'):].strip()
-    
+    title = first_line.strip()[len("Scenario:") :].strip()
+
     new_lines = [f"{indentation}Scenario Outline: {title}"]
     new_lines.extend(scenario_lines[1:])
     new_lines.append("")
-    
+
     examples_lines = _create_examples_table(placeholders, indentation)
     new_lines.extend(examples_lines)
-    
+
     return new_lines
 
 
 def _create_examples_table(placeholders: set, base_indentation: str) -> list:
     """Create the Examples table for the scenario outline."""
     examples_indentation = base_indentation + "    "
-    table_indentation = examples_indentation + "  "
-    
+    table_indentation = examples_indentation + " "
+
     sorted_placeholders = sorted(placeholders)
     header = "| " + " | ".join(sorted_placeholders) + " |"
     sample_row = "| " + " | ".join(f"<{p}_value>" for p in sorted_placeholders) + " |"
-    
+
     return [
         f"{examples_indentation}Examples:",
         f"{table_indentation}{header}",
-        f"{table_indentation}{sample_row}"
+        f"{table_indentation}{sample_row}",
     ]
 
 
@@ -539,7 +546,9 @@ def fix_contribution(
     classified_artefact_info: dict,
     **kwargs,
 ):
-    classified_artefact_info = populate_classified_artefact_info(classified_artefact_info=classified_artefact_info)
+    classified_artefact_info = populate_classified_artefact_info(
+        classified_artefact_info=classified_artefact_info
+    )
     artefact = artefact_class.deserialize(artefact_text)
     artefact, _ = set_closest_contribution(artefact)
     artefact_text = artefact.serialize()
@@ -553,7 +562,9 @@ def fix_rule(
     classified_artefact_info: dict,
     **kwargs,
 ):
-    classified_artefact_info = populate_classified_artefact_info(classified_artefact_info=classified_artefact_info)
+    classified_artefact_info = populate_classified_artefact_info(
+        classified_artefact_info=classified_artefact_info
+    )
     artefact = artefact_class.deserialize(artefact_text)
     contribution = artefact.contribution
     assert contribution is not None
@@ -562,11 +573,13 @@ def fix_rule(
         name=contribution.artefact_name,
         classifier=contribution.classifier,
         classified_file_info=classified_artefact_info,
-        delete_if_not_found=True
+        delete_if_not_found=True,
+    )
+    feedback_message = (
+        f"Updating contribution of {artefact._artefact_type().value} "
+        f"'{artefact.title}' to {contribution.classifier} "
+        f"'{contribution.artefact_name}' "
     )
-    feedback_message = (f"Updating contribution of {artefact._artefact_type().value} "
-                        f"'{artefact.title}' to {contribution.classifier} "
-                        f"'{contribution.artefact_name}' ")
     rule = contribution.rule
     if rule:
         feedback_message += f"with rule '{rule}'"
@@ -576,7 +589,47 @@ def fix_rule(
     return artefact.serialize()
 
 
-def should_skip_issue(deterministic_issue, deterministic, non_deterministic, file_path) -> bool:
+def fix_misplaced_content(file_path: str, artefact_text: str, **kwargs) -> str:
+    """
+    Deterministically fixes content like 'Rule:' or 'Estimate:' misplaced in the description.
+    """
+    lines = artefact_text.splitlines()
+
+    desc_start_idx = -1
+    for i, line in enumerate(lines):
+        if line.strip().startswith("Description:"):
+            desc_start_idx = i
+            break
+
+    if desc_start_idx == -1:
+        return artefact_text  # No description, nothing to fix.
+
+    pre_desc_lines = lines[:desc_start_idx]
+    desc_line = lines[desc_start_idx]
+    post_desc_lines = lines[desc_start_idx + 1 :]
+
+    misplaced_content = []
+    new_post_desc_lines = []
+
+    for line in post_desc_lines:
+        if line.strip().startswith("Rule:") or line.strip().startswith("Estimate:"):
+            misplaced_content.append(line)
+        else:
+            new_post_desc_lines.append(line)
+
+    if not misplaced_content:
+        return artefact_text
+
+    # Rebuild the file content
+    final_lines = (
+        pre_desc_lines + misplaced_content + [""] + [desc_line] + new_post_desc_lines
+    )
+    return "\n".join(final_lines)
+
+
+def should_skip_issue(
+    deterministic_issue, deterministic, non_deterministic, file_path
+) -> bool:
     if not non_deterministic and not deterministic_issue:
         print(f"Skipping non-deterministic fix for {file_path} as per request.")
         return True
@@ -585,15 +638,23 @@ def should_skip_issue(deterministic_issue, deterministic, non_deterministic, fil
         return True
     return False
 
+
 def determine_attempt_count(single_pass, file_path) -> int:
     if single_pass:
         print(f"Single-pass mode enabled for {file_path}. Running for 1 attempt.")
         return 1
     return 3
 
+
 def apply_deterministic_fix(
-    deterministic, deterministic_issue, file_path, artefact_text, artefact_class, classified_artefact_info,
-    deterministic_markers_to_functions, corrected_text
+    deterministic,
+    deterministic_issue,
+    file_path,
+    artefact_text,
+    artefact_class,
+    classified_artefact_info,
+    deterministic_markers_to_functions,
+    corrected_text,
 ) -> str:
     if deterministic and deterministic_issue:
         print(f"Applying deterministic fix for '{deterministic_issue}'...")
@@ -606,9 +667,16 @@ def apply_deterministic_fix(
         )
     return corrected_text
 
+
 def apply_non_deterministic_fix(
-    non_deterministic, deterministic_issue, corrected_text,
-    artefact_type, current_reason, file_path, artefact_text, artefact_class
+    non_deterministic,
+    deterministic_issue,
+    corrected_text,
+    artefact_type,
+    current_reason,
+    file_path,
+    artefact_text,
+    artefact_class,
 ) -> Optional[str]:
     """
     Applies LLM fix. Return None in case of an exception
@@ -622,10 +690,11 @@ def apply_non_deterministic_fix(
             corrected_artefact = run_agent(prompt, artefact_class)
             corrected_text = corrected_artefact.serialize()
         except Exception as e:
-            print(f"   ❌ LLM agent failed to fix artefact at {file_path}: {e}")
+            print(f"    ❌ LLM agent failed to fix artefact at {file_path}: {e}")
             return None
     return corrected_text
 
+
 def attempt_autofix_loop(
     file_path: str,
     artefact_type,
@@ -651,7 +720,7 @@ def attempt_autofix_loop(
         print(
             f"Attempting to fix {file_path} (Attempt {attempt + 1}/{max_attempts})..."
         )
-        print(f"   Reason: {current_reason}")
+        print(f"    Reason: {current_reason}")
 
         artefact_text = read_artefact(file_path)
         if artefact_text is None:
@@ -666,35 +735,53 @@ def attempt_autofix_loop(
             None,
         )
 
-        if should_skip_issue(deterministic_issue, deterministic, non_deterministic, file_path):
+        if should_skip_issue(
+            deterministic_issue, deterministic, non_deterministic, file_path
+        ):
             return False
 
         corrected_text = None
 
         corrected_text = apply_deterministic_fix(
-            deterministic, deterministic_issue, file_path, artefact_text,
-            artefact_class, classified_artefact_info,
-            deterministic_markers_to_functions, corrected_text
+            deterministic,
+            deterministic_issue,
+            file_path,
+            artefact_text,
+            artefact_class,
+            classified_artefact_info,
+            deterministic_markers_to_functions,
+            corrected_text,
         )
         corrected_text = apply_non_deterministic_fix(
-            non_deterministic, deterministic_issue, corrected_text,
-            artefact_type, current_reason, file_path, artefact_text, artefact_class
+            non_deterministic,
+            deterministic_issue,
+            corrected_text,
+            artefact_type,
+            current_reason,
+            file_path,
+            artefact_text,
+            artefact_class,
         )
 
         if corrected_text is None or corrected_text.strip() == artefact_text.strip():
             print(
-                "   Fixing attempt did not alter the file. Stopping to prevent infinite loop."
+                "    Fixing attempt did not alter the file. Stopping to prevent infinite loop."
             )
             return False
 
         write_corrected_artefact(file_path, corrected_text)
 
-        print("   File modified. Re-classifying artefact information for next check...")
-        classified_artefact_info = populate_classified_artefact_info(classified_artefact_info, force=True)
+        print(
+            "    File modified. Re-classifying artefact information for next check..."
+        )
+        classified_artefact_info = populate_classified_artefact_info(
+            classified_artefact_info, force=True
+        )
 
     print(f"❌ Failed to fix {file_path} after {max_attempts} attempts.")
     return False
 
+
 def apply_autofix(
     file_path: str,
     classifier: str,
@@ -713,13 +800,17 @@ def apply_autofix(
         "Invalid Contribution Reference": fix_contribution,
         "Rule Mismatch": fix_rule,
         "Scenario Contains Placeholders": fix_scenario_placeholder_mismatch,
+        "Found 'Rule:' inside description": fix_misplaced_content,
+        "Found 'Estimate:' inside description": fix_misplaced_content,
     }
 
     artefact_type, artefact_class = determine_artefact_type_and_class(classifier)
     if artefact_type is None or artefact_class is None:
         return False
 
-    classified_artefact_info = populate_classified_artefact_info(classified_artefact_info)
+    classified_artefact_info = populate_classified_artefact_info(
+        classified_artefact_info
+    )
     max_attempts = determine_attempt_count(single_pass, file_path)
 
     return attempt_autofix_loop(