ara-cli 0.1.9.52__tar.gz → 0.1.9.53__tar.gz

{ara_cli-0.1.9.52 → ara_cli-0.1.9.53}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: ara_cli
-Version: 0.1.9.52
+Version: 0.1.9.53

{ara_cli-0.1.9.52 → ara_cli-0.1.9.53}/ara_cli/ara_command_action.py

@@ -266,6 +266,12 @@ def fetch_templates_action(args):
             target = join(target_dir, item)
             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)
+    os.makedirs(local_prompt_modules_dir, exist_ok=True)
+    for subdir in subdirs:
+        os.makedirs(join(local_prompt_modules_dir, subdir), exist_ok=True)
+
 
 def read_action(args):
     from ara_cli.artefact_reader import ArtefactReader

{ara_cli-0.1.9.52 → ara_cli-0.1.9.53}/ara_cli/ara_config.py

@@ -2,7 +2,7 @@ from typing import List, Dict, Union, Optional
 from pydantic import BaseModel
 import json
 import os
-from os.path import exists, join, dirname
+from os.path import exists, dirname
 from os import makedirs
 from functools import lru_cache
 
@@ -18,6 +18,7 @@ class ARAconfig(BaseModel):
     glossary_dir: str = "./glossary"
     doc_dir: str = "./docs"
     local_prompt_templates_dir: str = "./ara/.araconfig"
