ara-cli 0.1.9.95__tar.gz → 0.1.10.0__tar.gz

{ara_cli-0.1.9.95 → ara_cli-0.1.10.0}/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.95
+Version: 0.1.10.0
 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: langfuse
 Requires-Dist: litellm
 Requires-Dist: llama-index
 Requires-Dist: llama-index-llms-openai

{ara_cli-0.1.9.95 → ara_cli-0.1.10.0}/ara_cli/__init__.py

@@ -1,17 +1,20 @@
 import warnings
-from .version import __version__
+from .error_handler import ErrorHandler
 
 
 whitelisted_commands = ["RERUN", "SEND", "EXTRACT", "LOAD_IMAGE", "CHOOSE_MODEL", "CHOOSE_EXTRACTION_MODEL", "CURRENT_MODEL", "CURRENT_EXTRACTION_MODEL", "LIST_MODELS"]
 
 
+error_handler = ErrorHandler()
+
+
 # ANSI escape codes for coloring
 YELLOW = '\033[93m'
 RESET = '\033[0m'
 
 
 def format_warning(message, category, *args, **kwargs):
-    return f'{YELLOW}{category.__name__}: {message}{RESET}\n'
+    return f'{YELLOW}[WARNING] {category.__name__}: {message}{RESET}\n'
 
 
 warnings.formatwarning = format_warning

ara_cli-0.1.10.0/ara_cli/__main__.py

@@ -0,0 +1,129 @@
+# PYTHON_ARGCOMPLETE_OK
+from ara_cli.ara_command_parser import action_parser
+from ara_cli.error_handler import AraError
+from ara_cli.version import __version__
+from ara_cli.ara_command_action import (
+    create_action,
+    delete_action,
+    rename_action,
+    list_action,
+    list_tags_action,
+    prompt_action,
+    chat_action,
+    template_action,
+    fetch_templates_action,
+    read_action,
+    reconnect_action,
+    read_status_action,
+    read_user_action,
+    set_status_action,
+    set_user_action,
+    classifier_directory_action,
+    scan_action,
+    autofix_action,
+    extract_action,
+    load_action
+)
+from . import error_handler
+import argcomplete
+import sys
+from os import getenv
+
+
+def define_action_mapping():
+    return {
+        "create": create_action,
+        "delete": delete_action,
+        "rename": rename_action,
+        "list": list_action,
+        "list-tags": list_tags_action,
+        "prompt": prompt_action,
+        "chat": chat_action,
+        "template": template_action,
+        "fetch-templates": fetch_templates_action,
+        "read": read_action,
+        "reconnect": reconnect_action,
+        "read-status": read_status_action,
+        "read-user": read_user_action,
+        "set-status": set_status_action,
+        "set-user": set_user_action,
+        "classifier-directory": classifier_directory_action,
+        "scan": scan_action,
+        "autofix": autofix_action,
+        "extract": extract_action,
+        "load": load_action
+    }
+
+
+def handle_invalid_action(args):
+    raise AraError("Invalid action provided. Type ara -h for help", error_code=1)
+
+
+def is_debug_mode_enabled():
+    """Check if debug mode is enabled via environment variable."""
+    return getenv('ARA_DEBUG', '').lower() in ('1', 'true', 'yes')
+
+
+def setup_parser():
+    """Create and configure the argument parser."""
+    parser = action_parser()
+    
+    # Show examples when help is called
+    if any(arg in sys.argv for arg in ["-h", "--help"]):
+        parser.add_examples = True
+    
+    parser.add_argument(
+        "-v", "--version", action="version", version=f"%(prog)s {__version__}"
+    )
+    
+    parser.add_argument(
+        "--debug", action="store_true", help="Enable debug mode for detailed error output"
+    )
+    
+    return parser
+
+
+def configure_debug_mode(args, env_debug_mode):
+    """Configure debug mode based on arguments and environment."""
+    if (hasattr(args, 'debug') and args.debug) or env_debug_mode:
+        error_handler.debug_mode = True
+
+
+def should_show_help(args):
+    """Check if help should be displayed."""
+    return not hasattr(args, "action") or not args.action
+
+
+def execute_action(args, action_mapping):
+    """Execute the specified action."""
+    action = action_mapping.get(args.action, handle_invalid_action)
+    action(args)
+
+
+def cli():
+    debug_mode = is_debug_mode_enabled()
+    
+    try:
+        parser = setup_parser()
+        action_mapping = define_action_mapping()
+        
+        argcomplete.autocomplete(parser)
+        args = parser.parse_args()
+        
+        configure_debug_mode(args, debug_mode)
+        
+        if should_show_help(args):
+            parser.print_help()
+            return
+            
+        execute_action(args, action_mapping)
+        
+    except KeyboardInterrupt:
+        print("\n[INFO] Operation cancelled by user", file=sys.stderr)
+        sys.exit(130)  # Standard exit code for Ctrl+C
+    except Exception as e:
+        error_handler.handle_error(e, context="cli")
+
+
+if __name__ == "__main__":
+    cli()

