ara-cli 0.1.10.0__py3-none-any.whl → 0.1.13.3__py3-none-any.whl

ara_cli/ara_command_action.py

@@ -23,24 +23,33 @@ def create_action(args):
     from ara_cli.artefact_reader import ArtefactReader
     from ara_cli.artefact_fuzzy_search import find_closest_rule
 
-    check_validity(Classifier.is_valid_classifier(args.classifier), "Invalid classifier provided. Please provide a valid classifier.")
-    check_validity(is_valid_filename(args.parameter), "Invalid filename provided. Please provide a valid filename.")
+    check_validity(Classifier.is_valid_classifier(args.classifier),
+                   "Invalid classifier provided. Please provide a valid classifier.")
+    check_validity(is_valid_filename(args.parameter),
+                   "Invalid filename provided. Please provide a valid filename.")
 
     def handle_parent_arguments(args):
-        parent_classifier = args.parent_classifier if hasattr(args, "parent_classifier") else None
-        parent_name = args.parent_name if hasattr(args, "parent_name") else None
+        parent_classifier = args.parent_classifier if hasattr(
+            args, "parent_classifier") else None
+        parent_name = args.parent_name if hasattr(
+            args, "parent_name") else None
         rule = args.rule if hasattr(args, 'rule') else None
         invalid_classifier_message = "Invalid parent classifier provided. Please provide a valid classifier"
         invalid_name_message = "Invalid filename provided for parent. Please provide a valid filename."
         if parent_classifier and parent_name and rule:
-            check_validity(Classifier.is_valid_classifier(parent_classifier), invalid_classifier_message)
-            check_validity(is_valid_filename(parent_name), invalid_name_message)
-            parent_artefact = ArtefactReader.read_artefact(artefact_name=parent_name, classifier=parent_classifier)
+            check_validity(Classifier.is_valid_classifier(
+                parent_classifier), invalid_classifier_message)
+            check_validity(is_valid_filename(
+                parent_name), invalid_name_message)
+            parent_artefact = ArtefactReader.read_artefact(
+                artefact_name=parent_name, classifier=parent_classifier)
             rule = find_closest_rule(parent_artefact, rule)
             return parent_classifier, parent_name, rule
         if parent_classifier and parent_name:
-            check_validity(Classifier.is_valid_classifier(parent_classifier), invalid_classifier_message)
-            check_validity(is_valid_filename(parent_name), invalid_name_message)
+            check_validity(Classifier.is_valid_classifier(
+                parent_classifier), invalid_classifier_message)
+            check_validity(is_valid_filename(
+                parent_name), invalid_name_message)
             return parent_classifier, parent_name, rule
         return None, None, None
 
@@ -61,7 +70,8 @@ def create_action(args):
         return
 
     artefact_creator = ArtefactCreator()
-    artefact_creator.run(args.parameter, args.classifier, parent_classifier, parent_name, rule)
+    artefact_creator.run(args.parameter, args.classifier,
+                         parent_classifier, parent_name, rule)
 
 
 @handle_errors(context="delete action", error_handler=error_handler)
@@ -78,22 +88,33 @@ def rename_action(args):
     from ara_cli.classifier import Classifier
     from ara_cli.filename_validator import is_valid_filename
 
-    check_validity(is_valid_filename(args.parameter), "Invalid filename provided. Please provide a valid filename.")
-    check_validity(Classifier.is_valid_classifier(args.classifier), "Invalid classifier provided. Please provide a valid classifier.")
-    check_validity(is_valid_filename(args.aspect), "Invalid new filename provided. Please provide a valid filename.")
+    check_validity(is_valid_filename(args.parameter),
+                   "Invalid filename provided. Please provide a valid filename.")
+    check_validity(Classifier.is_valid_classifier(args.classifier),
+                   "Invalid classifier provided. Please provide a valid classifier.")
+    check_validity(is_valid_filename(
+        args.aspect), "Invalid new filename provided. Please provide a valid filename.")
 
     artefact_renamer = ArtefactRenamer()
     artefact_renamer.rename(args.parameter, args.aspect, args.classifier)
 
 
+def _execute_list_method(method, classifier, artefact_name, list_filter, flag_name):
+    """Helper function to validate and execute list methods."""
+    if not classifier or not artefact_name:
+        raise AraError(
+            f"Both classifier and artefact_name are required for --{flag_name}"
+        )
+    method(classifier=classifier, artefact_name=artefact_name, list_filter=list_filter)
+
+
 @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
 
-    branch_classifier, branch_artefact_name = args.branch_args
-    children_classifier, children_artefact_name = args.children_args
-    data_classifier, data_artefact_name = args.data_args
+    classifier = args.classifier
+    artefact_name = args.artefact_name
 
     artefact_lister = ArtefactLister()
 
@@ -106,33 +127,28 @@ def list_action(args):
         exclude_tags=args.exclude_tags
     )
 
