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

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/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/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/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/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/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/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/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/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/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/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/tag_extractor.py

@@ -6,7 +6,7 @@ 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):
+    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
 
@@ -21,11 +21,36 @@ class TagExtractor:
 
         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)
+        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/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.dist-info → ara_cli-0.1.9.63.dist-info}/METADATA

@@ -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.dist-info → ara_cli-0.1.9.63.dist-info}/RECORD

@@ -1,9 +1,9 @@
 ara_cli/__init__.py,sha256=0zl7IegxTid26EBGLav_fXZ4CCIV3H5TfAoFQiOHjvg,148
 ara_cli/__main__.py,sha256=Z6XYWRLceIoZPvfC-X9EXouSZdtFOOe84kKVWJGA4r4,1861
-ara_cli/ara_command_action.py,sha256=a2NP1cfWnqSkWWGFG_7iMkIkkOTYd83e_kWzdNyKDTI,19618
-ara_cli/ara_command_parser.py,sha256=qsPo1nsln-vdQUGykH2Zaa3-f1gqcf3c-td0WwSn4r0,17067
+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_config.py,sha256=_Arkr-b9XnrNHbBlFKb9tAo3OmdP4ZZiWvbY9m6Sbo0,4178
-ara_cli/artefact_autofix.py,sha256=If9a7C6B2i7hpyquQ4pDGCUtXvmHVhFkjF2I0QtqaLg,4533
+ara_cli/artefact_autofix.py,sha256=kkmf9hhvxqYicAm4kUDxFD1LoTr8KSPI5l12KRoZvqw,4900
 ara_cli/artefact_creator.py,sha256=mkxKHkVIK2GdmUrKHAjKvhq66eg21S3x_cvK1ZA9DPw,5964
 ara_cli/artefact_deleter.py,sha256=Co4wwCH3yW8H9NrOq7_2p5571EeHr0TsfE-H8KqoOfY,1900
 ara_cli/artefact_fuzzy_search.py,sha256=XAvoiRafd1u21uKbX5-bow7hdq7uiLLy1KtxHNAFbCk,1337
@@ -11,7 +11,7 @@ ara_cli/artefact_link_updater.py,sha256=itMS_Z64jE8bBly9WA01z8PqkBeNW6ntTO7ryMeC
 ara_cli/artefact_lister.py,sha256=jhk4n4eqp7hDIq07q43QzS7-36BM3OfZ4EABxCeOGcw,4764
 ara_cli/artefact_reader.py,sha256=qNaMPWShmWtDU5LLdh9efFB27djI4NAoq6zEFwdTd38,6983
 ara_cli/artefact_renamer.py,sha256=loIn1DF9kVnjhH7wP1v5qUvt3s0uKeWXuQPrHXenQGE,4025
-ara_cli/artefact_scan.py,sha256=bIk_xa_nB2oQHjBeYChwHwHIxo5hDjYhzq-KWCWmUFE,1879
+ara_cli/artefact_scan.py,sha256=7PH7TE2B2Py7wGQxl7EYM3r6Fr9kVLAFtNErP0QRoXM,1950
 ara_cli/chat.py,sha256=7xTtPEDk052_wmIzoti7GavEJ1vpRxe5c084WQ1C7dg,28617
 ara_cli/classifier.py,sha256=zWskj7rBYdqYBGjksBm46iTgVU5IIf2PZsJr4qeiwVU,1878
 ara_cli/codefusionretriever.py,sha256=fCHgXdIBRzkVAnapX-KI2NQ44XbrrF4tEQmn5J6clUI,1980
@@ -28,23 +28,24 @@ ara_cli/prompt_extractor.py,sha256=gidrCI8wTLfPL0ktqiXyPeGdQEB0S0sZegSOiF1Nn0Y,7
 ara_cli/prompt_handler.py,sha256=PzHoIPTAWtRleOMtprhyYlFfo59S5T_kzHHkrwL-cNU,17155
 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=R5T103Y60NppYifKV7b8KoI5kE1M66fULz6f_Fdc9VU,1081