{ara_cli-0.1.9.95 → ara_cli-0.1.10.0}/ara_cli/ara_command_action.py

@@ -2,17 +2,19 @@ from os.path import join
 import os
 import sys
 import json
+from ara_cli.error_handler import AraError
+from ara_cli.error_handler import handle_errors, AraValidationError
 from ara_cli.output_suppressor import suppress_stdout
 from ara_cli.artefact_fuzzy_search import suggest_close_name_matches
-from . import whitelisted_commands
+from . import whitelisted_commands, error_handler
 
 
 def check_validity(condition, error_message):
     if not condition:
-        print(error_message)
-        sys.exit(1)
+        raise AraValidationError(error_message)
 
 
+@handle_errors(context="create action", error_handler=error_handler)
 def create_action(args):
     from ara_cli.artefact_creator import ArtefactCreator
     from ara_cli.classifier import Classifier
@@ -62,6 +64,7 @@ def create_action(args):
     artefact_creator.run(args.parameter, args.classifier, parent_classifier, parent_name, rule)
 
 
+@handle_errors(context="delete action", error_handler=error_handler)
 def delete_action(args):
     from ara_cli.artefact_deleter import ArtefactDeleter
 
@@ -69,6 +72,7 @@ def delete_action(args):
     artefact_deleter.delete(args.parameter, args.classifier, args.force)
 
 
+@handle_errors(context="rename action", error_handler=error_handler)
 def rename_action(args):
     from ara_cli.artefact_renamer import ArtefactRenamer
     from ara_cli.classifier import Classifier
@@ -82,6 +86,7 @@ def rename_action(args):
     artefact_renamer.rename(args.parameter, args.aspect, args.classifier)
 
 
+@handle_errors(context="rename action", error_handler=error_handler)
 def list_action(args):
     from ara_cli.artefact_lister import ArtefactLister
     from ara_cli.list_filter import ListFilter
@@ -131,6 +136,7 @@ def list_action(args):
     artefact_lister.list_files(list_filter=list_filter)
 
 
+@handle_errors(context="list-tags action", error_handler=error_handler)
 def list_tags_action(args):
     from ara_cli.tag_extractor import TagExtractor
     from ara_cli.list_filter import ListFilter
@@ -155,6 +161,7 @@ def list_tags_action(args):
     print(output)
 
 
+@handle_errors(context="prompt action", error_handler=error_handler)
 def prompt_action(args):
     from ara_cli.classifier import Classifier
     from ara_cli.filename_validator import is_valid_filename
@@ -227,6 +234,7 @@ def prompt_action(args):
         raise ValueError(f"Unknown command '{init}' provided.")
 
 
+@handle_errors(context="chat action", error_handler=error_handler)
 def chat_action(args):
     from ara_cli.chat import Chat
 
@@ -253,6 +261,60 @@ def chat_action(args):
     chat.start()
 
 
+def _find_chat_file(chat_name: str) -> str | None:
+    """Resolves the chat file path based on common naming conventions."""
+    # Logic from setup_chat for finding existing files.
+    if os.path.exists(chat_name) and os.path.isfile(chat_name):
+        return chat_name
+
+    chat_name_md = f"{chat_name}.md"
+    if os.path.exists(chat_name_md) and os.path.isfile(chat_name_md):
+        return chat_name_md
+
+    chat_name_chat_md = f"{chat_name}_chat.md"
+    if os.path.exists(chat_name_chat_md) and os.path.isfile(chat_name_chat_md):
+        return chat_name_chat_md
+
+    return None
+
+
+@handle_errors(context="load action", error_handler=error_handler)
+def load_action(args):
+    from ara_cli.template_loader import TemplateLoader
+
+    chat_name = args.chat_name
+    template_type = args.template_type
+    template_name = args.template_name
+
+    chat_file_path = _find_chat_file(chat_name)
+
+    if not chat_file_path:
+        raise AraError(f"Chat file for '{chat_name}' not found.")
+
+    default_patterns = {
+        "rules": "*.rules.md",
+        "intention": "*.intention.md",
+        "commands": "*.commands.md"
+    }
+
+    default_pattern = default_patterns.get(template_type)
+
+    if not template_name and not default_pattern:
+        raise AraError(f"A template name is required for template type '{template_type}'.")
+
+    loader = TemplateLoader()  # No chat instance for CLI context
+    success = loader.load_template(
+        template_name=template_name,
+        template_type=template_type,
+        chat_file_path=chat_file_path,
+        default_pattern=default_pattern
+    )
+
+    if not success:
+        sys.exit(1)
+
+
+@handle_errors(context="template action", error_handler=error_handler)
 def template_action(args):
     from ara_cli.classifier import Classifier
     from ara_cli.template_manager import TemplatePathManager
