ara-cli 0.1.9.62__tar.gz → 0.1.9.64__tar.gz

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/PKG-INFO

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

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli/ara_command_action.py

@@ -128,7 +128,10 @@ def list_tags_action(args):
         tag_classifier = args.include_classifier
 
     tag_extractor = TagExtractor()
-    tags = tag_extractor.extract_tags(include_classifier=tag_classifier)
+    tags = tag_extractor.extract_tags(
+        include_classifier=tag_classifier,
+        filtered_extra_column=getattr(args, "filtered_extra_column", False)
+    )
 
     if args.json:
         output = json.dumps({"tags": tags})
@@ -331,11 +334,15 @@ 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 = None
+    if args.rule:
+        rule = ' '.join(args.rule)
 
     read_error_message = f"Could not connect {classifier} '{artefact_name}' to {parent_classifier} '{parent_name}'"
 
@@ -364,10 +371,17 @@ def reconnect_action(args):
         content=parent_content
     )
 
-    artefact.contribution = Contribution(
+    contribution = Contribution(
         artefact_name=parent.title,
         classifier=parent.artefact_type
     )
+
+    if rule:
+        closest_rule = find_closest_rule(parent, rule)
+        print("")
+        contribution.rule = closest_rule
+
+    artefact.contribution = contribution
     with open(artefact.file_path, 'w') as file:
         artefact_content = artefact.serialize()
         file.write(artefact_content)

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli/ara_command_parser.py

@@ -121,6 +121,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("--filtered-extra-column", action="store_true", help="Filter tags for extra column") 
 
 
 def add_chat_arguments(chat_parser):
@@ -183,6 +184,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", nargs='+')
 
 
 def read_status_parser(subparsers):

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli/artefact_autofix.py

@@ -83,26 +83,37 @@ def construct_prompt(artefact_type, reason, file_path, artefact_text):
 
     prompt = (
         f"Correct the following {artefact_type} artefact to fix the issue: {reason}. "
-        f"Provide the complete, corrected artefact. Don't change the artefact's content, "
-        f"just fix the pydantic model errors. You should follow the name of the file "
-        f"from its path {file_path} for naming the arteafact's title. The current artefact is:\n{artefact_text}"
+        "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 "
+        f"from its path {file_path} for naming the arteafact's title. "
+        "You are not allowed to use file extention in the artefact title. "
+        "You are not allowed to modify, delete or add tags. "
+        "User tag should be '@user_<username>'. The pydantic model already provides the '@user_' prefix. "
+        "So you should be careful to not make it @user_user_<username>. "
     )
 
     if artefact_type == ArtefactType.task:
         prompt += (
-            "\nFor task artefacts, if the action items looks like template or empty "
+            "For task artefacts, if the action items looks like template or empty "
             "then just delete those action items."
-            "\nFor user tag it should be '@user_{username}'. So you should be careful to "
-            "not make it @user_user_{username}"
         )
 
+    prompt += (
+        "\nThe current artefact is:\n"
+        "```\n"
+        f"{artefact_text}\n"
+        "```"
+    )
+
     return prompt
 
 
 def run_agent(prompt, artefact_class):
     from pydantic_ai import Agent
-
-    agent = Agent(model="openai:gpt-4o",
+    # gpt-4o
+    # anthropic:claude-3-7-sonnet-20250219
+    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-0.1.9.62 → ara_cli-0.1.9.64}/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, rule):
+    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-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli/artefact_models/artefact_model.py

@@ -179,7 +179,7 @@ class Artefact(BaseModel, ABC):
     )
     description: Optional[str] = Field(
         default=None,
-        description="Optional further description to understand the artefact. It is strongly recommended to add a description to every artefact."
+        description="Optional further description to understand the artefact. The description should summerize the core intention of the artefact and give additional valuable information about the artefact."
     )
 
     @property

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli/artefact_models/businessgoal_artefact_model.py

@@ -33,9 +33,14 @@ class BusinessgoalIntent(Intent):
         return v
 
     def serialize(self):
+        from ara_cli.artefact_models.serialize_helper import as_a_serializer
+
         lines = []
+
+        as_a_line = as_a_serializer(self.as_a)
+        
         lines.append(f"In order to {self.in_order_to}")
-        lines.append(f"As a {self.as_a}")
+        lines.append(as_a_line)
         lines.append(f"I want {self.i_want}")
 
         return "\n".join(lines)

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli/artefact_models/epic_artefact_model.py

@@ -34,9 +34,14 @@ class EpicIntent(Intent):
         return v
 
     def serialize(self):
+        from ara_cli.artefact_models.serialize_helper import as_a_serializer
+
         lines = []
+
+        as_a_line = as_a_serializer(self.as_a)
+
         lines.append(f"In order to {self.in_order_to}")
-        lines.append(f"As a {self.as_a}")
+        lines.append(as_a_line)
         lines.append(f"I want {self.i_want}")
 
         return "\n".join(lines)

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/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
 
@@ -34,8 +34,13 @@ class FeatureIntent(Intent):
         return v
 
     def serialize(self):
+        from ara_cli.artefact_models.serialize_helper import as_a_serializer
+
         lines = []
-        lines.append(f"As a {self.as_a}")
+
+        as_a_line = as_a_serializer(self.as_a)
+
+        lines.append(as_a_line)
         lines.append(f"I want to {self.i_want_to}")
         lines.append(f"So that {self.so_that}")
 
@@ -59,9 +64,9 @@ class FeatureIntent(Intent):
                 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:
+            if 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:
+            if line.startswith(so_that_prefix) and not so_that:
                 so_that = line[len(so_that_prefix):].strip()
             index += 1
 
