ara-cli 0.1.9.60__py3-none-any.whl → 0.1.9.61__py3-none-any.whl

ara_cli/artefact_creator.py

@@ -59,9 +59,9 @@ class ArtefactCreator:
 
         return True
 
-    def handle_existing_files(self, file_exists, dir_exists):
-        if file_exists or dir_exists:
-            user_choice = input("File or directory already exists. Do you want to overwrite the existing file and directory? (y/N): ")
+    def handle_existing_files(self, file_exists):
+        if file_exists:
+            user_choice = input("File already exists. Do you want to overwrite the existing file and directory? (y/N): ")
             if user_choice.lower() != "y":
                 print("No changes were made to the existing file and directory.")
                 return False
@@ -102,12 +102,8 @@ class ArtefactCreator:
         dir_path = self.file_system.path.join(sub_directory, f"{filename}.data")
 
         file_exists = self.file_system.path.exists(file_path)
-        dir_exists = self.file_system.path.exists(dir_path)
 
-        if dir_exists and not os.listdir(dir_path):
-            dir_exists = False
-
-        if not self.handle_existing_files(file_exists, dir_exists):
+        if not self.handle_existing_files(file_exists):
             return
 
         artefact = template_artefact_of_type(classifier, filename)

ara_cli/artefact_models/businessgoal_artefact_model.py

@@ -48,6 +48,7 @@ class BusinessgoalIntent(Intent):
 
         in_order_to_prefix = "In order to "
         as_a_prefix = "As a "
+        as_a_prefix_alt = "As an "
         i_want_prefix = "I want "
 
         index = start_index
@@ -57,6 +58,8 @@ class BusinessgoalIntent(Intent):
                 in_order_to = line[len(in_order_to_prefix):].strip()
             elif line.startswith(as_a_prefix) and not as_a:
                 as_a = line[len(as_a_prefix):].strip()
+            elif line.startswith(as_a_prefix_alt) and not as_a:
+                as_a = line[len(as_a_prefix_alt):].strip()
             elif line.startswith(i_want_prefix) and not i_want:
                 i_want = line[len(i_want_prefix):].strip()
             index += 1

ara_cli/artefact_models/epic_artefact_model.py

@@ -49,6 +49,7 @@ class EpicIntent(Intent):
 
         in_order_to_prefix = "In order to "
         as_a_prefix = "As a "
+        as_a_prefix_alt = "As an "
         i_want_prefix = "I want "
 
         index = start_index
@@ -58,6 +59,8 @@ class EpicIntent(Intent):
                 in_order_to = line[len(in_order_to_prefix):].strip()
             elif line.startswith(as_a_prefix) and not as_a:
                 as_a = line[len(as_a_prefix):].strip()
+            elif line.startswith(as_a_prefix_alt) and not as_a:
+                as_a = line[len(as_a_prefix_alt):].strip()
             elif line.startswith(i_want_prefix) and not i_want:
                 i_want = line[len(i_want_prefix):].strip()
             index += 1

ara_cli/artefact_models/feature_artefact_model.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, field_validator, model_validator, Field
-from typing import Optional, List, Dict, Tuple, Union
+from typing import List, Dict, Tuple, Union
 from ara_cli.artefact_models.artefact_model import Artefact, ArtefactType, Intent
 import re
 
@@ -48,6 +48,7 @@ class FeatureIntent(Intent):
         so_that = None
 
         as_a_prefix = "As a "
+        as_a_prefix_alt = "As an "
         i_want_to_prefix = "I want to "
         so_that_prefix = "So that "
 
@@ -56,6 +57,8 @@ class FeatureIntent(Intent):
             line = lines[index]
             if line.startswith(as_a_prefix) and not as_a:
                 as_a = line[len(as_a_prefix):].strip()
+            if line.startswith(as_a_prefix_alt) and not as_a:
+                as_a = line[len(as_a_prefix_alt):].strip()
             elif line.startswith(i_want_to_prefix) and not i_want_to:
                 i_want_to = line[len(i_want_to_prefix):].strip()
             elif line.startswith(so_that_prefix) and not so_that:

ara_cli/artefact_models/keyfeature_artefact_model.py

@@ -48,6 +48,7 @@ class KeyfeatureIntent(Intent):
 
         in_order_to_prefix = "In order to "
         as_a_prefix = "As a "
+        as_a_prefix_alt = "As an "
         i_want_prefix = "I want "
 
         index = start_index
