ara-cli 0.1.9.63__py3-none-any.whl → 0.1.9.65__py3-none-any.whl

ara_cli/ara_command_action.py

@@ -18,6 +18,8 @@ def create_action(args):
     from ara_cli.classifier import Classifier
     from ara_cli.filename_validator import is_valid_filename
     from ara_cli.template_manager import SpecificationBreakdownAspects
+    from ara_cli.artefact_reader import ArtefactReader
+    from ara_cli.artefact_fuzzy_search import find_closest_rule
 
     check_validity(Classifier.is_valid_classifier(args.classifier), "Invalid classifier provided. Please provide a valid classifier.")
     check_validity(is_valid_filename(args.parameter), "Invalid filename provided. Please provide a valid filename.")
@@ -25,11 +27,20 @@ def create_action(args):
     def handle_parent_arguments(args):
         parent_classifier = args.parent_classifier if hasattr(args, "parent_classifier") else None
         parent_name = args.parent_name if hasattr(args, "parent_name") else None
+        rule = args.rule if hasattr(args, 'rule') else None
+        invalid_classifier_message = "Invalid parent classifier provided. Please provide a valid classifier"
+        invalid_name_message = "Invalid filename provided for parent. Please provide a valid filename."
+        if parent_classifier and parent_name and rule:
+            check_validity(Classifier.is_valid_classifier(parent_classifier), invalid_classifier_message)
+            check_validity(is_valid_filename(parent_name), invalid_name_message)
+            parent_artefact = ArtefactReader.read_single_artefact(artefact_name=parent_name, classifier=parent_classifier)
+            rule = find_closest_rule(parent_artefact, rule)
+            return parent_classifier, parent_name, rule
         if parent_classifier and parent_name:
-            check_validity(Classifier.is_valid_classifier(parent_classifier), "Invalid parent classifier provided. Please provide a valid classifier")
-            check_validity(is_valid_filename(parent_name), "Invalid filename provided for parent. Please provide a valid filename.")
-            return parent_classifier, parent_name
-        return None, None
+            check_validity(Classifier.is_valid_classifier(parent_classifier), invalid_classifier_message)
+            check_validity(is_valid_filename(parent_name), invalid_name_message)
+            return parent_classifier, parent_name, rule
+        return None, None, None
 
     def handle_aspect_creation(args):
         aspect = args.aspect if hasattr(args, "aspect") else None
@@ -43,12 +54,12 @@ def create_action(args):
                 sys.exit(1)
         return False
 
-    parent_classifier, parent_name = handle_parent_arguments(args)
+    parent_classifier, parent_name, rule = handle_parent_arguments(args)
     if handle_aspect_creation(args):
         return
 
     artefact_creator = ArtefactCreator()
-    artefact_creator.run(args.parameter, args.classifier, parent_classifier, parent_name)
+    artefact_creator.run(args.parameter, args.classifier, parent_classifier, parent_name, rule)
 
 
 def delete_action(args):
@@ -122,15 +133,17 @@ def list_action(args):
 
 def list_tags_action(args):
     from ara_cli.tag_extractor import TagExtractor
+    from ara_cli.list_filter import ListFilter
 
-    tag_classifier = None
-    if args.include_classifier:
-        tag_classifier = args.include_classifier
+    list_filter = ListFilter(
+        include_extension=args.include_classifier,
+        exclude_extension=args.exclude_classifier,
+    )
 
     tag_extractor = TagExtractor()
     tags = tag_extractor.extract_tags(
-        include_classifier=tag_classifier,
-        filtered_extra_column=getattr(args, "filtered_extra_column", False)
+        filtered_extra_column=getattr(args, "filtered_extra_column", False),
+        list_filter=list_filter
     )
 
     if args.json:
@@ -334,14 +347,18 @@ def reconnect_action(args):
     from ara_cli.artefact_models.artefact_load import artefact_from_content
     from ara_cli.artefact_models.artefact_model import Contribution
     from ara_cli.artefact_reader import ArtefactReader
+    from ara_cli.artefact_fuzzy_search import find_closest_rule
 
     classifier = args.classifier
     artefact_name = args.parameter
     parent_classifier = args.parent_classifier
     parent_name = args.parent_name
+    rule = args.rule if hasattr(args, 'rule') else None
 
     read_error_message = f"Could not connect {classifier} '{artefact_name}' to {parent_classifier} '{parent_name}'"
 
