ara-cli 0.1.9.79__tar.gz → 0.1.9.80__tar.gz

{ara_cli-0.1.9.79 → ara_cli-0.1.9.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.79
+Version: 0.1.9.80
 Summary: Powerful, open source command-line tool for managing, structuring and automating software development artifacts in line with Business-Driven Development (BDD) and AI-assisted processes
 Description-Content-Type: text/markdown
 Requires-Dist: litellm

{ara_cli-0.1.9.79 → ara_cli-0.1.9.80}/ara_cli/__main__.py

@@ -20,6 +20,7 @@ from ara_cli.ara_command_action import (
     classifier_directory_action,
     scan_action,
     autofix_action,
+    extract_action
 )
 import argcomplete
 import sys
@@ -45,6 +46,7 @@ def define_action_mapping():
         "classifier-directory": classifier_directory_action,
         "scan": scan_action,
         "autofix": autofix_action,
+        "extract": extract_action
     }
 
 

{ara_cli-0.1.9.79 → ara_cli-0.1.9.80}/ara_cli/ara_command_action.py

@@ -609,3 +609,18 @@ def autofix_action(args):
             )
 
     print("\nAutofix process completed. Please review the changes.")
+
+
+def extract_action(args):
+    from ara_cli.commands.extract_command import ExtractCommand
+
+    filename = args.filename
+    skip_queries = args.skip_queries
+    print(file_name)
+    command = ExtractCommand(
+        file_name=filename,
+        skip_queries=skip_queries,
+        output=lambda msg: print(msg, file=sys.stdout),
+        error_output=lambda msg: print(msg, file=sys.stderr)
+    )
+    command.execute()

{ara_cli-0.1.9.79 → ara_cli-0.1.9.80}/ara_cli/ara_command_parser.py

@@ -422,6 +422,19 @@ def autofix_parser(subparsers):
     )
 
 
+def extract_parser(subparsers):
+    extract_parser = subparsers.add_parser("extract", help="Extract blocks of marked content from a given file.")
+    extract_parser.add_argument(
+        "filename",
+        help="Input file to extract from."
+    )
+    extract_parser.add_argument(
+        "--skip-queries", "-s",
+        action="store_true",
+        help="Answer queries with yes when extracting."
+    )
+
+
 class CustomHelpFormatter(argparse.HelpFormatter):
     def __init__(self, *args, **kwargs):
         self.add_examples = kwargs.pop("add_examples", False)
@@ -532,5 +545,6 @@ def action_parser():
     classifier_directory_parser(subparsers)
     scan_parser(subparsers)
     autofix_parser(subparsers)
+    extract_parser(subparsers)
 
     return parser

{ara_cli-0.1.9.79 → ara_cli-0.1.9.80}/ara_cli/chat.py

@@ -1,8 +1,13 @@
 import os
 import cmd2
+import argparse
 from ara_cli.prompt_handler import send_prompt
 
 
+extract_parser = argparse.ArgumentParser()
+extract_parser.add_argument('-s', '--skip-queries', action='store_true', help='Force extraction')
+
+
 class Chat(cmd2.Cmd):
     CATEGORY_CHAT_CONTROL = "Chat control commands"
     CATEGORY_LLM_CONTROL = "Language model controls"
@@ -741,12 +746,18 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         self._load_template_from_global_or_local(template_name=template_name, template_type=template_type)
 
     @cmd2.with_category(CATEGORY_CHAT_CONTROL)
-    def do_EXTRACT(self, _):
-        """Search for markdown code blocks containing \"# [x] extract\" as first line and \"# filename: <path/filename>\" as second line and copy the content of the code block to the specified file. The extracted code block is then marked with \"# [v] extract\""""
-        from ara_cli.prompt_extractor import extract_responses
-
-        extract_responses(self.chat_name, True)
-        print("End of extraction")
+    @cmd2.with_argparser(extract_parser)
+    def do_EXTRACT(self, args):
+        """Search for markdown code blocks containing "# [x] extract" as first line and "# filename: <path/filename>" as second line and copy the content of the code block to the specified file. The extracted code block is then marked with "# [v] extract"."""
+        from ara_cli.commands.extract_command import ExtractCommand
+
+        command = ExtractCommand(
+            file_name=self.chat_name,
+            skip_queries=args.skip_queries,
+            output=self.poutput,
+            error_output=self.perror
+        )
+        command.execute()
 
     @cmd2.with_category(CATEGORY_CHAT_CONTROL)
     def do_LOAD_GIVENS(self, file_name):

ara_cli-0.1.9.80/ara_cli/commands/command.py

@@ -0,0 +1,7 @@
+from abc import ABC, abstractmethod
+
+
+class Command(ABC):
+    @abstractmethod
+    def execute(self, *args, **kwargs):     # pragma: no cover
+        pass

ara_cli-0.1.9.80/ara_cli/commands/extract_command.py