@@ -57,6 +58,8 @@ class KeyfeatureIntent(Intent):
                 in_order_to = line[len(in_order_to_prefix):].strip()
             elif line.startswith(as_a_prefix) and not as_a:
                 as_a = line[len(as_a_prefix):].strip()
+            elif line.startswith(as_a_prefix_alt) and not as_a:
+                as_a = line[len(as_a_prefix_alt):].strip()
             elif line.startswith(i_want_prefix) and not i_want:
                 i_want = line[len(i_want_prefix):].strip()
             index += 1

ara_cli/artefact_models/userstory_artefact_model.py

@@ -48,6 +48,7 @@ class UserstoryIntent(Intent):
 
         in_order_to_prefix = "In order to "
         as_a_prefix = "As a "
+        as_a_prefix_alt = "As an "
         i_want_prefix = "I want "
 
         index = start_index
@@ -57,6 +58,8 @@ class UserstoryIntent(Intent):
                 in_order_to = line[len(in_order_to_prefix):].strip()
             elif line.startswith(as_a_prefix) and not as_a:
                 as_a = line[len(as_a_prefix):].strip()
+            elif line.startswith(as_a_prefix_alt) and not as_a:
+                as_a = line[len(as_a_prefix_alt):].strip()
             elif line.startswith(i_want_prefix) and not i_want:
                 i_want = line[len(i_want_prefix):].strip()
             index += 1

ara_cli/artefact_scan.py

@@ -1,3 +1,6 @@
+from textwrap import indent
+
+
 def check_file(file_path, artefact_class):
     from pydantic import ValidationError
     try:
@@ -38,7 +41,8 @@ def show_results(invalid_artefacts):
                 print(f"\nIncompatible {classifier} Files:")
                 report.write(f"## {classifier}\n")
                 for file, reason in files:
-                    print(f"\t- {file}")
+                    indented_reason = indent(reason, prefix="\t\t")
+                    print(f"\t- {file}\n{indented_reason}")
                     report.write(f"- `{file}`: {reason}\n")
                 report.write("\n")
         if not has_issues:

ara_cli/file_classifier.py

@@ -68,6 +68,8 @@ class FileClassifier:
         files_by_classifier = {classifier: [] for classifier in Classifier.ordered_classifiers()}
 
         for root, _, files in self.file_system.walk("."):
+            if root.endswith(".data"):
+                continue
             for file in files:
                 file_path = self.file_system.path.join(root, file)
                 classifier = self.classify_file(file_path, tags)

ara_cli/tests/test_ara_command_action.py

@@ -647,6 +647,7 @@ def test_scan_action_with_issues(capsys):
         expected_output = (
             "\nIncompatible classifier1 Files:\n"
             "\t- file1.txt\n"
+            "\t\treason1\n"
         )
         assert captured.out == expected_output
         m.assert_called_once_with("incompatible_artefacts_report.md", "w")

ara_cli/tests/test_artefact_scan.py

@@ -106,9 +106,12 @@ def test_show_results_with_issues(capsys):
         expected_output = (
             "\nIncompatible classifier1 Files:\n"
             "\t- file1.txt\n"
+            "\t\treason1\n"
             "\t- file2.txt\n"
+            "\t\treason2\n"
             "\nIncompatible classifier2 Files:\n"
             "\t- file3.txt\n"
+            "\t\treason3\n"
         )
         assert captured.out == expected_output
         m.assert_called_once_with("incompatible_artefacts_report.md", "w")

ara_cli/tests/test_file_classifier.py

@@ -247,4 +247,25 @@ def test_find_closest_artefact_name_match(mock_file_system):
         mock_fuzzy.assert_called_once_with('file3', ['file1', 'file2'])
 
     # No match for classifier
-    assert classifier.find_closest_artefact_name_match('file1', 'txt') is None
+    assert classifier.find_closest_artefact_name_match('file1', 'txt') is None
+
+
+@pytest.mark.parametrize("walk_return_value, expected_result", [
+    (
+        [('.', ['subdir'], ['file1.py']), ('subdir.data', [], ['file_in_data.txt'])],
+        {'py': [{'file_path': './file1.py', 'title': 'file1'}], 'txt': [], 'bin': []}
+    ),
+    (
+        [('.', ['subdir'], ['file1.py']), ('subdir', [], ['file2.txt'])],
+        {'py': [{'file_path': './file1.py', 'title': 'file1'}], 'txt': [{'file_path': 'subdir/file2.txt', 'title': 'file2'}], 'bin': []}
+    )
+])
+def test_classify_files_skips_data_directories(mock_file_system, mock_classifier, walk_return_value, expected_result):
+    mock_file_system.walk.return_value = walk_return_value
+    mock_file_system.path.join.side_effect = lambda root, file: f"{root}/{file}"
+
+    classifier = FileClassifier(mock_file_system)
+
+    result = classifier.classify_files()
+
+    assert result == expected_result