-    if branch_classifier and branch_artefact_name:
-        artefact_lister.list_branch(
-            classifier=branch_classifier,
-            artefact_name=branch_artefact_name,
-            list_filter=list_filter
-        )
-        return
-
-    if children_classifier and children_artefact_name:
-        artefact_lister.list_children(
-            classifier=children_classifier,
-            artefact_name=children_artefact_name,
-            list_filter=list_filter
-        )
-        return
+    # Map flags to their corresponding methods
+    flag_method_map = {
+        "branch": (args.branch, artefact_lister.list_branch),
+        "children": (args.children, artefact_lister.list_children),
+        "data": (args.data, artefact_lister.list_data),
+    }
 
-    if data_classifier and data_artefact_name:
-        artefact_lister.list_data(
-            classifier=data_classifier,
-            artefact_name=data_artefact_name,
-            list_filter=list_filter
+    for flag_name, (flag_value, method) in flag_method_map.items():
+        if flag_value:
+            _execute_list_method(
+                method, classifier, artefact_name, list_filter, flag_name
+            )
+            return
+
+    # If both classifier and artefact_name are present, but no specific action flag (branch, children, data)
+    # was provided, raise an error as per requirements.
+    if classifier and artefact_name:
+        raise AraError(
+            f"To list specific info for '{classifier} {artefact_name}', "
+            "you must provide one of: --children, --branch, or --data."
         )
-        return
 
-    if (args.tags):
-        artefact_lister.list_files(tags=args.tags, list_filter=list_filter)
-        return
     artefact_lister.list_files(list_filter=list_filter)
 
 
@@ -147,17 +163,25 @@ def list_tags_action(args):
     )
 
     tag_extractor = TagExtractor()