@@ -0,0 +1,21 @@
+from ara_cli.commands.command import Command
+from ara_cli.prompt_extractor import extract_responses
+import os
+
+class ExtractCommand(Command):
+    def __init__(self, file_name, skip_queries=False, output=None, error_output=None):
+        self.file_name = file_name
+        self.skip_queries = skip_queries
+        self.output = output    # Callable for standard output (optional)
+        self.error_output = error_output  # Callable for errors (optional)
+
+    def execute(self, *args, **kwargs):
+        try:
+            extract_responses(self.file_name, True, skip_queries=self.skip_queries)
+            if self.output:
+                self.output("End of extraction")
+        except Exception as e:
+            if self.error_output:
+                self.error_output(f"Extraction failed: {e}")
+            else:
+                raise

{ara_cli-0.1.9.79 → ara_cli-0.1.9.80}/ara_cli/prompt_extractor.py

@@ -17,7 +17,7 @@ def extract_code_blocks_md(markdown_text):
     return code_blocks
 
 
-def extract_responses(document_path, relative_to_ara_root=False):
+def extract_responses(document_path, relative_to_ara_root=False, skip_queries=False):
     print(f"Debug: Starting extraction from {document_path}")
     block_extraction_counter = 0
 
@@ -26,7 +26,6 @@ def extract_responses(document_path, relative_to_ara_root=False):
 
     cwd = os.getcwd()
     if relative_to_ara_root:
-        from ara_cli.directory_navigator import DirectoryNavigator
         navigator = DirectoryNavigator()
         navigator.navigate_to_target()
         os.chdir('..')
@@ -52,7 +51,7 @@ def extract_responses(document_path, relative_to_ara_root=False):
             block_lines = block_lines[1:]  # Remove first line again after removing filename line
             block = '\n'.join(block_lines)
 
-            handle_existing_file(file_path, block)
+            handle_existing_file(file_path, block, skip_queries)
             block_extraction_counter += 1
 
             # Update the markdown content
@@ -81,8 +80,7 @@ def extract_responses(document_path, relative_to_ara_root=False):
             artefact_path = artefact.file_path
             directory = os.path.dirname(artefact_path)
             os.makedirs(directory, exist_ok=True)
-            with open(artefact_path, 'w', encoding='utf-8') as file:
-                file.write(serialized_artefact)
+            handle_existing_file(artefact_path, serialized_artefact, skip_queries)
 
             os.chdir(original_directory)
 
@@ -127,12 +125,19 @@ def prompt_user_decision(prompt):
     return input(prompt)
 
 
-def create_file_if_not_exist(filename, content):
+def determine_should_create(skip_query=False):
+    if skip_query:
+        return True
+    user_decision = prompt_user_decision("File does not exist. Create? (y/n): ")
+    if user_decision.lower() in ['y', 'yes']:
+        return True
+    return False
+
+
+def create_file_if_not_exist(filename, content, skip_query=False):
     try:
         if not os.path.exists(filename):
-            user_decision = prompt_user_decision("File does not exist. Create? (y/n): ")
-
-            if user_decision.lower() in ['y', 'yes']:
+            if determine_should_create(skip_query):
                 # Ensure the directory exists
                 os.makedirs(os.path.dirname(filename), exist_ok=True)
 
@@ -170,7 +175,7 @@ def create_prompt_for_file_modification(content_str, filename):
     {{
         "filename": "path/filename.filextension",
         "content":  "full content of the modified file in valid json format"
-    }} 
+    }}
     """
 
     # print(f"Debug: modification prompt created: {prompt_text}")
@@ -178,10 +183,10 @@ def create_prompt_for_file_modification(content_str, filename):
     return prompt_text
 
 
-def handle_existing_file(filename, block_content):
+def handle_existing_file(filename, block_content, skip_query=False):
     if not os.path.isfile(filename):
         print(f"File {filename} does not exist, attempting to create")
-        create_file_if_not_exist(filename, block_content)
+        create_file_if_not_exist(filename, block_content, skip_query)
     else:
         print(f"File {filename} exists, creating modification prompt")
         prompt_text = create_prompt_for_file_modification(block_content, filename)

{ara_cli-0.1.9.79 → ara_cli-0.1.9.80}/ara_cli/version.py

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

{ara_cli-0.1.9.79 → ara_cli-0.1.9.80}/ara_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.79
+Version: 0.1.9.80
 Summary: Powerful, open source command-line tool for managing, structuring and automating software development artifacts in line with Business-Driven Development (BDD) and AI-assisted processes
 Description-Content-Type: text/markdown
 Requires-Dist: litellm

{ara_cli-0.1.9.79 → ara_cli-0.1.9.80}/ara_cli.egg-info/SOURCES.txt

@@ -57,6 +57,9 @@ 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/commands/__init__.py
+ara_cli/commands/command.py
+ara_cli/commands/extract_command.py
 ara_cli/templates/agile.artefacts
 ara_cli/templates/template.businessgoal.prompt_log.md
 ara_cli/templates/template.capability.prompt_log.md

{ara_cli-0.1.9.79 → ara_cli-0.1.9.80}/tests/test_chat.py

@@ -1173,7 +1173,7 @@ def test_do_EXTRACT(temp_chat_file, capsys):
 
     with patch('ara_cli.prompt_extractor.extract_responses') as mock_extract_responses:
         chat.do_EXTRACT("")
-        mock_extract_responses.assert_called_once_with(temp_chat_file.name, True)
+        mock_extract_responses.assert_called_once_with(temp_chat_file.name, True, skip_queries=False)
 
     captured = capsys.readouterr()
     assert "End of extraction" in captured.out