ara_cli/version.py

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

{ara_cli-0.1.9.60.dist-info → ara_cli-0.1.9.61.dist-info}/METADATA

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

{ara_cli-0.1.9.60.dist-info → ara_cli-0.1.9.61.dist-info}/RECORD

@@ -4,21 +4,21 @@ ara_cli/analyse_artefacts.py,sha256=JwA2zxkCy8vNOHoU9f3TICJesXRRXndHi2hT5m_uQ8Q,
 ara_cli/ara_command_action.py,sha256=OsmNJ9XHVMPveVO0kxlYNU5vR16bX9Sn7mGKaOieZqg,18925
 ara_cli/ara_command_parser.py,sha256=HluFJimQbxS_yuZ2IzLcsfUPrmIJbKJB71YvsGiUXQE,16883
 ara_cli/ara_config.py,sha256=_Arkr-b9XnrNHbBlFKb9tAo3OmdP4ZZiWvbY9m6Sbo0,4178
-ara_cli/artefact_creator.py,sha256=Kbs0hloEGUUyInZVPimeqYtJYc70px6m7aFtJWeJU5U,6159
+ara_cli/artefact_creator.py,sha256=mkxKHkVIK2GdmUrKHAjKvhq66eg21S3x_cvK1ZA9DPw,5964
 ara_cli/artefact_deleter.py,sha256=Co4wwCH3yW8H9NrOq7_2p5571EeHr0TsfE-H8KqoOfY,1900
 ara_cli/artefact_fuzzy_search.py,sha256=XAvoiRafd1u21uKbX5-bow7hdq7uiLLy1KtxHNAFbCk,1337
 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=qNaMPWShmWtDU5LLdh9efFB27djI4NAoq6zEFwdTd38,6983
 ara_cli/artefact_renamer.py,sha256=loIn1DF9kVnjhH7wP1v5qUvt3s0uKeWXuQPrHXenQGE,4025
-ara_cli/artefact_scan.py,sha256=DgFGv4hnbCjYdIgPA2PbAuGDWg1q2fCjtIqxGs57b9w,1762
+ara_cli/artefact_scan.py,sha256=bIk_xa_nB2oQHjBeYChwHwHIxo5hDjYhzq-KWCWmUFE,1879
 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=rKgF2_tyxHUlpr_vclaZN1CKzidErRXzOng3SbSYR6Q,3903
+ara_cli/file_classifier.py,sha256=JsY7Y_D8WL-fiWz57zwzttg6SEajxWVxpDkFG_149-Q,3967
 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
@@ -31,20 +31,20 @@ ara_cli/run_file_lister.py,sha256=XbrrDTJXp1LFGx9Lv91SNsEHZPP-PyEMBF_P4btjbDA,23
 ara_cli/tag_extractor.py,sha256=R5T103Y60NppYifKV7b8KoI5kE1M66fULz6f_Fdc9VU,1081
 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=lJSAoY11nbjwbD8FiJoiAKgyv0FNBfcMfo_JyCTBpjw,146
+ara_cli/version.py,sha256=UnoKKtqPp3m-W25FpDjhgC_5DzQxM2ExEc0zhVw6wiA,146
 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=vV-Hhtl6DwVt7qcFTnxxr_WqyTZnKtkFU-nryVnTbUg,14853
 ara_cli/artefact_models/artefact_templates.py,sha256=Vd7SwoRVKNGKZmxBKS6f9FE1ThUOCqZLScu0ClPfIu8,8321
-ara_cli/artefact_models/businessgoal_artefact_model.py,sha256=u9-Rr7VDYoNP6Vy2iKE64yAxDPOnrJJFozO6Ji9s8pI,4570
+ara_cli/artefact_models/businessgoal_artefact_model.py,sha256=mgLOgVRR8MrUqWX6ovcHo7octdfi8AaJiJcbrL4F9R4,4728
 ara_cli/artefact_models/capability_artefact_model.py,sha256=SZqHx4O2mj4urn77Stnj4_Jxtlq3-LgBBU9SMkByppI,3079
