Remove prompt manager and instead using simpler jinja util function (#63)

Author: xingyaoww

.gitignore

@@ -236,6 +236,7 @@ logs
 /_test_workspace
 /debug
 cache
+.jinja_cache/
 
 # configuration
 config.toml

openhands/core/agent/base.py

@@ -1,3 +1,5 @@
+import os
+import sys
 from abc import ABC, abstractmethod
 from types import MappingProxyType
 
@@ -36,6 +38,15 @@ def __init__(
             _tools_map[tool.name] = tool
         self._tools = MappingProxyType(_tools_map)
 
+    @property
+    def prompt_dir(self) -> str:
+        """Returns the directory where this class's module file is located."""
+        module = sys.modules[self.__class__.__module__]
+        module_file = module.__file__  # e.g. ".../mypackage/mymodule.py"
+        if module_file is None:
+            raise ValueError(f"Module file for {module} is None")
+        return os.path.join(os.path.dirname(module_file), "prompts")
+
     @property
     def name(self) -> str:
         """Returns the name of the Agent."""

openhands/core/agent/codeact_agent/codeact_agent.py

@@ -1,5 +1,4 @@
 import json
-import os
 from typing import cast
 
 from litellm.types.utils import (
@@ -10,7 +9,7 @@
 )
 from pydantic import ValidationError
 
-from openhands.core.context import EnvContext, PromptManager
+from openhands.core.context import EnvContext, render_system_message
 from openhands.core.conversation import ConversationCallbackType, ConversationState
 from openhands.core.event import ActionEvent, AgentErrorEvent, LLMConvertibleEvent, MessageEvent, ObservationEvent, SystemPromptEvent
 from openhands.core.llm import LLM, Message, TextContent, get_llm_metadata
@@ -35,11 +34,14 @@ def __init__(
         for tool in BUILT_IN_TOOLS:
             assert tool not in tools, f"{tool} is automatically included and should not be provided."
         super().__init__(llm=llm, tools=tools + BUILT_IN_TOOLS, env_context=env_context)
-        self.prompt_manager = PromptManager(
-            prompt_dir=os.path.join(os.path.dirname(__file__), "prompts"),
+
+        self.system_message: TextContent = TextContent(
+            text=render_system_message(
+            prompt_dir=self.prompt_dir,
             system_prompt_filename=system_prompt_filename,
-        )
-        self.system_message: TextContent = self.prompt_manager.get_system_message(cli_mode=cli_mode)
+            cli_mode=cli_mode
+        ))
+
         self.max_iterations: int = 10
 
     def init_state(

openhands/core/context/__init__.py

@@ -14,7 +14,7 @@
     RepoMicroagent,
     load_microagents_from_dir,
 )
-from .prompt import PromptManager
+from .utils import render_additional_info, render_initial_user_message, render_microagent_info, render_system_message
 
 
 __all__ = [
@@ -23,12 +23,15 @@
     "RuntimeInfo",
     "ConversationInstructions",
     "MessageContext",
-    "PromptManager",
     "BaseMicroagent",
     "KnowledgeMicroagent",
     "RepoMicroagent",
     "MicroagentMetadata",
     "MicroagentType",
     "MicroagentKnowledge",
     "load_microagents_from_dir",
+    "render_system_message",
+    "render_initial_user_message",
+    "render_additional_info",
+    "render_microagent_info"
 ]

openhands/core/context/env_context.py

@@ -1,14 +1,11 @@
-from typing import TYPE_CHECKING
 
 from pydantic import BaseModel, Field
 
+from openhands.core.context.utils.prompt import render_microagent_info
 from openhands.core.llm.message import TextContent
 
 from .microagents import MicroagentKnowledge
-
-
-if TYPE_CHECKING:
-    from .prompt import PromptManager
+from .utils import render_additional_info
 
 
 class RuntimeInfo(BaseModel):
@@ -69,12 +66,13 @@ class EnvContext(BaseModel):
         description="List of microagents that have been activated based on the user's input",
     )
 
-    def render(self, prompt_manager: "PromptManager") -> list[TextContent]:
+    def render(self, prompt_dir: str) -> list[TextContent]:
         """Renders the environment context into a string using the provided PromptManager."""
         message_content = []
         # Build the workspace context information
         if self.repository_info or self.runtime_info or self.repository_instructions or self.conversation_instructions:
-            formatted_workspace_text = prompt_manager.build_workspace_context(
+            formatted_workspace_text = render_additional_info(
+                prompt_dir=prompt_dir,
                 repository_info=self.repository_info,
                 runtime_info=self.runtime_info,
                 conversation_instructions=self.conversation_instructions,
@@ -84,7 +82,8 @@ def render(self, prompt_manager: "PromptManager") -> list[TextContent]:
 
         # Add microagent knowledge if present
         if self.activated_microagents:
-            formatted_microagent_text = prompt_manager.build_microagent_info(
+            formatted_microagent_text = render_microagent_info(
+                prompt_dir=prompt_dir,
                 triggered_agents=self.activated_microagents,
             )
             message_content.append(TextContent(text=formatted_microagent_text))

openhands/core/context/message_context.py

@@ -3,7 +3,7 @@
 from openhands.core.llm.message import Message, TextContent
 
 from .microagents import MicroagentKnowledge
-from .prompt import PromptManager
+from .utils import render_microagent_info
 
 
 class MessageContext(BaseModel):
@@ -17,9 +17,10 @@ class MessageContext(BaseModel):
         description="List of microagents that have been activated based on the user's input",
     )
 
-    def render(self, prompt_manager: PromptManager) -> list[Message]:
+    def render(self, prompt_dir: str) -> list[Message]:
         """Renders the environment context into a string using the provided PromptManager."""
-        formatted_text = prompt_manager.build_microagent_info(
+        formatted_text = render_microagent_info(
+            prompt_dir=prompt_dir,
             triggered_agents=self.activated_microagents,
         )
         return [Message(role="user", content=[TextContent(text=formatted_text)])]

openhands/core/context/prompt.py

@@ -0,0 +1,14 @@
+from .prompt import (
+    render_additional_info,
+    render_initial_user_message,
+    render_microagent_info,
+    render_system_message,
+)
+
+
+__all__ = [
+    "render_system_message",
+    "render_initial_user_message",
+    "render_additional_info",
+    "render_microagent_info",
+]

openhands/core/context/utils/__init__.py

@@ -0,0 +1,56 @@
+# prompt_utils.py
+import os
+import re
+import sys
+from functools import lru_cache
+
+from jinja2 import Environment, FileSystemBytecodeCache, FileSystemLoader, Template
+
+
+def refine(text: str) -> str:
+    if sys.platform == "win32":
+        text = re.sub(r"\bexecute_bash\b", "execute_powershell", text, flags=re.IGNORECASE)
+        text = re.sub(r"(?<!execute_)(?<!_)\bbash\b", "powershell", text, flags=re.IGNORECASE)
+    return text
+
+@lru_cache(maxsize=64)
+def _get_env(prompt_dir: str) -> Environment:
+    if not prompt_dir:
+        raise ValueError("prompt_dir is required")
+    # BytecodeCache avoids reparsing templates across processes
+    cache_folder = os.path.join(prompt_dir, ".jinja_cache")
+    os.makedirs(cache_folder, exist_ok=True)
+    bcc = FileSystemBytecodeCache(directory=cache_folder)
+    env = Environment(
+        loader=FileSystemLoader(prompt_dir),
+        bytecode_cache=bcc,
+        autoescape=False,
+    )
+    # Optional: expose refine as a filter so templates can use {{ text|refine }}
+    env.filters["refine"] = refine
+    return env
+
+@lru_cache(maxsize=256)
+def _get_template(prompt_dir: str, template_name: str) -> Template:
+    env = _get_env(prompt_dir)
+    try:
+        return env.get_template(template_name)
+    except Exception:
+        raise FileNotFoundError(f"Prompt file {os.path.join(prompt_dir, template_name)} not found")
+
+def render_template(prompt_dir: str, template_name: str, **ctx) -> str:
+    tpl = _get_template(prompt_dir, template_name)
+    return refine(tpl.render(**ctx).strip())
+
+# Convenience wrappers keeping old names/semantics
+def render_system_message(prompt_dir: str, system_prompt_filename: str = "system_prompt.j2", **ctx) -> str:
+    return render_template(prompt_dir, system_prompt_filename, **ctx)
+
+def render_initial_user_message(prompt_dir: str, **ctx) -> str:
+    return render_template(prompt_dir, "user_prompt.j2", **ctx)
+
+def render_additional_info(prompt_dir: str, **ctx) -> str:
+    return render_template(prompt_dir, "additional_info.j2", **ctx)
+
+def render_microagent_info(prompt_dir: str, **ctx) -> str:
+    return render_template(prompt_dir, "microagent_info.j2", **ctx)

openhands/core/context/utils/prompt.py

@@ -62,7 +62,7 @@ def send_message(self, message: Message) -> None:
                 # to *any* action execution runtime information
                 if self.env_context:
                     # TODO: the prompt manager here is a hack, will systematically fix it with LLMContextManager design
-                    initial_env_context: list[TextContent] = self.env_context.render(self.agent.prompt_manager)  # type: ignore
+                    initial_env_context: list[TextContent] = self.env_context.render(self.agent.prompt_dir)  # type: ignore
                     message.content += initial_env_context
                     if self.env_context.activated_microagents:
                         activated_microagents = [microagent.name for microagent in self.env_context.activated_microagents]