Skip to content

Personal AI, On Personal Devices

Python

feat: wire SystemPromptBuilder into BaseAgent._build_messages()

Tarun Suresh1359c223ec6a
diff --git a/src/openjarvis/agents/_stubs.py b/src/openjarvis/agents/_stubs.py
index 2f8e3011..f25fcc9c 100644
--- a/src/openjarvis/agents/_stubs.py
+++ b/src/openjarvis/agents/_stubs.py
@@ -65,12 +65,14 @@ class BaseAgent(ABC):
bus: Optional[EventBus] = None,
temperature: float = 0.7,
max_tokens: int = 1024,
+ prompt_builder: Optional[Any] = None,
) -> None:
self._engine = engine
self._model = model
self._bus = bus
self._temperature = temperature
self._max_tokens = max_tokens
+ self._prompt_builder = prompt_builder
# ------------------------------------------------------------------
# Concrete helpers
@@ -104,8 +106,14 @@ class BaseAgent(ABC):
conversation messages, and finally the user input.
"""
messages: list[Message] = []
- if system_prompt:
- messages.append(Message(role=Role.SYSTEM, content=system_prompt))
+ if self._prompt_builder is not None:
+ effective_system_prompt = self._prompt_builder.build()
+ elif system_prompt:
+ effective_system_prompt = system_prompt
+ else:
+ effective_system_prompt = None
+ if effective_system_prompt:
+ messages.append(Message(role=Role.SYSTEM, content=effective_system_prompt))
if context and context.conversation.messages:
messages.extend(context.conversation.messages)
messages.append(Message(role=Role.USER, content=input))
diff --git a/tests/agents/test_system_prompt_builder_integration.py b/tests/agents/test_system_prompt_builder_integration.py
new file mode 100644
index 00000000..bb4cce2f
--- /dev/null
+++ b/tests/agents/test_system_prompt_builder_integration.py
@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+from pathlib import Path
+from openjarvis.core.config import MemoryFilesConfig, SystemPromptConfig
+
+
+def test_base_agent_uses_builder(tmp_path: Path):
+ soul = tmp_path / "SOUL.md"
+ soul.write_text("I am Jarvis.")
+ memory = tmp_path / "MEMORY.md"
+ memory.write_text("- User likes Python")
+
+ from openjarvis.prompt.builder import SystemPromptBuilder
+
+ builder = SystemPromptBuilder(
+ agent_template="You are a helpful assistant.",
+ memory_files_config=MemoryFilesConfig(
+ soul_path=str(soul),
+ memory_path=str(memory),
+ user_path=str(tmp_path / "USER.md"),
+ ),
+ system_prompt_config=SystemPromptConfig(),
+ )
+ prompt = builder.build()
+ assert "Jarvis" in prompt
+ assert "Python" in prompt
+ assert "helpful assistant" in prompt