-ara_cli/artefact_models/epic_artefact_model.py,sha256=MuK6n0Tl0TM3364pH_j5R8XvwJZFyNwrZGCYaaqzxvs,5490
+ara_cli/artefact_models/epic_artefact_model.py,sha256=KKwW-vZkdso2L-wAWNWbLfGXGQK8M4A10sldDxi8QVE,5648
 ara_cli/artefact_models/example_artefact_model.py,sha256=UXrKbaPotg1jwcrVSdCeo-XH4tTD_-U1e3giaBn5_xg,1384
-ara_cli/artefact_models/feature_artefact_model.py,sha256=HuHLPZW4HptHhKaDHekobB29ZDWXqU4LXMHUP7gMIS8,12979
+ara_cli/artefact_models/feature_artefact_model.py,sha256=7QgX0C5WC0QCUX29xbZFwUNaD74gb7l4PQFcA8GhULU,13125
 ara_cli/artefact_models/issue_artefact_model.py,sha256=v6CpKnkqiUh6Wch2kkEmyyW49c8ysdy1qz8l1Ft9uJA,2552
-ara_cli/artefact_models/keyfeature_artefact_model.py,sha256=nkRNQyoJrDqmRxmqJZBQId6fNv6gI3EoKtXsI7BPqdY,3968
+ara_cli/artefact_models/keyfeature_artefact_model.py,sha256=sD4tBgQQGTZ-PcYVDb3cp81rT2SQy8kQ-V9NxRGrYu8,4126
 ara_cli/artefact_models/task_artefact_model.py,sha256=kHMw_Tr-Ud3EeHWpRWy4jI0xFnPzGZ-FT52c5rSrT1k,3558
-ara_cli/artefact_models/userstory_artefact_model.py,sha256=qDT6TJyP4eKO4ETsx8kPQoHWFZmerl739k_5Wood538,6307
+ara_cli/artefact_models/userstory_artefact_model.py,sha256=oJ8sHX-RbqGotehfUF43xs-5TsZh8PTmEtgjUfc7lWQ,6465
 ara_cli/artefact_models/vision_artefact_model.py,sha256=KcNE3QQjyT29ZMMhCQo4pOcXKTkI6pXLvyfqoN2kuUQ,5920
 ara_cli/templates/agile.artefacts,sha256=nTA8dp98HWKAD-0qhmNpVYIfkVGoJshZqMJGnphiOsE,7932
 ara_cli/templates/template.businessgoal,sha256=3OU-y8dOCRbRsB9ovBzwFPxHSbG0dqbkok0uJnZIOd4,524
@@ -130,26 +130,26 @@ 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
 ara_cli/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ara_cli/tests/test_ara_command_action.py,sha256=N7712HbmN86ziGBKI5GoHQPp75OSyD0kHsHRxna8d9w,25446
+ara_cli/tests/test_ara_command_action.py,sha256=vxTaDGThNz8vxazGuYt1ufDaPZbYiIYpN7alISXAi9s,25474
 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=m0V3HMLJtrOBXpJIRUI0D6MbHssgxDU_c935Wc3jatQ,4696
+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=6OYM-lYVYjxq4Qwl8U1btv_FYJhc5t3rKjYr2CXZ4uI,10069
+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=n2xNApbDciqKO3QuaveEWSPXU1PCUa_EhxlZMrukONw,2074
 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.60.dist-info/METADATA,sha256=WTu3iMjkrTJdAdbFBxMqAgF3CI8sVqnqIM9zxzGLvos,388
-ara_cli-0.1.9.60.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.60.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.60.dist-info/top_level.txt,sha256=zzee_PwFmKqfBi9XgIunP6xy2S4TIt593CLLxenNaAE,8
-ara_cli-0.1.9.60.dist-info/RECORD,,
+ara_cli-0.1.9.61.dist-info/METADATA,sha256=oUtK5-Prz7S1ln3cAuDIDFTpWOjwFSAVUR242nhxtYo,388
+ara_cli-0.1.9.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.9.61.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.9.61.dist-info/top_level.txt,sha256=zzee_PwFmKqfBi9XgIunP6xy2S4TIt593CLLxenNaAE,8
+ara_cli-0.1.9.61.dist-info/RECORD,,