@@ -265,6 +327,7 @@ def template_action(args):
     print(content)
 
 
+@handle_errors(context="fetch-templates action", error_handler=error_handler)
 def fetch_templates_action(args):
     import shutil
     from ara_cli.ara_config import ConfigManager
@@ -294,6 +357,7 @@ def fetch_templates_action(args):
         os.makedirs(join(local_prompt_modules_dir, subdir), exist_ok=True)
 
 
+@handle_errors(context="read action", error_handler=error_handler)
 def read_action(args):
     from ara_cli.commands.read_command import ReadCommand
     from ara_cli.list_filter import ListFilter
@@ -321,6 +385,7 @@ def read_action(args):
     command.execute()
 
 
+@handle_errors(context="reconnect action", error_handler=error_handler)
 def reconnect_action(args):
     from ara_cli.artefact_models.artefact_load import artefact_from_content
     from ara_cli.artefact_models.artefact_model import Contribution
@@ -348,8 +413,7 @@ def reconnect_action(args):
     )
 
     if not artefact:
-        print(read_error_message)
-        return
+        raise AraError(read_error_message)
 
     parent = ArtefactReader.read_artefact(
         artefact_name=parent_name,
@@ -358,8 +422,7 @@ def reconnect_action(args):
     )
 
     if not parent:
-        print(read_error_message)
-        return
+        raise AraError(read_error_message)
 
     contribution = Contribution(
         artefact_name=parent.title,
@@ -367,13 +430,9 @@ def reconnect_action(args):
     )
 
     if rule:
-        try:
-            closest_rule = find_closest_rule(parent, rule)
-            contribution.rule = closest_rule
-            feedback_message += f" using rule '{closest_rule}'"
-        except TypeError as e:
-            print(f"{type(e).__name__}:", e)
-            exit(1)
+        closest_rule = find_closest_rule(parent, rule)
+        contribution.rule = closest_rule
+        feedback_message += f" using rule '{closest_rule}'"
 
     artefact.contribution = contribution
     with open(artefact.file_path, 'w', encoding='utf-8') as file:
@@ -383,6 +442,7 @@ def reconnect_action(args):
     print(feedback_message + ".")
 
 
+@handle_errors(context="read-status action", error_handler=error_handler)
 def read_status_action(args):
     from ara_cli.file_classifier import FileClassifier
     from ara_cli.artefact_models.artefact_load import artefact_from_content
@@ -396,7 +456,7 @@ def read_status_action(args):
 
     all_artefact_names = [artefact_info["title"] for artefact_info in artefact_info_dicts]
     if artefact_name not in all_artefact_names:
