Merge pull request #25 from oleks-dev/split_engine

refactor engine.py, split into smaller files

Author: oleks-dev

prich/cli/dynamic_command_group.py

@@ -1,8 +1,10 @@
 import click
+from prich.constants import RESERVED_RUN_TEMPLATE_CLI_OPTIONS
+from prich.models.template import TemplateModel
 from prich.core.loaders import load_global_config, load_local_config, load_merged_config, load_templates
-from prich.core.engine import create_dynamic_command
+from prich.core.engine import run_template
 from prich.core.state import _loaded_templates
-from prich.core.utils import should_use_global_only, should_use_local_only
+from prich.core.utils import should_use_global_only, should_use_local_only, is_verbose, console_print
 
 
 class DynamicCommandGroup(click.Group):
@@ -31,4 +33,66 @@ def _load_dynamic_commands(self, ctx):
         except Exception as e:
             raise click.ClickException(f"Failed to load dynamic parameters: {e}")
 
-        self._commands_loaded = True
+        self._commands_loaded = True
+
+
+def get_variable_type(variable_type: str) -> click.types:
+    type_mapping = {"str": click.STRING, "int": click.INT, "bool": click.BOOL, "path": click.Path}
+    return type_mapping.get(variable_type.lower(), None)
+
+
+def create_dynamic_command(config, template: TemplateModel) -> click.Command:
+    options = []
+    for arg in template.variables if template.variables else []:
+        arg_name = arg.name
+        arg_type = get_variable_type(arg.type)
+        help_text = arg.description or f"{arg_name} option"
+        cli_option = arg.cli_option or f"--{arg_name}"
+        if cli_option in RESERVED_RUN_TEMPLATE_CLI_OPTIONS:
+            raise click.ClickException(f"{arg_name} cli option uses a reserved option name: {cli_option}")
+
+        if arg_type == click.BOOL:
+            options.append(click.Option([cli_option], is_flag=True, default=arg.default or False, show_default=True,
+                                        help=help_text))
+        elif arg_type:
+            options.append(
+                click.Option([cli_option], type=arg_type, default=arg.default, required=arg.required, show_default=True,
+                             help=help_text))
+        elif arg.type.startswith("list["):
+            list_type = get_variable_type(arg.type.split('[')[1][:-1])
+            if not list_type:
+                raise click.ClickException(f"Failed to parse list type for {arg.name}")
+            options.append(
+                click.Option([cli_option], type=list_type, multiple=True, default=arg.default, required=arg.required,
+                             show_default=True, help=help_text))
+        else:
+            raise click.ClickException(f"Unsupported variable type: {arg.type}")
+
+    options.extend([
+        click.Option(["-g", "--global", "global_only"], is_flag=True, default=False,
+                     help="Use global config and template"),
+        click.Option(["-l", "--local", "local_only"], is_flag=True, default=False,
+                     help="Use local config and template"),
+        click.Option(["-o", "--output"], type=click.Path(), default=None, show_default=True,
+                     help="Save final output to file"),
+        click.Option(["-p", "--provider"], type=click.Choice(config.providers.keys()), show_default=True,
+                     help="Override LLM provider"),
+        click.Option(["-v", "--verbose"], is_flag=True, default=False, help="Verbose mode"),
+        click.Option(["-q", "--quiet"], is_flag=True, default=False, help="Suppress all output"),
+        click.Option(["-f", "--only-final-output"], is_flag=True, default=False,
+                     help="Suppress output and show only the last step output")
+    ])
+
+    @click.pass_context
+    def dynamic_command(ctx, **kwargs):
+        if is_verbose():
+            console_print(
+                f"[dim]Template: [green]{template.name}[/green] ({template.version}), {template.source.value}, args: {', '.join([f'{k}={v}' for k, v in kwargs.items() if v])}[/dim]")
+            console_print(f"[dim]{template.description}[/dim]")
+        else:
+            console_print(f"[dim][green]{template.name}[/green] ({template.version}), {template.source.value}[/dim]")
+        run_template(template.id, **kwargs)
+
+    return click.Command(name=template.id, callback=dynamic_command, params=options,
+                         help=f"{template.description if template.description else ''}",
+                         epilog=f"{template.name} (ver: {template.version}, {template.source.value})")

prich/cli/init_cmd.py

@@ -4,13 +4,14 @@
 import subprocess
 import venv
 import click
+from prich.constants import PRICH_DIR_NAME
 from prich.core.utils import console_print, get_prich_dir
 from prich.models.config_providers import EchoProviderModel
 from prich.models.config import SettingsConfig, ConfigModel, ProviderModeModel
 
 
 @click.command()
-@click.option("-g", "--global", "global_init", is_flag=True, help="Initialize ~/.prich/ (global)")
+@click.option("-g", "--global", "global_init", is_flag=True, help=f"Initialize ~/{PRICH_DIR_NAME}/ (global)")
 @click.option("--force", is_flag=True, help="Overwrite existing config")
 def init(global_init: bool, force: bool):
     """Initialize prich configuration and default venv."""
@@ -24,10 +25,10 @@ def init(global_init: bool, force: bool):
     default_venv = prich_dir / "venv"
     if force:
         # for safety, ensure that we remove only related folder