+ara_cli/tag_extractor.py,sha256=IrjX8R8pdas3_qWuDsXXnwCVDD0uUrgqjzfqTD81t3I,2173
 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=UDea-52RJGs95q2okzxXLTnZ6sNY38mCpNb6vavgKKU,146
+ara_cli/version.py,sha256=BPYHhB5DXV3V9HaoG9jWNjJoI6MwS8Abg07dp1EjppU,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=vV-Hhtl6DwVt7qcFTnxxr_WqyTZnKtkFU-nryVnTbUg,14853
+ara_cli/artefact_models/artefact_model.py,sha256=W_jxafOd7d-1SxvB2G8dKG7_rT5t-EZo1-PnvlPHqso,14915
 ara_cli/artefact_models/artefact_templates.py,sha256=Vd7SwoRVKNGKZmxBKS6f9FE1ThUOCqZLScu0ClPfIu8,8321
-ara_cli/artefact_models/businessgoal_artefact_model.py,sha256=mgLOgVRR8MrUqWX6ovcHo7octdfi8AaJiJcbrL4F9R4,4728
+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=KKwW-vZkdso2L-wAWNWbLfGXGQK8M4A10sldDxi8QVE,5648
+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=7QgX0C5WC0QCUX29xbZFwUNaD74gb7l4PQFcA8GhULU,13125
+ara_cli/artefact_models/feature_artefact_model.py,sha256=TWJ7N0P2Wd8VtpbBPwJoiDnDSbHSRPPjyDfpvA-IqYc,13238
 ara_cli/artefact_models/issue_artefact_model.py,sha256=v6CpKnkqiUh6Wch2kkEmyyW49c8ysdy1qz8l1Ft9uJA,2552
-ara_cli/artefact_models/keyfeature_artefact_model.py,sha256=sD4tBgQQGTZ-PcYVDb3cp81rT2SQy8kQ-V9NxRGrYu8,4126
+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
 ara_cli/artefact_models/task_artefact_model.py,sha256=kHMw_Tr-Ud3EeHWpRWy4jI0xFnPzGZ-FT52c5rSrT1k,3558
-ara_cli/artefact_models/userstory_artefact_model.py,sha256=oJ8sHX-RbqGotehfUF43xs-5TsZh8PTmEtgjUfc7lWQ,6465
+ara_cli/artefact_models/userstory_artefact_model.py,sha256=u6G8wdeE2EpOsg1OPR-s8uShB4A77GfqN0vkSSuthFI,6582
 ara_cli/artefact_models/vision_artefact_model.py,sha256=KcNE3QQjyT29ZMMhCQo4pOcXKTkI6pXLvyfqoN2kuUQ,5920
 ara_cli/templates/agile.artefacts,sha256=nTA8dp98HWKAD-0qhmNpVYIfkVGoJshZqMJGnphiOsE,7932
 ara_cli/templates/template.businessgoal,sha256=3OU-y8dOCRbRsB9ovBzwFPxHSbG0dqbkok0uJnZIOd4,524
@@ -149,8 +150,8 @@ ara_cli/tests/test_list_filter.py,sha256=gSRKirTtFuhRS3QlFHqWl89WvCvAdVEnFsCWTYm
 ara_cli/tests/test_tag_extractor.py,sha256=n2xNApbDciqKO3QuaveEWSPXU1PCUa_EhxlZMrukONw,2074
 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.62.dist-info/METADATA,sha256=qcj03ih0hWhPZ3etcPqr99iZNELjw53lz63Q5AsG8Zo,415
-ara_cli-0.1.9.62.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.62.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.62.dist-info/top_level.txt,sha256=zzee_PwFmKqfBi9XgIunP6xy2S4TIt593CLLxenNaAE,8
-ara_cli-0.1.9.62.dist-info/RECORD,,
+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,,