ara-cli 0.1.9.59__tar.gz → 0.1.9.61__tar.gz

{ara_cli-0.1.9.59 → ara_cli-0.1.9.61}/PKG-INFO

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

{ara_cli-0.1.9.59 → ara_cli-0.1.9.61}/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)
@@ -119,7 +115,7 @@ class ArtefactCreator:
             )
 
         artefact_content = artefact.serialize()
-        rmtree(dir_path)
+        rmtree(dir_path, ignore_errors=True)
         os.makedirs(dir_path, exist_ok=True)
         with open(file_path, 'w') as artefact_file:
             artefact_file.write(artefact_content)

{ara_cli-0.1.9.59 → ara_cli-0.1.9.61}/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-0.1.9.59 → ara_cli-0.1.9.61}/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-0.1.9.59 → ara_cli-0.1.9.61}/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-0.1.9.59 → ara_cli-0.1.9.61}/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-0.1.9.59 → ara_cli-0.1.9.61}/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-0.1.9.59 → ara_cli-0.1.9.61}/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-0.1.9.59 → ara_cli-0.1.9.61}/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-0.1.9.59 → ara_cli-0.1.9.61}/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-0.1.9.59 → ara_cli-0.1.9.61}/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-0.1.9.59 → ara_cli-0.1.9.61}/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-0.1.9.59 → ara_cli-0.1.9.61}/ara_cli/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "0.1.9.59"   # 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.59 → ara_cli-0.1.9.61}/ara_cli.egg-info/PKG-INFO

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