ara-cli 0.1.9.65__tar.gz → 0.1.9.67__tar.gz

{ara_cli-0.1.9.65 → ara_cli-0.1.9.67}/MANIFEST.in

@@ -1,2 +1,4 @@
 recursive-include ara_cli/templates *
 recursive-include ara_cli/artefact_models *
+
+include docker/base/requirements.txt

{ara_cli-0.1.9.65 → ara_cli-0.1.9.67}/PKG-INFO

@@ -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 → ara_cli-0.1.9.67}/README.md

@@ -46,7 +46,7 @@ To update dependencies, add package names in `setup.py`. The packages will ONLY
 3. --> in container --> for behave BDD tests `bash test-feature.sh` 
 3. a) --> in container --> for only 1 test: behave ara/features/<name>.feature
 3. b) --> in container --> for unit tests and (if successful) feature tests: `bash test-all.sh` 
-4. --> in container --> for unit tests in folder ara_cli `pytest --cov=. --cov-report term-missing ara_cli/tests/ `
+4. --> in container --> for unit tests in folder ara_cli `pytest --cov=. --cov-report term-missing tests/ `
 5. --> in container --> example for running a single unit test in ara_cli folder `pytest tests/test_template_manager.py::test_files_created_from_template`
 6. if change is successfull always commit before proceeding with next change
 7. if change was successfully reviewd merge in gitlab: https://git.talsen.team/talsen-products/ara-cli/-/merge_requests/new

{ara_cli-0.1.9.65 → ara_cli-0.1.9.67}/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-0.1.9.65 → ara_cli-0.1.9.67}/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-0.1.9.65 → ara_cli-0.1.9.67}/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-0.1.9.65 → ara_cli-0.1.9.67}/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-0.1.9.65 → ara_cli-0.1.9.67}/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-0.1.9.65 → ara_cli-0.1.9.67}/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-0.1.9.65 → ara_cli-0.1.9.67}/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-0.1.9.65 → ara_cli-0.1.9.67}/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 → ara_cli-0.1.9.67}/ara_cli.egg-info/PKG-INFO

@@ -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 → ara_cli-0.1.9.67}/ara_cli.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ ara_cli.egg-info/dependency_links.txt
 ara_cli.egg-info/entry_points.txt
 ara_cli.egg-info/requires.txt
 ara_cli.egg-info/top_level.txt
+ara_cli/artefact_models/__init__.py
 ara_cli/artefact_models/artefact_load.py
 ara_cli/artefact_models/artefact_mapping.py
 ara_cli/artefact_models/artefact_model.py
@@ -139,23 +140,24 @@ ara_cli/templates/specification_breakdown_files/template.step.exploration.md
 ara_cli/templates/specification_breakdown_files/template.step.md
 ara_cli/templates/specification_breakdown_files/template.technology.exploration.md
 ara_cli/templates/specification_breakdown_files/template.technology.md
-ara_cli/tests/__init__.py
-ara_cli/tests/test_ara_autofix.py
-ara_cli/tests/test_ara_command_action.py
-ara_cli/tests/test_ara_config.py
-ara_cli/tests/test_artefact_fuzzy_search.py
-ara_cli/tests/test_artefact_link_updater.py
-ara_cli/tests/test_artefact_lister.py
-ara_cli/tests/test_artefact_reader.py
-ara_cli/tests/test_artefact_renamer.py
-ara_cli/tests/test_artefact_scan.py
-ara_cli/tests/test_chat.py
-ara_cli/tests/test_classifier.py
-ara_cli/tests/test_directory_navigator.py
-ara_cli/tests/test_file_classifier.py
-ara_cli/tests/test_file_creator.py
-ara_cli/tests/test_file_lister.py
-ara_cli/tests/test_list_filter.py
-ara_cli/tests/test_tag_extractor.py
-ara_cli/tests/test_template_manager.py
-ara_cli/tests/test_update_config_prompt.py
+docker/base/requirements.txt
+tests/__init__.py
+tests/test_ara_autofix.py
+tests/test_ara_command_action.py
+tests/test_ara_config.py
+tests/test_artefact_fuzzy_search.py
+tests/test_artefact_link_updater.py
+tests/test_artefact_lister.py
+tests/test_artefact_reader.py
+tests/test_artefact_renamer.py
+tests/test_artefact_scan.py
+tests/test_chat.py
+tests/test_classifier.py
+tests/test_directory_navigator.py
+tests/test_file_classifier.py
+tests/test_file_creator.py
+tests/test_file_lister.py
+tests/test_list_filter.py
+tests/test_tag_extractor.py
+tests/test_template_manager.py
+tests/test_update_config_prompt.py

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

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

ara_cli-0.1.9.67/docker/base/requirements.txt

@@ -0,0 +1,12 @@
+litellm
+llama-index
+llama-index-llms-openai
+llama-index-retrievers-bm25
+openai
+markdown-it-py
+json-repair
+argparse
+argcomplete
+cmd2>=2.5
+pydantic
+pydantic_ai

{ara_cli-0.1.9.65 → ara_cli-0.1.9.67}/setup.py

@@ -5,6 +5,9 @@ version = {}
 with open("./ara_cli/version.py") as fp:
     exec(fp.read(), version)
 
+with open("./docker/base/requirements.txt", "r") as pip_reqs_file:
+    reqs = [line.strip() for line in pip_reqs_file.readlines()]
+
 setup(
     name="ara_cli",
     version=version['__version__'],
@@ -15,18 +18,5 @@ setup(
             "ara = ara_cli.__main__:cli",
         ],
     },
-    install_requires=[
-        'litellm',
-        'llama-index',
-        'llama-index-llms-openai',
-        'llama-index-retrievers-bm25',
-        'openai',
-        'markdown-it-py',
-        'json-repair',
-        'argparse',
-        'argcomplete',
-        'cmd2>=2.5',
-        'pydantic',
-        'pydantic_ai'
-    ],
+    install_requires=reqs,
 )