ara-cli 0.1.9.68__py3-none-any.whl → 0.1.9.70__py3-none-any.whl

ara_cli/artefact_scan.py

@@ -2,13 +2,21 @@ from textwrap import indent
 import os
 
 
-def check_file(file_path, artefact_class):
+def check_file(file_path, artefact_class, classified_artefact_info=None):
     from pydantic import ValidationError
+    from ara_cli.artefact_fuzzy_search import extract_artefact_names_of_classifier
+    from ara_cli.file_classifier import FileClassifier
+
     try:
         with open(file_path, "r", encoding="utf-8") as f:
             content = f.read()
     except OSError as e:
         return False, f"File error: {e}"
+
+    if not classified_artefact_info:
+        file_classifier = FileClassifier(os)
+        classified_artefact_info = file_classifier.classify_files()
+
     try:
         artefact_instance = artefact_class.deserialize(content)
 
@@ -19,6 +27,23 @@ def check_file(file_path, artefact_class):
             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
+        
+        # Check contribution reference validity
+        contribution = artefact_instance.contribution
+        if contribution and contribution.artefact_name and contribution.classifier:
+            
+            # Find all artefact names of the referenced classifier
+            all_artefact_names = extract_artefact_names_of_classifier(
+                classified_files=classified_artefact_info,
+                classifier=contribution.classifier
+            )
+            
+            # Check if the referenced artefact exists
+            if contribution.artefact_name not in all_artefact_names:
+                reason = (f"Invalid Contribution Reference: The contribution references "
+                          f"'{contribution.classifier}' artefact '{contribution.artefact_name}' "
+                          f"which does not exist.")
+                return False, reason
 
         return True, None
     except (ValidationError, ValueError, AssertionError) as e:
@@ -37,7 +62,7 @@ def find_invalid_files(classified_artefact_info, classifier):
             continue
         if ".data" in artefact_info["file_path"]:
             continue
-        is_valid, reason = check_file(artefact_info["file_path"], artefact_class)
+        is_valid, reason = check_file(artefact_info["file_path"], artefact_class, classified_artefact_info)
         if not is_valid:
             invalid_files.append((artefact_info["file_path"], reason))
     return invalid_files

ara_cli/file_classifier.py

@@ -1,6 +1,6 @@
 from ara_cli.classifier import Classifier
 from ara_cli.artefact_models.artefact_model import Artefact
-from ara_cli.artefact_fuzzy_search import find_closest_name_match
+from ara_cli.artefact_fuzzy_search import find_closest_name_matches
 from functools import lru_cache
 from typing import Optional
 import textwrap
@@ -17,7 +17,7 @@ class FileClassifier:
             info["title"] for info in classified_artefacts.get(classifier, [])]
         if name in all_artefact_names:
             return name
-        return find_closest_name_match(name, all_artefact_names)
+        return find_closest_name_matches(name, all_artefact_names)
 
     @lru_cache(maxsize=None)
     def read_file_content(self, file_path):

ara_cli/prompt_handler.py

@@ -3,7 +3,7 @@ import litellm
 from ara_cli.classifier import Classifier
 from ara_cli.artefact_creator import ArtefactCreator
 from ara_cli.template_manager import TemplatePathManager
-from ara_cli.ara_config import ConfigManager
+from ara_cli.ara_config import ConfigManager, LLMConfigItem
 from ara_cli.file_lister import generate_markdown_listing
 from os.path import exists, join
 import os
@@ -20,15 +20,15 @@ class LLMSingleton:
 
     def __init__(self, model_id):
         config = ConfigManager().get_config()
-        llm_config = config.llm_config
-        selected_config = llm_config[str(model_id)]
+        selected_config = config.llm_config.get(str(model_id))
 
         if not selected_config:
             raise ValueError(f"No configuration found for the model: {model_id}")
 
         LLMSingleton._model = model_id
