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

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

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

{ara_cli-0.1.9.63 → ara_cli-0.1.9.64}/README.md

@@ -6,7 +6,6 @@
   - [update dependencies](#update-dependencies)
   - [test and run during development](#test-and-run-during-development)
   - [set version and build and install locally for testing outside of container](#set-version-and-build-and-install-locally-for-testing-outside-of-container)
-  - [upload to test pypi with test pypi API key](#upload-to-test-pypi-with-test-pypi-api-key)
   - [upload to live pypi with talsen team production API key (from main branch)](#upload-to-live-pypi-with-talsen-team-production-api-key-from-main-branch)
 
 # ara usage 
@@ -59,6 +58,8 @@ To update dependencies, add package names in `setup.py`. The packages will ONLY
 4. Test the functionality
 
 
+<!-- 
+#### DEPRECATED
 ## upload to test pypi with test pypi API key
 1. run `bash deploy.sh`
 2. run `login.sh`
@@ -73,19 +74,20 @@ twine upload --repository testpypi dist/* --verbose -u __token__ -p pypi-AgENdGV
 
 this will upload to a test pypi account.
 
-
-6. run `python3 -m pip install --index-url https://test.pypi.org/simple/ ara_cli==<VERSION>`
-7. run `ara -h`
-8. if everything has worked (upload, installation and usage) you can now continue to upload the package to pypi (live)
+1. run `python3 -m pip install --index-url https://test.pypi.org/simple/ ara_cli==<VERSION>`
+2. run `ara -h`
+3. if everything has worked (upload, installation and usage) you can now continue to upload the package to pypi (live)
+ -->
 
 
 ## upload to live pypi with talsen team production API key (from main branch)
 1. run `bash deploy.sh`
 2. run `login.sh`
-3. `dist` folder should still be there from the testupload (otherwise do `python setup.py sdist bdist_wheel` inside the container again), do NOT upload to live without previously testing in test pypi!
-4. Get the API-Key from [nextcloud](https://cloud.talsen.team/apps/keeweb/?open=%2Finfrastructure%2Fpublic-services%2Fapi-keys.kdbx)
-5. Get the Password from Hans or DevOps
-6. run the following command: 
+3. from inside container run `python setup.py sdist bdist_wheel`
+4. `dist` folder should now contain the built wheel ready to upload
+5. Get the API-Key from [nextcloud](https://cloud.talsen.team/apps/keeweb/?open=%2Finfrastructure%2Fpublic-services%2Fapi-keys.kdbx)
+6. Get the Password from Hans or DevOps
+7. run the following command: 
 ```bash
 twine upload dist/* --verbose -u __token__ -p <API-Key>
 ```

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

@@ -334,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}'"
 
@@ -367,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.63 → ara_cli-0.1.9.64}/ara_cli/ara_command_parser.py

@@ -184,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.63 → ara_cli-0.1.9.64}/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-0.1.9.63 → 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.63 → 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
 
@@ -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-0.1.9.63 → 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.63 → 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.63 → ara_cli-0.1.9.64}/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.64"   # fith parameter like .0 for local install test purposes only. official numbers should be 4 digit numbers

{ara_cli-0.1.9.63 → 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.63
+Version: 0.1.9.64
 Requires-Dist: litellm
 Requires-Dist: llama-index
 Requires-Dist: llama-index-llms-openai