+    custom_prompt_templates_subdir: Optional[str] = "custom-prompt-modules"
     local_ara_templates_dir: str = "./ara/.araconfig/templates/"
     ara_prompt_given_list_includes: List[str] = [
         "*.businessgoal",
@@ -136,12 +137,6 @@ class ConfigManager:
 
             if not exists(config_dir):
                 makedirs(config_dir)
-                # create defined default path structure for custom prompts
-                makedirs(join(config_dir, "custom-prompt-modules"))
-                makedirs(join(config_dir, "custom-prompt-modules", "commands"))
-                makedirs(join(config_dir, "custom-prompt-modules", "rule"))
-                makedirs(join(config_dir, "custom-prompt-modules", "intentions"))
-                makedirs(join(config_dir, "custom-prompt-modules", "blueprints"))
 
             cls._config_instance = read_data(filepath)
         return cls._config_instance

{ara_cli-0.1.9.52 → ara_cli-0.1.9.53}/ara_cli/chat.py

@@ -662,7 +662,8 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         local_templates_path = os.path.join(os.getcwd(), local_templates_path)
         os.chdir(original_directory)
 
-        template_directory = f"{local_templates_path}/custom-prompt-modules/{plural}"
+        custom_prompt_templates_subdir = self.config.custom_prompt_templates_subdir
+        template_directory = f"{local_templates_path}/{custom_prompt_templates_subdir}/{plural}"
         self._load_helper(template_directory, template_name, template_type)
 
     def _load_template_helper(self, template_name, template_type, default_pattern):

{ara_cli-0.1.9.52 → ara_cli-0.1.9.53}/ara_cli/tests/test_chat.py

@@ -930,20 +930,24 @@ def test_do_LOAD_COMMANDS(monkeypatch, temp_chat_file, commands_name, expected_d
         mock_load_template_helper.assert_called_once_with(commands_name, "commands", "*.commands.md")
 
 
-@pytest.mark.parametrize("template_name, template_type, default_pattern, expected_directory, expected_pattern", [
-    ("global/test_command", "commands", "*.commands.md", "mocked_template_base_path/prompt-modules/commands/", "test_command"),
-    ("local_command", "commands", "*.commands.md", "/project/mocked_local_templates_path/custom-prompt-modules/commands", "local_command"),
-
-    ("global/test_rule", "rules", "*.rules.md", "mocked_template_base_path/prompt-modules/rules/", "test_rule"),
-    ("local_rule", "rules", "*.rules.md", "/project/mocked_local_templates_path/custom-prompt-modules/rules", "local_rule"),
-
-    ("global/test_intention", "intention", "*.intentions.md", "mocked_template_base_path/prompt-modules/intentions/", "test_intention"),
-    ("local_intention", "intention", "*.intentions.md", "/project/mocked_local_templates_path/custom-prompt-modules/intentions", "local_intention"),
-
-    ("global/test_blueprint", "blueprint", "*.blueprints.md", "mocked_template_base_path/prompt-modules/blueprints/", "test_blueprint"),
-    ("local_blueprint", "blueprint", "*.blueprints.md", "/project/mocked_local_templates_path/custom-prompt-modules/blueprints", "local_blueprint")
+@pytest.mark.parametrize("template_name, template_type, default_pattern, custom_template_subdir, expected_directory, expected_pattern", [
+    ("global/test_command", "commands", "*.commands.md", "mocked_custom_modules_path", "mocked_template_base_path/prompt-modules/commands/", "test_command"),
+    ("local_command", "commands", "*.commands.md", "custom-prompt-modules", "/project/mocked_local_templates_path/custom-prompt-modules/commands", "local_command"),
+    ("local_command", "commands", "*.commands.md", "mocked_custom_modules_path", "/project/mocked_local_templates_path/mocked_custom_modules_path/commands", "local_command"),
+
+    ("global/test_rule", "rules", "*.rules.md", "mocked_custom_modules_path", "mocked_template_base_path/prompt-modules/rules/", "test_rule"),
+    ("local_rule", "rules", "*.rules.md", "custom-prompt-modules", "/project/mocked_local_templates_path/custom-prompt-modules/rules", "local_rule"),
+    ("local_rule", "rules", "*.rules.md", "mocked_custom_modules_path", "/project/mocked_local_templates_path/mocked_custom_modules_path/rules", "local_rule"),
+
+    ("global/test_intention", "intention", "*.intentions.md", "mocked_custom_modules_path", "mocked_template_base_path/prompt-modules/intentions/", "test_intention"),
+    ("local_intention", "intention", "*.intentions.md", "custom-prompt-modules", "/project/mocked_local_templates_path/custom-prompt-modules/intentions", "local_intention"),
+    ("local_intention", "intention", "*.intentions.md", "mocked_custom_modules_path", "/project/mocked_local_templates_path/mocked_custom_modules_path/intentions", "local_intention"),
+
+    ("global/test_blueprint", "blueprint", "*.blueprints.md", "mocked_custom_modules_path", "mocked_template_base_path/prompt-modules/blueprints/", "test_blueprint"),
+    ("local_blueprint", "blueprint", "*.blueprints.md", "custom-prompt-modules", "/project/mocked_local_templates_path/custom-prompt-modules/blueprints", "local_blueprint"),
+    ("local_blueprint", "blueprint", "*.blueprints.md", "mocked_custom_modules_path", "/project/mocked_local_templates_path/mocked_custom_modules_path/blueprints", "local_blueprint")
 ])
-def test_load_template_from_global_or_local(monkeypatch, temp_chat_file, template_name, template_type, default_pattern, expected_directory, expected_pattern):
+def test_load_template_from_global_or_local(monkeypatch, temp_chat_file, template_name, template_type, default_pattern, custom_template_subdir, expected_directory, expected_pattern):
     mock_config = get_default_config()
     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
         chat = Chat(temp_chat_file.name, reset=False)
@@ -956,6 +960,7 @@ def test_load_template_from_global_or_local(monkeypatch, temp_chat_file, templat
 
     config = chat.config
     config.local_prompt_templates_dir = mock_local_templates_path
+    config.custom_prompt_templates_subdir = custom_template_subdir
     chat.config = config
 
     with patch.object(chat, '_load_helper') as mock_load_helper:

{ara_cli-0.1.9.52 → ara_cli-0.1.9.53}/ara_cli/version.py

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

{ara_cli-0.1.9.52 → ara_cli-0.1.9.53}/ara_cli.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: ara-cli
-Version: 0.1.9.52
+Version: 0.1.9.53