-        suggest_close_name_matches(artefact_name, all_artefact_names)
+        suggest_close_name_matches(artefact_name, all_artefact_names, report_as_error=True)
         return
 
     artefact_info = next(filter(
@@ -415,6 +475,7 @@ def read_status_action(args):
     print(status)
 
 
+@handle_errors(context="read-user action", error_handler=error_handler)
 def read_user_action(args):
     from ara_cli.artefact_models.artefact_load import artefact_from_content
     from ara_cli.file_classifier import FileClassifier
@@ -428,7 +489,7 @@ def read_user_action(args):
 
     all_artefact_names = [artefact_info["title"] for artefact_info in artefact_info_dicts]
     if artefact_name not in all_artefact_names:
-        suggest_close_name_matches(artefact_name, all_artefact_names)
+        suggest_close_name_matches(artefact_name, all_artefact_names, report_as_error=True)
         return
 
     artefact_info = next(filter(
@@ -448,6 +509,7 @@ def read_user_action(args):
         print(f" - {tag}")
 
 
+@handle_errors(context="set-status action", error_handler=error_handler)
 def set_status_action(args):
     from ara_cli.artefact_models.artefact_model import ALLOWED_STATUS_VALUES
     from ara_cli.artefact_models.artefact_load import artefact_from_content
@@ -490,6 +552,7 @@ def set_status_action(args):
     print(f"Status of task '{artefact_name}' has been updated to '{new_status}'.")
 
 
+@handle_errors(context="set-user action", error_handler=error_handler)
 def set_user_action(args):
     from ara_cli.file_classifier import FileClassifier
     from ara_cli.artefact_models.artefact_load import artefact_from_content
@@ -528,6 +591,7 @@ def set_user_action(args):
     print(f"User of task '{artefact_name}' has been updated to '{new_user}'.")
 
 
+@handle_errors(context="classifier-directory action", error_handler=error_handler)
 def classifier_directory_action(args):
     from ara_cli.classifier import Classifier
 
@@ -536,6 +600,7 @@ def classifier_directory_action(args):
     print(subdirectory)
 
 
+@handle_errors(context="scan action", error_handler=error_handler)
 def scan_action(args):
     from ara_cli.file_classifier import FileClassifier
     from ara_cli.artefact_scan import find_invalid_files, show_results
@@ -550,6 +615,7 @@ def scan_action(args):
     show_results(invalid_artefacts)
 
 
+@handle_errors(context="autofix_action", error_handler=error_handler)
 def autofix_action(args):
     from ara_cli.artefact_autofix import parse_report, apply_autofix, read_report_file
     from ara_cli.file_classifier import FileClassifier
@@ -589,18 +655,17 @@ def autofix_action(args):
     print("\nAutofix process completed. Please review the changes.")
 
 
+@handle_errors(context="extract action", error_handler=error_handler)
 def extract_action(args):
     from ara_cli.commands.extract_command import ExtractCommand
 
     filename = args.filename
     force = args.force
     write = getattr(args, 'write', False)
-    print(filename)
     command = ExtractCommand(
         file_name=filename,
         force=force,
         write=write,
-        output=lambda msg: print(msg, file=sys.stdout),
-        error_output=lambda msg: print(msg, file=sys.stderr)
+        output=lambda msg: print(msg, file=sys.stdout)
     )
-    command.execute()
+    command.execute()

{ara_cli-0.1.9.95 → ara_cli-0.1.10.0}/ara_cli/ara_command_parser.py

@@ -7,7 +7,8 @@ from ara_cli.commandline_completer import (
     StatusCompleter,
 )
 from ara_cli.template_manager import SpecificationBreakdownAspects
-
+import os
+import glob
 
 classifiers = Classifier.ordered_classifiers()
 aspects = SpecificationBreakdownAspects.VALID_ASPECTS
@@ -191,6 +192,44 @@ def list_tags_parser(subparsers):
     )
 
 
+class TemplateNameCompleter:
+    """Provides command-line completion for template names."""
+    def __call__(self, prefix, parsed_args, **kwargs):
+        import os
+        from ara_cli.template_loader import TemplateLoader
+
+        if not hasattr(parsed_args, 'template_type'):
+            return []
+
+        template_type = parsed_args.template_type
+        context_path = os.getcwd()
+
+        loader = TemplateLoader()
+        templates = loader.get_available_templates(template_type, context_path)
+
+        return [t for t in templates if t.startswith(prefix)]
+
+
+def load_parser(subparsers):
+    load_parser = subparsers.add_parser(
+        "load", help="Load a template into a chat file."
+    )
+    load_parser.add_argument(
+        "chat_name", help="Name of the chat file to load template into (without extension)."
+    )
+    load_parser.add_argument(
+        "template_type",
+        choices=['rules', 'intention', 'commands', 'blueprint'],
+        help="Type of template to load."
+    )
+    load_parser.add_argument(
+        "template_name",
+        nargs='?',
+        default="",
+        help="Name of the template to load. Supports wildcards and 'global/' prefix."
+    ).completer = TemplateNameCompleter()
+
+
 def add_chat_arguments(chat_parser):
     chat_parser.add_argument(
         "chat_name",
@@ -560,6 +599,7 @@ def action_parser():
     classifier_directory_parser(subparsers)
     scan_parser(subparsers)
     autofix_parser(subparsers)
+    load_parser(subparsers)
     extract_parser(subparsers)
 
-    return parser
+    return parser