-
-        self.config_parameters = selected_config
+        
+        # Typesafe for None values inside the config.
+        self.config_parameters = selected_config.model_dump(exclude_none=True)
 
         LLMSingleton._instance = self
 
@@ -74,15 +74,14 @@ def read_string_from_file(path):
 def send_prompt(prompt):
     chat = LLMSingleton.get_instance()
 
-    # remove provider from config parameters
     config_parameters = chat.config_parameters.copy()
-    del config_parameters["provider"]
+    if "provider" in config_parameters:
+        del config_parameters["provider"]
 
     completion = litellm.completion(
         **config_parameters,
         messages=prompt,
-        stream=True,
-        max_tokens=32768
+        stream=True
     )
     for chunk in completion:
         yield chunk
@@ -95,7 +94,7 @@ def append_headings(classifier, param, heading_name):
 
     # Check if the file exists, and if not, create an empty file
     if not os.path.exists(artefact_data_path):
-        with open(artefact_data_path, 'w') as file:
+        with open(artefact_data_path, 'w', encoding='utf-8') as file:
             file.write("")
 
     content = read_string_from_file(artefact_data_path)
@@ -127,7 +126,7 @@ def prompt_data_directory_creation(classifier, parameter):
 
 
 def get_file_content(path):
-    with open(path, 'r') as file:
+    with open(path, 'r', encoding='utf-8') as file:
         return file.read()
 
 
@@ -161,7 +160,7 @@ def load_selected_prompt_templates(classifier, parameter):
         print("WARNING: config.prompt_templates.md does not exist.")
         return
 
-    with open(config_file_path, 'r') as config_file:
+    with open(config_file_path, 'r', encoding='utf-8') as config_file:
         content = config_file.read()
 
     global_base_template_path = TemplatePathManager.get_template_base_path()
