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

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

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

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

@@ -6,6 +6,7 @@
   - [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 
@@ -58,8 +59,6 @@ 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`
@@ -74,20 +73,19 @@ twine upload --repository testpypi dist/* --verbose -u __token__ -p pypi-AgENdGV
 
 this will upload to a test pypi account.
 
-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)
- -->
+
+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)
 
 
 ## upload to live pypi with talsen team production API key (from main branch)
 1. run `bash deploy.sh`
 2. run `login.sh`
-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: 
+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: 
 ```bash
 twine upload dist/* --verbose -u __token__ -p <API-Key>
 ```

{ara_cli-0.1.9.62 → ara_cli-0.1.9.63}/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})

{ara_cli-0.1.9.62 → ara_cli-0.1.9.63}/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):

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

@@ -83,26 +83,38 @@ 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 complete, 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. "
+        "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="gpt-4o",
                   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.63}/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.63}/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.63}/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.63}/ara_cli/artefact_models/feature_artefact_model.py

@@ -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
 

{ara_cli-0.1.9.62 → ara_cli-0.1.9.63}/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.63/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.63}/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.63}/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.63/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.63}/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.63"   # 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.63}/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.63
 Requires-Dist: litellm
 Requires-Dist: llama-index
 Requires-Dist: llama-index-llms-openai

{ara_cli-0.1.9.62 → ara_cli-0.1.9.63}/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