@@ -93,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."
@@ -208,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):
@@ -224,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):
@@ -304,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))
@@ -316,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)
@@ -343,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-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli/artefact_models/keyfeature_artefact_model.py

@@ -33,9 +33,14 @@ class KeyfeatureIntent(Intent):
         return v
 
     def serialize(self):
+        from ara_cli.artefact_models.serialize_helper import as_a_serializer
+
         lines = []
+
+        as_a_line = as_a_serializer(self.as_a)
+
         lines.append(f"In order to {self.in_order_to}")
-        lines.append(f"As a {self.as_a}")
+        lines.append(as_a_line)
         lines.append(f"I want {self.i_want}")
 
         return "\n".join(lines)

ara_cli-0.1.9.64/ara_cli/artefact_models/serialize_helper.py

@@ -0,0 +1,18 @@
+def as_a_serializer(as_a):
+    role = as_a.strip()
+
+    exceptions_for_a = ('user', 'university', 'one-time', 'european', 'unit')
+    exceptions_for_an = ('hour', 'honest', 'heir')
+    role_lower = role.lower()
+    as_a_prefix = ""
+
+    if any(role_lower.startswith(e) for e in exceptions_for_a):
+        as_a_prefix = "As a"
+    elif any(role_lower.startswith(e) for e in exceptions_for_an):
+        as_a_prefix = "As an"
+    elif role_lower.startswith(('a', 'e', 'i', 'o', 'u')):
+        as_a_prefix = "As an"
+    else:
+        as_a_prefix = "As a"
+
+    return f"{as_a_prefix} {role}"

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli/artefact_models/userstory_artefact_model.py

@@ -33,9 +33,14 @@ class UserstoryIntent(Intent):
         return v
 
     def serialize(self):
+        from ara_cli.artefact_models.serialize_helper import as_a_serializer
+
         lines = []
+
+        as_a_line = as_a_serializer(self.as_a)
+
         lines.append(f"In order to {self.in_order_to}")
-        lines.append(f"As a {self.as_a}")
+        lines.append(as_a_line)
         lines.append(f"I want {self.i_want}")
 
         return "\n".join(lines)

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli/artefact_scan.py

@@ -25,6 +25,8 @@ def find_invalid_files(classified_artefact_info, classifier):
     for artefact_info in classified_artefact_info[classifier]:
         if "templates/" in artefact_info["file_path"]:
             continue
+        if ".data" in artefact_info["file_path"]:
+            continue
         is_valid, reason = check_file(artefact_info["file_path"], artefact_class)
         if not is_valid:
             invalid_files.append((artefact_info["file_path"], reason))

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/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-0.1.9.62 → ara_cli-0.1.9.64}/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-0.1.9.64/ara_cli/tag_extractor.py

@@ -0,0 +1,56 @@
+import os
+from ara_cli.artefact_models.artefact_load import artefact_from_content
+
+
+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):
+        from ara_cli.template_manager import DirectoryNavigator
+        from ara_cli.artefact_reader import ArtefactReader
+
+        navigator = DirectoryNavigator()
+        if navigate_to_target:
+            navigator.navigate_to_target()
+
+        artefacts = ArtefactReader.read_artefacts()
+
+        if include_classifier:
+            artefacts = {include_classifier: artefacts[include_classifier]}
+
+        unique_tags = set()
+
+        if filtered_extra_column:
+            status_tags = {"to-do", "in-progress", "review", "done", "closed"}
+            filtered_artefacts = []
+
+            for artefact_list in 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)
+
+            for artefact in filtered_artefacts:
+                tags = [tag for tag in (
+                    artefact.tags + [artefact.status]) if tag is not None]
+                for tag in tags:
+                    if (
+                        tag in status_tags
+                        or tag.startswith("priority_")
+                        or tag.startswith("user_")
+                    ):
+                        continue
+                    unique_tags.add(tag)
+
+        else:
+            for artefact_list in 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]
+                    unique_tags.update(tags)
+
+        sorted_tags = sorted(unique_tags)
+        return sorted_tags

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli/version.py

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

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli.egg-info/PKG-INFO

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

{ara_cli-0.1.9.62 → ara_cli-0.1.9.64}/ara_cli.egg-info/SOURCES.txt

@@ -52,6 +52,7 @@ ara_cli/artefact_models/example_artefact_model.py
 ara_cli/artefact_models/feature_artefact_model.py
 ara_cli/artefact_models/issue_artefact_model.py
 ara_cli/artefact_models/keyfeature_artefact_model.py
+ara_cli/artefact_models/serialize_helper.py
 ara_cli/artefact_models/task_artefact_model.py
 ara_cli/artefact_models/userstory_artefact_model.py
 ara_cli/artefact_models/vision_artefact_model.py

ara_cli-0.1.9.62/ara_cli/tag_extractor.py

@@ -1,31 +0,0 @@
-import os
-from ara_cli.artefact_models.artefact_load import artefact_from_content
-
-
-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):
-        from ara_cli.template_manager import DirectoryNavigator
-        from ara_cli.artefact_reader import ArtefactReader
-
-        navigator = DirectoryNavigator()
-        if navigate_to_target:
-            navigator.navigate_to_target()
-
-        artefacts = ArtefactReader.read_artefacts()
-
-        if include_classifier:
-            artefacts = {include_classifier: artefacts[include_classifier]}
-
-        unique_tags = set()
-
-        for artefact_list in 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]
-                unique_tags.update(tags)
-
-        sorted_tags = sorted(unique_tags)
-        return sorted_tags