+    feedback_message = f"Updated contribution of {classifier} '{artefact_name}' to {parent_classifier} '{parent_name}'"
+
     content, artefact_info = ArtefactReader.read_artefact(
         artefact_name=artefact_name,
         classifier=classifier
@@ -367,14 +384,27 @@ def reconnect_action(args):
         content=parent_content
     )
 
-    artefact.contribution = Contribution(
+    contribution = Contribution(
         artefact_name=parent.title,
         classifier=parent.artefact_type
     )
+
+    if rule:
+        try:
+            closest_rule = find_closest_rule(parent, rule)
+            contribution.rule = closest_rule
+            feedback_message += f" using rule '{closest_rule}'"
+        except TypeError as e:
+            print(f"{type(e).__name__}:", e)
+            exit(1)
+
+    artefact.contribution = contribution
     with open(artefact.file_path, 'w') as file:
         artefact_content = artefact.serialize()
         file.write(artefact_content)
 
+    print(feedback_message + ".")
+
 
 def read_status_action(args):
     from ara_cli.file_classifier import FileClassifier

ara_cli/ara_command_parser.py

@@ -18,6 +18,7 @@ def create_parser(subparsers):
     contribution_parser = option_parser.add_parser("contributes-to")
     contribution_parser.add_argument("parent_classifier", choices=classifiers, help="Classifier of the parent")
     contribution_parser.add_argument("parent_name",  help="Name of a parent artefact").completer = ParentNameCompleter()
+    contribution_parser.add_argument("-r", "--rule", dest="rule", action="store")
 
     aspect_parser = option_parser.add_parser("aspect")
     aspect_parser.add_argument("aspect", choices=aspects, help="Adds additional specification breakdown aspects in data directory.")
@@ -70,12 +71,16 @@ def add_filter_flags(parser):
     extension_group.add_argument(
         "-i",
         "--include-extension",
+        "--include-classifier",
+        dest="include_extension",
         nargs='+',
         help='list of extensions to include in listing'
     )
     extension_group.add_argument(
         "-e",
         "--exclude-extension",
+        "--exclude-classifier",
+        dest="exclude_extension",
         nargs='+',
         help='list of extensions to exclude from listing'
     )
@@ -121,6 +126,7 @@ def list_tags_parser(subparsers):
     tags_parser = subparsers.add_parser("list-tags", help="Show tags")
     tags_parser.add_argument("--json", "-j", help="Output tags as JSON", action=argparse.BooleanOptionalAction)
     tags_parser.add_argument("--include-classifier", choices=classifiers, help="Show tags for an artefact type")
+    tags_parser.add_argument("--exclude_classifier", choices=classifiers, help="Show tags for an artefact type")
     tags_parser.add_argument("--filtered-extra-column", action="store_true", help="Filter tags for extra column") 
 
 
@@ -184,6 +190,7 @@ def reconnect_parser(subparsers):
     reconnect_parser.add_argument("parameter", help="Filename of artefact").completer = ArtefactCompleter()
     reconnect_parser.add_argument("parent_classifier", choices=classifiers, help="Classifier of the parent artefact type")
     reconnect_parser.add_argument("parent_name", help="Filename of parent artefact").completer = ParentNameCompleter()
+    reconnect_parser.add_argument("-r", "--rule", dest="rule", action="store")
 
 
 def read_status_parser(subparsers):

ara_cli/artefact_autofix.py

@@ -83,9 +83,8 @@ def construct_prompt(artefact_type, reason, file_path, artefact_text):
 
     prompt = (
         f"Correct the following {artefact_type} artefact to fix the issue: {reason}. "
-        "Provide the complete, corrected artefact. Do not reformulate the artefact, "
+        "Provide the corrected artefact. Do not reformulate the artefact, "
         "just fix the pydantic model errors, use correct grammar. "
-        "Do not remove comments. "
         "You should follow the name of the file "
         f"from its path {file_path} for naming the arteafact's title. "
         "You are not allowed to use file extention in the artefact title. "
@@ -114,7 +113,7 @@ def run_agent(prompt, artefact_class):
     from pydantic_ai import Agent
     # gpt-4o
     # anthropic:claude-3-7-sonnet-20250219
-    agent = Agent(model="gpt-4o",
+    agent = Agent(model="anthropic:claude-3-7-sonnet-20250219",
                   result_type=artefact_class, instrument=True)
     result = agent.run_sync(prompt)
     return result.data

ara_cli/artefact_creator.py

@@ -87,7 +87,7 @@ class ArtefactCreator:
         artefact._parent = matching_artefacts[0]
         return artefact
 
-    def run(self, filename, classifier, parent_classifier=None, parent_name=None):
+    def run(self, filename, classifier, parent_classifier=None, parent_name=None, rule=None):
         # make sure this function is always called from the ara top level directory
         original_directory = os.getcwd()
         navigator = DirectoryNavigator()
@@ -111,7 +111,8 @@ class ArtefactCreator:
         if parent_classifier and parent_name:
             artefact.set_contribution(
                 artefact_name=parent_name,
-                classifier=parent_classifier
+                classifier=parent_classifier,
+                rule=rule
             )
 
         artefact_content = artefact.serialize()

ara_cli/artefact_fuzzy_search.py

@@ -1,9 +1,10 @@
 import difflib
+from textwrap import indent
 from typing import Optional
 
 
-def suggest_close_names(artefact_name: str, all_artefact_names: list[str], message: str):
-    closest_matches = difflib.get_close_matches(artefact_name, all_artefact_names, cutoff=0.5)
+def suggest_close_names(artefact_name: str, all_artefact_names: list[str], message: str, cutoff=0.5):
+    closest_matches = difflib.get_close_matches(artefact_name, all_artefact_names, cutoff=cutoff)
     print(message)
     if not closest_matches:
         return
@@ -38,3 +39,21 @@ def find_closest_name_match(artefact_name: str, all_artefact_names: list[str]) -
         return None
     closest_match = closest_matches[0]
     return closest_match
+
+
+def find_closest_rule(parent_artefact: 'Artefact', rule: str):
+    parent_classifier = parent_artefact.artefact_type.value
+    parent_title = parent_artefact.title
+    if not hasattr(parent_artefact, 'rules'):
+        raise TypeError(f"{parent_classifier.capitalize()} artefact '{parent_title}' can not possess rules. Only userstories and epics have rules.")
+    rules = parent_artefact.rules
+    if rule in rules:
+        return rule
+    print(f"Rule '{rule}' does not match existing rules in {parent_classifier} artefact '{parent_title}'. Attempting to find closest match among existing rules.")
+    closest_matches = difflib.get_close_matches(rule, rules, cutoff=0.5)
+    rules_list_string = indent('\n'.join(rules), prefix='\t- ')
+    if not closest_matches:
+        raise ValueError(f"Can not determine a match for rule '{rule}' in {parent_classifier} artefact '{parent_title}'. Found rules:\n{rules_list_string}")
+    closest_match = closest_matches[0]
+    print(f"Found closest matching rule of '{closest_match}'")
+    return closest_match

ara_cli/artefact_models/artefact_model.py

@@ -401,9 +401,10 @@ class Artefact(BaseModel, ABC):
             return description
         return f"{description}{self.description}"
 
-    def set_contribution(self, artefact_name, classifier):
+    def set_contribution(self, artefact_name, classifier, rule=None):
         contribution = Contribution(
             artefact_name=artefact_name,
-            classifier=classifier
+            classifier=classifier,
+            rule=rule
         )
         self.contribution = contribution

ara_cli/artefact_models/feature_artefact_model.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, field_validator, model_validator, Field
-from typing import List, Dict, Tuple, Union
+from typing import List, Dict, Tuple, Union, Optional
 from ara_cli.artefact_models.artefact_model import Artefact, ArtefactType, Intent
 import re
 
@@ -98,6 +98,35 @@ class Example(BaseModel):
         return cls(values=values)
 
 
+class Background(BaseModel):
+    steps: List[str] = Field(
+        description="A list of Gherkin 'Given' type steps that describe what the background does."
+    )
+
+    @field_validator('steps', mode='before')
+    def validate_steps(cls, v: List[str]) -> List[str]:
+        """Ensure steps are non-empty and stripped."""
+        steps = [step.strip() for step in v if step.strip()]
+        if not steps:
+            raise ValueError("steps list must not be empty")
+        return steps
+
+    @classmethod
+    def from_lines(cls, lines: List[str], start_idx: int) -> Tuple['Background', int]:
+        """Parse a Background from a list of lines starting at start_idx."""
+        if not lines[start_idx].startswith('Background:'):
+            raise ValueError("Expected 'Background:' at start index")
+
+        steps = []
+        idx = start_idx + 1
+        while idx < len(lines) and not lines[idx].startswith('Background:'):
+            step = lines[idx].strip()
+            if step:
+                steps.append(step)
+            idx += 1
+        return cls(steps=steps), idx
+
+
 class Scenario(BaseModel):
     title: str = Field(
         description="The name of the scenario, giving a short summary of the test case. It comes from the 'Scenario:' line in the feature file."
@@ -213,6 +242,8 @@ class FeatureArtefact(Artefact):
     artefact_type: ArtefactType = ArtefactType.feature
     intent: FeatureIntent
     scenarios: List[Union[Scenario, ScenarioOutline]] = Field(default=None)
+    background: Optional[Background] = Field(
+        default=None, description="Highly optional background Gherkin steps for Feature Artefacts. This steps apply for all scenarios and scenario outlines in this feature file.")
 
     @field_validator('artefact_type')
     def validate_artefact_type(cls, v):
@@ -229,6 +260,16 @@ class FeatureArtefact(Artefact):
     def _artefact_type(cls) -> ArtefactType:
         return ArtefactType.feature
 
+    def _serialize_background(self) -> str:
+        """Helper method to dispatch background serialization."""
+        if not self.background:
+            return ""
+        lines = []
+        lines.append("  Background:")
+        for step in self.background.steps:
+            lines.append(f"    {step}")
+        return "\n".join(lines)
+
     def _serialize_scenario(self, scenario: Union[Scenario, ScenarioOutline]) -> str:
         """Helper method to dispatch scenario serialization."""
         if isinstance(scenario, Scenario):
@@ -309,6 +350,10 @@ class FeatureArtefact(Artefact):
         lines.append(description)
         lines.append("")
 
+        if self.background:
+            lines.append(self._serialize_background())
+            lines.append("")
+
         if self.scenarios:
             for scenario in self.scenarios:
                 lines.append(self._serialize_scenario(scenario))
@@ -321,9 +366,11 @@ class FeatureArtefact(Artefact):
         fields = super()._parse_common_fields(text)
 
         intent = FeatureIntent.deserialize(text)
+        background = cls.deserialize_background(text)
         scenarios = cls.deserialize_scenarios(text)
 
         fields['scenarios'] = scenarios
+        fields['background'] = background
         fields['intent'] = intent
 
         return cls(**fields)
@@ -348,3 +395,19 @@ class FeatureArtefact(Artefact):
             else:
                 idx += 1
         return scenarios
+
+    @classmethod
+    def deserialize_background(cls, text):
+        lines = [line.strip()
+                 for line in text.strip().splitlines() if line.strip()]
+
+        background = None
+        idx = 0
+        while idx < len(lines):
+            line = lines[idx].strip()
+            if line.startswith('Background:'):
+                background, next_idx = Background.from_lines(lines, idx)
+                break
+            else:
+                idx += 1
+        return background

ara_cli/artefact_reader.py

@@ -1,6 +1,7 @@
 from ara_cli.classifier import Classifier
 from ara_cli.file_classifier import FileClassifier
 from ara_cli.artefact_models.artefact_model import Artefact
+from ara_cli.artefact_models.artefact_load import artefact_from_content
 from ara_cli.artefact_fuzzy_search import suggest_close_name_matches_for_parent, suggest_close_name_matches
 from typing import Dict, List
 import os
@@ -9,7 +10,7 @@ import re
 
 class ArtefactReader:
     @staticmethod
-    def read_artefact(artefact_name, classifier):
+    def read_artefact(artefact_name, classifier) -> tuple[str, dict[str, str]]:
         if not Classifier.is_valid_classifier(classifier):
             print("Invalid classifier provided. Please provide a valid classifier.")
             return None, None
@@ -34,6 +35,27 @@ class ArtefactReader:
 
         return None, None
 
+    @staticmethod
+    def read_single_artefact(artefact_name, classifier, classified_file_info=None) -> Artefact:
+        if not Classifier.is_valid_classifier(classifier):
+            print("Invalid classifier provided. Please provide a valid classifier.")
+            return None
+        if not classified_file_info:
+            file_classifier = FileClassifier(os)
+            classified_file_info = file_classifier.classify_files()
+        artefact_info_of_classifier = classified_file_info.get(classifier, [])
+
+        for artefact_info in artefact_info_of_classifier:
+            file_path = artefact_info["file_path"]
+            artefact_title = artefact_info["title"]
+            if artefact_title == artefact_name:
+                with open(file_path, 'r') as file:
+                    content = file.read()
+                artefact = artefact_from_content(content)
+                artefact._file_path = file_path
+                return artefact
+        return None
+
     @staticmethod
     def extract_parent_tree(artefact_content):
         artefact_titles = Classifier.artefact_titles()

ara_cli/prompt_extractor.py

@@ -184,10 +184,14 @@ def handle_existing_file(filename, block_content):
         create_file_if_not_exist(filename, block_content)
     else:
         print(f"File {filename} exists, creating modification prompt")
-        prompt = create_prompt_for_file_modification(block_content, filename)
+        prompt_text = create_prompt_for_file_modification(block_content, filename)
+        messages = [{"role": "user", "content": prompt_text}]
         response = ""
-        for chunk in send_prompt(prompt):
-            response += chunk.content
+
+        for chunk in send_prompt(messages):
+            content = chunk.choices[0].delta.content
+            if content:
+                response += content
         modify_and_save_file(response, filename)
 
 

ara_cli/prompt_handler.py

@@ -355,8 +355,12 @@ def prepend_system_prompt(message_list):
 
 
 def append_images_to_message(message, image_data_list):
-    message_content = message["content"]
-    message["content"] = message_content + 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
 
     return message
 
@@ -376,14 +380,23 @@ def create_and_send_custom_prompt(classifier, parameter):
     append_headings(classifier, parameter, "prompt")
     write_prompt_result(classifier, parameter, prompt)
 
-    message_list = append_images_to_message(combined_content_markdown, image_data_list)
-    append_headings(classifier, parameter, "result")
+    base_message = {
+        "role": "user",
+        "content": combined_content_markdown
+    }
+
+    final_message = append_images_to_message(base_message, image_data_list)
 
+    message_list_to_send = [final_message]
+
+    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):
-            file.write(chunk.content)
-            file.flush()
+        for chunk in send_prompt(message_list_to_send):
+            content = chunk.choices[0].delta.content
+            if content:
+                file.write(content)
+                file.flush()
     # write_prompt_result(classifier, parameter, response)
 
 

ara_cli/tag_extractor.py

@@ -1,12 +1,18 @@
 import os
-from ara_cli.artefact_models.artefact_load import artefact_from_content
+from ara_cli.list_filter import ListFilter, filter_list
+from ara_cli.artefact_lister import ArtefactLister
 
 
 class TagExtractor:
     def __init__(self, file_system=None):
         self.file_system = file_system or os
 
-    def extract_tags(self, navigate_to_target=False, include_classifier=None, filtered_extra_column=False):
+    def extract_tags(
+        self,
+        navigate_to_target=False,
+        filtered_extra_column=False,
+        list_filter: ListFilter | None = None
+    ):
         from ara_cli.template_manager import DirectoryNavigator
         from ara_cli.artefact_reader import ArtefactReader
 
@@ -16,24 +22,29 @@ class TagExtractor:
 
         artefacts = ArtefactReader.read_artefacts()
 
-        if include_classifier:
-            artefacts = {include_classifier: artefacts[include_classifier]}
+        filtered_artefacts = filter_list(
+            list_to_filter=artefacts,
+            list_filter=list_filter,
+            content_retrieval_strategy=ArtefactLister.artefact_content_retrieval,
+            file_path_retrieval=ArtefactLister.artefact_path_retrieval,
+            tag_retrieval=ArtefactLister.artefact_tags_retrieval
+        )
 
         unique_tags = set()
 
         if filtered_extra_column:
             status_tags = {"to-do", "in-progress", "review", "done", "closed"}
-            filtered_artefacts = []
+            artefacts_to_process = []
 
-            for artefact_list in artefacts.values():
+            for artefact_list in filtered_artefacts.values():
                 for artefact in artefact_list:
                     tags = artefact.tags + \
                         [artefact.status] if artefact.status else artefact.tags
                     tag_set = set(tag for tag in tags if tag is not None)
                     if not tag_set & status_tags:
-                        filtered_artefacts.append(artefact)
+                        artefacts_to_process.append(artefact)
 
-            for artefact in filtered_artefacts:
+            for artefact in artefacts_to_process:
                 tags = [tag for tag in (
                     artefact.tags + [artefact.status]) if tag is not None]
                 for tag in tags:
@@ -46,7 +57,7 @@ class TagExtractor:
                     unique_tags.add(tag)
 
         else:
-            for artefact_list in artefacts.values():
+            for artefact_list in filtered_artefacts.values():
                 for artefact in artefact_list:
                     user_tags = [f"user_{tag}" for tag in artefact.users]
                     tags = [tag for tag in (artefact.tags + [artefact.status] + user_tags) if tag is not None]

ara_cli/tests/test_ara_command_action.py

@@ -26,8 +26,10 @@ def mock_dependencies():
         "ara_cli.filename_validator.is_valid_filename"
     ) as mock_is_valid_filename, patch(
         "ara_cli.template_manager.SpecificationBreakdownAspects"
-    ) as MockSpecificationBreakdownAspects:
-        yield MockArtefactCreator, MockClassifier, mock_is_valid_filename, MockSpecificationBreakdownAspects
+    ) as MockSpecificationBreakdownAspects, patch(
+        "ara_cli.artefact_fuzzy_search.find_closest_rule"
+    ) as mock_find_closest_rule:
+        yield MockArtefactCreator, MockClassifier, mock_is_valid_filename, MockSpecificationBreakdownAspects, mock_find_closest_rule
 
 
 @pytest.fixture
@@ -129,9 +131,11 @@ def test_create_action_validity_checks(
         MockClassifier,
         mock_is_valid_filename,
         MockSpecificationBreakdownAspects,
+        mock_find_closest_rule,
     ) = mock_dependencies
     MockClassifier.is_valid_classifier.return_value = classifier_valid
     mock_is_valid_filename.return_value = filename_valid
+    mock_find_closest_rule.return_value = None
 
     args = MagicMock()
     args.classifier = "test_classifier"

ara_cli/tests/test_tag_extractor.py

@@ -1,54 +1,83 @@
 import pytest
 from unittest.mock import MagicMock, patch
 from ara_cli.tag_extractor import TagExtractor
+from ara_cli.list_filter import ListFilter
 
 
 @pytest.fixture
 def artefact():
     """Fixture to create a mock artefact object."""
     class Artefact:
-        def __init__(self, tags, status, users):
+        def __init__(self, tags, status, users, path="dummy.md", content=""):
             self.tags = tags
             self.status = status
             self.users = users
+            self.path = path
+            self.content = content
     return Artefact
 
 
-@pytest.mark.parametrize("navigate_to_target, include_classifier, artefact_data, expected_tags", [
-    (False, None, {'artefacts': [
-        (['tag1', 'tag2'], 'status1', ['user1', 'user2']),
-        (['tag3'], 'status2', ['user3'])
-    ]}, ['status1', 'status2', 'tag1', 'tag2', 'tag3', 'user_user1', 'user_user2', 'user_user3']),
-
-    (False, 'key', {'key': [
-        (['tag1', 'tag2'], 'status1', ['user1', 'user2'])
-    ]}, ['status1', 'tag1', 'tag2', 'user_user1', 'user_user2']),
-
-    (True, None, {'artefacts': [
-        (['tag3'], 'status2', ['user3'])
-    ]}, ['status2', 'tag3', 'user_user3'])
+@pytest.mark.parametrize("navigate_to_target, filtered_extra_column, list_filter, artefact_data, expected_tags", [
+    (
+        False, False, None,
+        {'artefacts': [
+            (['tag1', 'tag2'], 'in-progress', ['user1']),
+            (['tag3'], 'done', ['user2'])
+        ]},
+        ['done', 'in-progress', 'tag1', 'tag2', 'tag3', 'user_user1', 'user_user2']
+    ),
+    (
+        False, True, None,
+        {'artefacts': [
+            (['project_a', 'priority_high'], None, ['user1']),
+            (['feature_x'], 'done', ['user2'])
+        ]},
+        ['project_a']
+    ),
+    (
+        False, False, ListFilter(include_tags=['@kritik']),
+        {'artefacts': [
+            (['release', 'kritik'], 'review', ['dev1']),
+            (['bugfix'], 'to-do', ['dev2'])
+        ]},
+        ['kritik', 'release', 'review', 'user_dev1']
+    ),
+    (
+        True, False, None,
+        {'artefacts': [
+            (['tag3'], 'status2', ['user3'])
+        ]},
+        ['status2', 'tag3', 'user_user3']
+    ),
+    (
+        False, False, None,
+        {'artefacts': []},
+        []
+    ),
 ])
-@patch('ara_cli.template_manager.DirectoryNavigator')
 @patch('ara_cli.artefact_reader.ArtefactReader')
-def test_extract_tags(mock_artefact_reader, mock_directory_navigator, artefact, navigate_to_target, include_classifier, artefact_data, expected_tags):
-    # Mock the artefact reader to return artefact data
-    mock_artefact_reader.read_artefacts.return_value = {key: [artefact(
+@patch('ara_cli.template_manager.DirectoryNavigator')
+def test_extract_tags(mock_directory_navigator, mock_artefact_reader, artefact, navigate_to_target, filtered_extra_column, list_filter, artefact_data, expected_tags):
+    mock_artefacts = {key: [artefact(
         *data) for data in artefact_list] for key, artefact_list in artefact_data.items()}
+    mock_artefact_reader.read_artefacts.return_value = mock_artefacts
 
-    # Mock the directory navigator
     mock_navigator_instance = mock_directory_navigator.return_value
     mock_navigator_instance.navigate_to_target = MagicMock()
 
     tag_extractor = TagExtractor()
 
-    # Run the extract_tags method with include_classifier
     result = tag_extractor.extract_tags(
-        navigate_to_target=navigate_to_target, include_classifier=include_classifier)
+        navigate_to_target=navigate_to_target,
+        filtered_extra_column=filtered_extra_column,
+        list_filter=list_filter
+    )
 
-    # Assertions
     if navigate_to_target:
         mock_navigator_instance.navigate_to_target.assert_called_once()
     else:
         mock_navigator_instance.navigate_to_target.assert_not_called()
 
-    assert result == expected_tags
+    mock_artefact_reader.read_artefacts.assert_called_once()
+
+    assert sorted(result) == sorted(expected_tags)

ara_cli/version.py

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

{ara_cli-0.1.9.63.dist-info → ara_cli-0.1.9.65.dist-info}/METADATA

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

{ara_cli-0.1.9.63.dist-info → ara_cli-0.1.9.65.dist-info}/RECORD

@@ -1,15 +1,15 @@
 ara_cli/__init__.py,sha256=0zl7IegxTid26EBGLav_fXZ4CCIV3H5TfAoFQiOHjvg,148
 ara_cli/__main__.py,sha256=Z6XYWRLceIoZPvfC-X9EXouSZdtFOOe84kKVWJGA4r4,1861
-ara_cli/ara_command_action.py,sha256=SfWcXsLjaUdOpME2qJJ0pcCSXKY5M-zbSyj0W3u_8h4,19709
-ara_cli/ara_command_parser.py,sha256=aRxqKr0-pAuI45IuM-H4-ouc101h1_xTuEVJHXocPV0,17182
+ara_cli/ara_command_action.py,sha256=NN1DrmTEbLAUUHIFINDaLyp8gmKZA9cFw4cED0CFe9U,21177
+ara_cli/ara_command_parser.py,sha256=HHPHLYzvn2bGVjwZ7fhdKgwiHHJDbERRdLcTe8G9B1Q,17588
 ara_cli/ara_config.py,sha256=_Arkr-b9XnrNHbBlFKb9tAo3OmdP4ZZiWvbY9m6Sbo0,4178
-ara_cli/artefact_autofix.py,sha256=kkmf9hhvxqYicAm4kUDxFD1LoTr8KSPI5l12KRoZvqw,4900
-ara_cli/artefact_creator.py,sha256=mkxKHkVIK2GdmUrKHAjKvhq66eg21S3x_cvK1ZA9DPw,5964
+ara_cli/artefact_autofix.py,sha256=T0TJ6vBxveMoOKm6c22c6D-iMuBHlCksvNLil_O6xaM,4885
+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=XAvoiRafd1u21uKbX5-bow7hdq7uiLLy1KtxHNAFbCk,1337
+ara_cli/artefact_fuzzy_search.py,sha256=BBDe-IP75sWZjG6nTNFtVljjL01JlQUy5ccJBZ6Trow,2429
 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_reader.py,sha256=_RqBY1f1DWH2DThXETYuHeTB2ip0wgYuGvHYI_D6EJ4,8062
 ara_cli/artefact_renamer.py,sha256=loIn1DF9kVnjhH7wP1v5qUvt3s0uKeWXuQPrHXenQGE,4025
 ara_cli/artefact_scan.py,sha256=7PH7TE2B2Py7wGQxl7EYM3r6Fr9kVLAFtNErP0QRoXM,1950
 ara_cli/chat.py,sha256=7xTtPEDk052_wmIzoti7GavEJ1vpRxe5c084WQ1C7dg,28617
@@ -24,23 +24,23 @@ ara_cli/filename_validator.py,sha256=Aw9PL8d5-Ymhp3EY6lDrUBk3cudaNqo1Uw5RzPpI1jA
 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=gidrCI8wTLfPL0ktqiXyPeGdQEB0S0sZegSOiF1Nn0Y,7358
-ara_cli/prompt_handler.py,sha256=PzHoIPTAWtRleOMtprhyYlFfo59S5T_kzHHkrwL-cNU,17155
+ara_cli/prompt_extractor.py,sha256=a8LwPj6U8sG_v3SqDXQyPvDZQds4kHnYSO8eGissYJA,7503
+ara_cli/prompt_handler.py,sha256=1gz2VkK7zl0RAzit1UmxplNNd2Zu6J_7eHocgKiw_hQ,17473
 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=IrjX8R8pdas3_qWuDsXXnwCVDD0uUrgqjzfqTD81t3I,2173
+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=BPYHhB5DXV3V9HaoG9jWNjJoI6MwS8Abg07dp1EjppU,146
+ara_cli/version.py,sha256=1Z37icnDfTLV_xa6229A5btyIc1fDW2rl72E31bdi5s,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=W_jxafOd7d-1SxvB2G8dKG7_rT5t-EZo1-PnvlPHqso,14915
+ara_cli/artefact_models/artefact_model.py,sha256=SRVfeHVKCMJ8L9lqPzAr_MgI4m7mGdcYx0SE2ja-NEI,14949
 ara_cli/artefact_models/artefact_templates.py,sha256=Vd7SwoRVKNGKZmxBKS6f9FE1ThUOCqZLScu0ClPfIu8,8321
 ara_cli/artefact_models/businessgoal_artefact_model.py,sha256=jqYFMXjWle0YW9RvcFLDBAwy61bdT5VuDT_6lTOFzMw,4853
 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=TWJ7N0P2Wd8VtpbBPwJoiDnDSbHSRPPjyDfpvA-IqYc,13238
+ara_cli/artefact_models/feature_artefact_model.py,sha256=BeLsq9ZinzIDwss8nurIbxJZQ2qPgyRKRHrRlrl-zHA,15583
 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,7 +132,7 @@ ara_cli/templates/specification_breakdown_files/template.technology.exploration.
 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_autofix.py,sha256=8AaSuherD2dvo2wMFafgHnkLhSnMs6ZW6RtX-5VKsls,4248
-ara_cli/tests/test_ara_command_action.py,sha256=s7XlNMX1lohnwlRwdCHMKFpJdM7BxyEjYuOcba2BClw,25494
+ara_cli/tests/test_ara_command_action.py,sha256=Y5MrG6VjXgebliKfdFaCaS8i3GoZCGSLpj3AWCbL5Lk,25695
 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
@@ -147,11 +147,11 @@ ara_cli/tests/test_file_classifier.py,sha256=hbGp0-_A_LgQ0pGv1jWDEIyCgvDyfChcvvV
 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_tag_extractor.py,sha256=nSiAYlTKZ7TLAOtcJpwK5zTWHhFYU0tI5xKnivLc1dU,2712
 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.63.dist-info/METADATA,sha256=gxNdNrzLFrDWHMMskXW_kMFj0qBeoxoyFxilCHDsQiQ,415
-ara_cli-0.1.9.63.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.63.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.63.dist-info/top_level.txt,sha256=zzee_PwFmKqfBi9XgIunP6xy2S4TIt593CLLxenNaAE,8
-ara_cli-0.1.9.63.dist-info/RECORD,,
+ara_cli-0.1.9.65.dist-info/METADATA,sha256=nVFr74izr8-FxmQELehwrjkkIUwOQHDkAfwXeeMAFmQ,415
+ara_cli-0.1.9.65.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.9.65.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.9.65.dist-info/top_level.txt,sha256=zzee_PwFmKqfBi9XgIunP6xy2S4TIt593CLLxenNaAE,8
+ara_cli-0.1.9.65.dist-info/RECORD,,