Share more logic for system prompt templating

Author: aantn

holmes/core/prompt.py

@@ -1,6 +1,8 @@
 from rich.console import Console
-from typing import Optional, List, Dict
+from typing import Optional, List, Dict, Any, Union
 from pathlib import Path
+from holmes.plugins.prompts import load_and_render_prompt
+from holmes.plugins.runbooks import RunbookCatalog
 
 
 def append_file_to_user_prompt(user_prompt: str, file_path: Path) -> str:
@@ -25,11 +27,31 @@ def append_all_files_to_user_prompt(
 
 def build_initial_ask_messages(
     console: Console,
-    system_prompt_rendered: str,
     initial_user_prompt: str,
     file_paths: Optional[List[Path]],
+    tool_executor: Any,  # ToolExecutor type
+    runbooks: Union[RunbookCatalog, Dict, None] = None,
 ) -> List[Dict]:
-    """Build the initial messages for the AI call."""
+    """Build the initial messages for the AI call.
+
+    Args:
+        console: Rich console for output
+        initial_user_prompt: The user's prompt
+        file_paths: Optional list of files to include
+        tool_executor: The tool executor with available toolsets
+        runbooks: Optional runbook catalog
+    """
+    # Load and render system prompt internally
+    system_prompt_template = "builtin://generic_ask.jinja2"
+    template_context = {
+        "toolsets": tool_executor.toolsets,
+        "runbooks": runbooks or {},
+    }
+    system_prompt_rendered = load_and_render_prompt(
+        system_prompt_template, template_context
+    )
+
+    # Append files to user prompt
     user_prompt_with_files = append_all_files_to_user_prompt(
         console, initial_user_prompt, file_paths
     )

holmes/interactive.py

@@ -756,12 +756,12 @@ def display_recent_tool_outputs(
 def run_interactive_loop(
     ai: ToolCallingLLM,
     console: Console,
-    system_prompt_rendered: str,
     initial_user_input: Optional[str],
     include_files: Optional[List[Path]],
     post_processing_prompt: Optional[str],
     show_tool_output: bool,
     tracer=None,
+    runbooks=None,
 ) -> None:
     # Initialize tracer - use DummyTracer if no tracer provided
     if tracer is None:
@@ -960,7 +960,7 @@ def get_bottom_toolbar():
 
             if messages is None:
                 messages = build_initial_ask_messages(
-                    console, system_prompt_rendered, user_input, include_files
+                    console, user_input, include_files, ai.tool_executor, runbooks
                 )
             else:
                 messages.append({"role": "user", "content": user_input})

holmes/main.py

@@ -180,10 +180,6 @@ def ask(
     destination: Optional[DestinationType] = opt_destination,
     slack_token: Optional[str] = opt_slack_token,
     slack_channel: Optional[str] = opt_slack_channel,
-    # advanced options for this command
-    system_prompt: Optional[str] = typer.Option(
-        "builtin://generic_ask.jinja2", help=system_prompt_help
-    ),
     show_tool_output: bool = typer.Option(
         False,
         "--show-tool-output",
@@ -255,12 +251,6 @@ def ask(
         refresh_toolsets=refresh_toolsets,  # flag to refresh the toolset status
         tracer=tracer,
     )
-    template_context = {
-        "toolsets": ai.tool_executor.toolsets,
-        "runbooks": config.get_runbook_catalog(),
-    }
-
-    system_prompt_rendered = load_and_render_prompt(system_prompt, template_context)  # type: ignore
 
     if prompt_file and prompt:
         raise typer.BadParameter(
@@ -295,20 +285,21 @@ def ask(
         run_interactive_loop(
             ai,
             console,
-            system_prompt_rendered,
             prompt,
             include_file,
             post_processing_prompt,
             show_tool_output,
             tracer,
+            config.get_runbook_catalog(),
         )
         return
 
     messages = build_initial_ask_messages(
         console,
-        system_prompt_rendered,
         prompt,  # type: ignore
         include_file,
+        ai.tool_executor,
+        config.get_runbook_catalog(),
     )
 
     with tracer.start_trace(