@@ -253,7 +252,7 @@ def extract_and_load_markdown_files(md_prompt_file_path):
     """
     header_stack = []
     path_accumulator = []
-    with open(md_prompt_file_path, 'r') as file:
+    with open(md_prompt_file_path, 'r', encoding='utf-8') as file:
         for line in file:
             if line.strip().startswith('#'):
                 level = line.count('#')
@@ -322,7 +321,7 @@ def get_partial_file_content(file_name, line_ranges):
         lines_to_read.extend(range(start, end + 1))
 
     partial_content = []
-    with open(file_name, 'r') as file:
+    with open(file_name, 'r', encoding='utf-8') as file:
         for i, line in enumerate(file, 1):
             if i in lines_to_read:
                 partial_content.append(line)
@@ -372,7 +371,7 @@ def create_and_send_custom_prompt(classifier, parameter):
     extensions = [".rules.md", ".prompt_givens.md", ".intention.md", ".commands.md"]
     combined_content_markdown, image_data_list = collect_file_content_by_extension(prompt_data_path, extensions)
 
-    with open(prompt_file_path_markdown, 'w') as file:
+    with open(prompt_file_path_markdown, 'w', encoding='utf-8') as file:
         file.write(combined_content_markdown)
 
     prompt = read_string_from_file(prompt_file_path_markdown)
@@ -390,7 +389,7 @@ def create_and_send_custom_prompt(classifier, parameter):
     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:
+    with open(artefact_data_path, 'a', encoding='utf-8') as file:
         for chunk in send_prompt(message_list):
             chunk_content = chunk.choices[0].delta.content
             if not chunk_content:
@@ -424,7 +423,7 @@ def generate_config_prompt_givens_file(prompt_data_path, config_prompt_givens_na
         print(f"artefact {artefact_to_mark} marked in related config.prompt_givens.md per default")
 
         # Read the generated file content
-        with open(config_prompt_givens_path, 'r') as file:
+        with open(config_prompt_givens_path, 'r', encoding='utf-8') as file:
             markdown_listing = file.readlines()
 
         updated_listing = []
@@ -435,5 +434,5 @@ def generate_config_prompt_givens_file(prompt_data_path, config_prompt_givens_na
             updated_listing.append(line)
 
         # Write the updated listing back to the file
-        with open(config_prompt_givens_path, 'w') as file:
-            file.write("".join(updated_listing))
+        with open(config_prompt_givens_path, 'w', encoding='utf-8') as file:
+            file.write("".join(updated_listing))

ara_cli/version.py

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

{ara_cli-0.1.9.68.dist-info → ara_cli-0.1.9.70.dist-info}/METADATA

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

{ara_cli-0.1.9.68.dist-info → ara_cli-0.1.9.70.dist-info}/RECORD

@@ -1,37 +1,37 @@
 ara_cli/__init__.py,sha256=0zl7IegxTid26EBGLav_fXZ4CCIV3H5TfAoFQiOHjvg,148
 ara_cli/__main__.py,sha256=Z6XYWRLceIoZPvfC-X9EXouSZdtFOOe84kKVWJGA4r4,1861
-ara_cli/ara_command_action.py,sha256=dD97IeH7x5udKC_APk5TbuVXPiyU2XSBV2uqy52nQ9A,21625
+ara_cli/ara_command_action.py,sha256=aq074NT63xsuyIJgGnM0htp7kpyolaLwtauXjQEPljA,21852
 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/ara_config.py,sha256=EBVxVXJauWNmLVSDeTdNvncO0z1avR3hN9mkJhPmaU0,4183
+ara_cli/artefact_autofix.py,sha256=F4Vp-SI6YI0rKeVswOlg23OemH7w4CEJ9-ChcqIpn4U,14866
 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
+ara_cli/artefact_fuzzy_search.py,sha256=iBlDqjZf-_D3VUjFf7ZwkiQbpQDcwRndIU7aG_sRTgE,2668
 ara_cli/artefact_link_updater.py,sha256=itMS_Z64jE8bBly9WA01z8PqkBeNW6ntTO7ryMeCTRg,3703
 ara_cli/artefact_lister.py,sha256=jhk4n4eqp7hDIq07q43QzS7-36BM3OfZ4EABxCeOGcw,4764
-ara_cli/artefact_reader.py,sha256=_RqBY1f1DWH2DThXETYuHeTB2ip0wgYuGvHYI_D6EJ4,8062
+ara_cli/artefact_reader.py,sha256=zVR3DZ4z6vjKPQnFZVbPS75MkluaoLkz0lWmg_hXxTY,8136
 ara_cli/artefact_renamer.py,sha256=loIn1DF9kVnjhH7wP1v5qUvt3s0uKeWXuQPrHXenQGE,4025
-ara_cli/artefact_scan.py,sha256=J3aCAOltVr1oS6Lwnv51gtZC_G8faORGTccFY3kkBX4,2368
+ara_cli/artefact_scan.py,sha256=ZB5mZkFto3K5xg_nZsQekWz5Ly7X0WyHnBsvPL3sC6I,3599
 ara_cli/chat.py,sha256=7xTtPEDk052_wmIzoti7GavEJ1vpRxe5c084WQ1C7dg,28617
 ara_cli/classifier.py,sha256=zWskj7rBYdqYBGjksBm46iTgVU5IIf2PZsJr4qeiwVU,1878
 ara_cli/codefusionretriever.py,sha256=fCHgXdIBRzkVAnapX-KI2NQ44XbrrF4tEQmn5J6clUI,1980
 ara_cli/codehierachieretriever.py,sha256=Xd3EgEWWhkSf1TmTWtf8X5_YvyE_4B66nRrqarwSiTU,1182
 ara_cli/commandline_completer.py,sha256=b00Dqb5n7SecpxYIDLxAfYhp8X6e3c8a5qYz6ko0i3E,1192
 ara_cli/directory_navigator.py,sha256=6QbSAjJrJ5a6Lutol9J4HFgVDMiAQ672ny9TATrh04U,3318
-ara_cli/file_classifier.py,sha256=JsY7Y_D8WL-fiWz57zwzttg6SEajxWVxpDkFG_149-Q,3967
+ara_cli/file_classifier.py,sha256=26MPVCaZlQkRDa62FoQ6ZqawOiaNgspUvcFOF93bHzo,3971
 ara_cli/file_lister.py,sha256=VFpUmHU1d6sQvJWSeuFqkZZ0Ci3ZYCUtAUfvgWypaYU,2314
 ara_cli/filename_validator.py,sha256=Aw9PL8d5-Ymhp3EY6lDrUBk3cudaNqo1Uw5RzPpI1jA,118
 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=qHq2COt6rIby3tO49IXOt-CLnOlNTgCTFkAUjxrfaTc,17459
+ara_cli/prompt_handler.py,sha256=ukYWR_AMDd8nfGkeUKyYQ8PO_-PfO8x9tV1kNcNWOT4,17672
 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=qsRulH7BZ8x-z1VK67VqaUHu1vUfJ7cgIUVvWmlyke4,146
+ara_cli/version.py,sha256=_1Hbcx99RFW-ZzwbZEWia-OGS77hOyexYcSKcpQKm_Y,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
@@ -41,7 +41,7 @@ ara_cli/artefact_models/businessgoal_artefact_model.py,sha256=jqYFMXjWle0YW9RvcF
 ara_cli/artefact_models/capability_artefact_model.py,sha256=SZqHx4O2mj4urn77Stnj4_Jxtlq3-LgBBU9SMkByppI,3079
 ara_cli/artefact_models/epic_artefact_model.py,sha256=IadQWs6SWNcLgwvtOQWmYDyV9xLr3WwAsx-YMFan5fA,5765
 ara_cli/artefact_models/example_artefact_model.py,sha256=UXrKbaPotg1jwcrVSdCeo-XH4tTD_-U1e3giaBn5_xg,1384
-ara_cli/artefact_models/feature_artefact_model.py,sha256=BeLsq9ZinzIDwss8nurIbxJZQ2qPgyRKRHrRlrl-zHA,15583
+ara_cli/artefact_models/feature_artefact_model.py,sha256=JvgBKsiI1Y5Cs_0Ygn6lttJIjCpEC9XyZieDExUnsvg,18386
 ara_cli/artefact_models/issue_artefact_model.py,sha256=v6CpKnkqiUh6Wch2kkEmyyW49c8ysdy1qz8l1Ft9uJA,2552
 ara_cli/artefact_models/keyfeature_artefact_model.py,sha256=a3MyAiePN9n_GTN6QkTvamdsaorwVUff6w-9CdRZSlo,4243
 ara_cli/artefact_models/serialize_helper.py,sha256=0XCruO70-fyfLfTn7pnt8NrSQe79eYNUAjuQaV8K6_8,586
@@ -132,27 +132,27 @@ ara_cli/templates/specification_breakdown_files/template.step.md,sha256=nzDRl9Xo
 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
 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_autofix.py,sha256=0Y6z5EXTEDUbZb-xxWNhaVUKnhxVVS3w2YZWTvyvoZs,12103
 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_artefact_scan.py,sha256=R-L3JDWV1xH9fneGJoyDEjy2lvKpJLBck5ISTF2MmNs,7476
 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_classifier.py,sha256=kLWPiePu3F5mkVuI_lK_2QlLh2kXD_Mt2K8KZZ1fAnA,10940
 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.68.dist-info/METADATA,sha256=3k2Jl8M-AkkRS7sc_8YQWmNfHCxhVtdRAT1bdKYVxvk,415
-ara_cli-0.1.9.68.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.68.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.68.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
-ara_cli-0.1.9.68.dist-info/RECORD,,
+ara_cli-0.1.9.70.dist-info/METADATA,sha256=im6yqXsHO5Nxn5Jhckz1n16ZUWxDqGiQcDsYLi3xJoA,415
+ara_cli-0.1.9.70.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.9.70.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.9.70.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
+ara_cli-0.1.9.70.dist-info/RECORD,,