-        if ".prich" in str(default_venv):
+        if PRICH_DIR_NAME in str(default_venv):
             shutil.rmtree(default_venv, ignore_errors=True)
         else:
-            raise click.ClickException(".prich folder is not part of venv folder path")
+            raise click.ClickException(f"{PRICH_DIR_NAME} folder is not part of venv folder path")
     if not default_venv.exists():
         builder = venv.EnvBuilder(with_pip=True)
         builder.create(default_venv)
@@ -49,7 +50,8 @@ def init(global_init: bool, force: bool):
         },
         provider_modes=[
             ProviderModeModel(name="plain", prompt="{% if instructions %}{{ instructions }}\n{% endif %}{{ input }}"),
-            ProviderModeModel(name="flat", prompt="""{% if instructions %}### System:\n{{ instructions }}\n\n{% endif %}### User:\n{{ input }}\n\n### Assistant:"""),
+            ProviderModeModel(name="flat",
+                              prompt="{% if instructions %}### System:\n{{ instructions }}\n\n{% endif %}### User:\n{{ input }}\n\n### Assistant:"),
             # ProviderModeModel(name="mistral-instruct", prompt="""<s>[INST]\n{% if instructions %}{{ instructions }}\n\n{% endif %}{{ input }}\n[/INST]"""),
             # ProviderModeModel(name="llama2-chat", prompt="""<s>[INST]\n{% if instructions %}{{ instructions }}\n\n{% endif %}{{ input }}\n[/INST]"""),
             # ProviderModeModel(name="anthropic", prompt="""Human: {% if instructions %}{{ instructions }}\n\n{% endif %}{{ input }}\n\nAssistant:"""),

prich/cli/templates.py

@@ -7,6 +7,7 @@
 from pathlib import Path
 import click
 
+from prich.constants import PRICH_DIR_NAME
 from prich.core.loaders import get_loaded_templates, get_loaded_config, get_loaded_template
 from prich.core.utils import console_print, is_valid_template_id, get_prich_dir, get_prich_templates_dir, shorten_path
 from prich.cli.venv_utils import install_template_python_dependencies
@@ -63,7 +64,7 @@ def check_if_dest_present(template_id: str, dest_folder: Path, global_install: b
 @click.argument("path")
 @click.option("--force", is_flag=True, help="Overwrite existing templates")
 @click.option("--no-venv", is_flag=True, help="Skip venv setup")
-@click.option("-g", "--global", "global_install", is_flag=True, help="Install to ~/.prich/templates")
+@click.option("-g", "--global", "global_install", is_flag=True, help=f"Install to ~/{PRICH_DIR_NAME}/templates")
 @click.option("-r", "--remote", "from_remote", is_flag=True, help="Install template from prich-templates GitHub repo or zip URL")
 def template_install(path: str, force: bool, no_venv: bool, global_install: bool, from_remote: bool):
     """Install a template from PATH, zip, or prich-templates."""

prich/cli/validate.py

@@ -1,6 +1,7 @@
 import os
 from pathlib import Path
 import click
+from prich.constants import PRICH_DIR_NAME
 from prich.models.template import CommandStep, PythonStep
 from prich.core.file_scope import classify_path
 from prich.core.loaders import find_template_files, load_template_model, get_env_vars
@@ -19,7 +20,7 @@ def validate_templates(template_id: str, validate_file: Path, global_only: bool,
         raise click.ClickException("Use only one local or global option, use: 'prich validate -g' or 'prich validate -l'")
 
     if validate_file and (global_only or local_only or template_id):
-        raise click.ClickException("When YAML file is selected it doesn't combine with local, global, or id options, use: 'prich validate --file ./.prich/templates/test-template/test-template.yaml'")
+        raise click.ClickException(f"When YAML file is selected it doesn't combine with local, global, or id options, use: 'prich validate --file ./{PRICH_DIR_NAME}/templates/test-template/test-template.yaml'")
 
     if validate_file and not validate_file.exists():
         raise click.ClickException(f"Failed to find {validate_file} template file.")

prich/cli/venv_utils.py

@@ -5,16 +5,17 @@
 
 import click
 
+from prich.constants import PRICH_DIR_NAME
 from prich.core.utils import shorten_path, console_print
 
 
 def install_python_venv(venv_folder: Path, force: bool = False, venv_type: str = ""):
     if venv_folder.exists() and force:
-        if ".prich" in str(venv_folder):
+        if PRICH_DIR_NAME in str(venv_folder):
             console_print(f"Removing existing {venv_type} venv folder...", end="")
             shutil.rmtree(venv_folder)
         else:
-            raise click.ClickException(".prich folder is not part of venv folder path")
+            raise click.ClickException(f"{PRICH_DIR_NAME} folder is not part of venv folder path")
         console_print(" [green]done![/green]")
     elif venv_folder.exists():
         console_print("Venv folder found.")

prich/constants.py

@@ -4,3 +4,6 @@
     "-g", "--global", "-q", "--quiet", "-o", "--output", "-p", "--provider",
     "-f", "--only-final-output", "-v", "--verbose"
 ]
+
+# .prich folder name
+PRICH_DIR_NAME = ".prich"