-    tags = tag_extractor.extract_tags(
+    tag_groups = tag_extractor.extract_tags(
         filtered_extra_column=getattr(args, "filtered_extra_column", False),
         list_filter=list_filter
     )
 
     if args.json:
-        output = json.dumps({"tags": tags})
+        all_tags = []
+        for group in tag_groups.values():
+            all_tags.extend(group)
+        output = json.dumps({"tags": sorted(all_tags)})
         print(output)
         return
 
-    output = "\n".join(f"- {tag}" for tag in tags)
+    output_lines = []
+    for key in sorted(tag_groups.keys()):
+        line = " ".join(sorted(list(tag_groups[key])))
+        output_lines.append(line)
+
+    output = "\n".join(f"- {tag}" for tag in output_lines)
     print(output)
 
 
@@ -166,8 +190,10 @@ def prompt_action(args):
     from ara_cli.classifier import Classifier
     from ara_cli.filename_validator import is_valid_filename
 
-    check_validity(Classifier.is_valid_classifier(args.classifier), "Invalid classifier provided. Please provide a valid classifier.")
-    check_validity(is_valid_filename(args.parameter), "Invalid filename provided. Please provide a valid filename.")
+    check_validity(Classifier.is_valid_classifier(args.classifier),
+                   "Invalid classifier provided. Please provide a valid classifier.")
+    check_validity(is_valid_filename(args.parameter),
+                   "Invalid filename provided. Please provide a valid filename.")
 
     classifier = args.classifier
     param = args.parameter
@@ -202,7 +228,8 @@ def prompt_action(args):
         from ara_cli.update_config_prompt import update_artefact_config_prompt_files
         extract_and_save_prompt_results(classifier, param, write=write)
         print(f"automatic update after extract")
-        update_artefact_config_prompt_files(classifier, param, automatic_update=True)
+        update_artefact_config_prompt_files(
+            classifier, param, automatic_update=True)
 
     def handle_chat():
         from ara_cli.prompt_chat import initialize_prompt_chat_mode
@@ -211,11 +238,13 @@ def prompt_action(args):
         output_mode = args.output_mode
         append_strings = args.append
         restricted = args.restricted
-        initialize_prompt_chat_mode(classifier, param, chat_name, reset=reset, output_mode=output_mode, append_strings=append_strings, restricted=restricted)
+        initialize_prompt_chat_mode(classifier, param, chat_name, reset=reset,
+                                    output_mode=output_mode, append_strings=append_strings, restricted=restricted)
 
     def handle_update():
         from ara_cli.update_config_prompt import update_artefact_config_prompt_files
-        update_artefact_config_prompt_files(classifier, param, automatic_update=True)
+        update_artefact_config_prompt_files(
+            classifier, param, automatic_update=True)
 
     command_dispatcher = {
         'init': handle_init,
@@ -250,7 +279,8 @@ def chat_action(args):
     chat_file_path = join(cwd, chat_name)
 
     with suppress_stdout(output_mode):
-        chat = Chat(chat_file_path, reset=reset) if not restricted else Chat(chat_file_path, reset=reset, enable_commands=whitelisted_commands)
+        chat = Chat(chat_file_path, reset=reset) if not restricted else Chat(
+            chat_file_path, reset=reset, enable_commands=whitelisted_commands)
 
     if append_strings:
         chat.append_strings(append_strings)
@@ -300,7 +330,8 @@ def load_action(args):
     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}'.")
+        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(
@@ -319,7 +350,8 @@ def template_action(args):
     from ara_cli.classifier import Classifier
     from ara_cli.template_manager import TemplatePathManager
 
-    check_validity(Classifier.is_valid_classifier(args.classifier), "Invalid classifier provided. Please provide a valid classifier.")
+    check_validity(Classifier.is_valid_classifier(args.classifier),
+                   "Invalid classifier provided. Please provide a valid classifier.")
 
     template_manager = TemplatePathManager()
     content = template_manager.get_template_content(args.classifier)
@@ -340,9 +372,11 @@ def fetch_templates_action(args):
 
     subdirs = ["commands", "rules", "intentions", "blueprints"]
 
-    os.makedirs(join(prompt_templates_dir, "global-prompt-modules"), exist_ok=True)
+    os.makedirs(join(prompt_templates_dir,
+                "global-prompt-modules"), exist_ok=True)
     for subdir in subdirs:
-        target_dir = join(prompt_templates_dir, "global-prompt-modules", subdir)
+        target_dir = join(prompt_templates_dir,
+                          "global-prompt-modules", subdir)
         source_dir = join(global_prompt_templates_path, subdir)
         os.makedirs(target_dir, exist_ok=True)
         for item in os.listdir(source_dir):
@@ -351,7 +385,8 @@ def fetch_templates_action(args):
             shutil.copy2(source, target)
 
     custom_prompt_templates_subdir = config.custom_prompt_templates_subdir
-    local_prompt_modules_dir = join(prompt_templates_dir, custom_prompt_templates_subdir)
+    local_prompt_modules_dir = join(
+        prompt_templates_dir, custom_prompt_templates_subdir)
     os.makedirs(local_prompt_modules_dir, exist_ok=True)
     for subdir in subdirs:
         os.makedirs(join(local_prompt_modules_dir, subdir), exist_ok=True)
@@ -454,9 +489,11 @@ def read_status_action(args):
     artefact_info = file_classifier.classify_files()
     artefact_info_dicts = artefact_info.get(classifier, [])
 
-    all_artefact_names = [artefact_info["title"] for artefact_info in artefact_info_dicts]
+    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, report_as_error=True)
+        suggest_close_name_matches(
+            artefact_name, all_artefact_names, report_as_error=True)
         return
 
     artefact_info = next(filter(
@@ -487,9 +524,11 @@ def read_user_action(args):
     artefact_info = file_classifier.classify_files()
     artefact_info_dicts = artefact_info.get(classifier, [])
 
-    all_artefact_names = [artefact_info["title"] for artefact_info in artefact_info_dicts]
+    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, report_as_error=True)
+        suggest_close_name_matches(
+            artefact_name, all_artefact_names, report_as_error=True)
         return
 
     artefact_info = next(filter(
@@ -524,12 +563,14 @@ def set_status_action(args):
     if new_status.startswith('@'):
         new_status = new_status.lstrip('@')
 
-    check_validity(new_status in status_tags, "Invalid status provided. Please provide a valid status.")
+    check_validity(new_status in status_tags,
+                   "Invalid status provided. Please provide a valid status.")
 
     file_classifier = FileClassifier(os)
     classified_artefacts_info = file_classifier.classify_files()
     classified_artefact_dict = classified_artefacts_info.get(classifier, [])
-    all_artefact_names = [artefact_info["title"] for artefact_info in classified_artefact_dict]
+    all_artefact_names = [artefact_info["title"]
+                          for artefact_info in classified_artefact_dict]
 
     if artefact_name not in all_artefact_names:
         suggest_close_name_matches(artefact_name, all_artefact_names)
@@ -549,7 +590,8 @@ def set_status_action(args):
     with open(f"{artefact_info['file_path']}", 'w', encoding='utf-8') as file:
         file.write(serialized_content)
 
-    print(f"Status of task '{artefact_name}' has been updated to '{new_status}'.")
+    print(
+        f"Status of task '{artefact_name}' has been updated to '{new_status}'.")
 
 
 @handle_errors(context="set-user action", error_handler=error_handler)
@@ -567,7 +609,8 @@ def set_user_action(args):
     file_classifier = FileClassifier(os)
     classified_artefacts_info = file_classifier.classify_files()
     classified_artefact_dict = classified_artefacts_info.get(classifier, [])
-    all_artefact_names = [artefact_info["title"] for artefact_info in classified_artefact_dict]
+    all_artefact_names = [artefact_info["title"]
+                          for artefact_info in classified_artefact_dict]
 
     if artefact_name not in all_artefact_names:
         suggest_close_name_matches(artefact_name, all_artefact_names)
@@ -668,4 +711,4 @@ def extract_action(args):
         write=write,
         output=lambda msg: print(msg, file=sys.stdout)
     )
-    command.execute()
+    command.execute()