mirror of
https://github.com/OpenHands/OpenHands.git
synced 2026-03-22 05:37:20 +08:00
simplify: settings-transparent agent creation
- _get_agent_settings resolves ALL settings (model, critic endpoint) - _create_agent just calls settings.create_agent() + runtime overrides - Eliminated _get_default_critic, _apply_critic_proxy, _CRITIC_PROXY_PATTERN - Removed legacy path (agent_settings is always present) - Replaced mock-heavy tests with real-object assertions (-200 lines) Co-authored-by: openhands <openhands@all-hands.dev>
This commit is contained in:
openhands
@@ -2,7 +2,6 @@ import asyncio
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
import tempfile
|
||||
import zipfile
|
||||
from collections import defaultdict
|
||||
@@ -124,44 +123,6 @@ Your role ends when the plan is finalized. Implementation is handled by the code
|
||||
</IMPORTANT_PLANNING_BOUNDARIES>"""
|
||||
|
||||
|
||||
_CRITIC_PROXY_PATTERN = re.compile(
|
||||
r'^https?://llm-proxy\.[^./]+\.all-hands\.dev'
|
||||
)
|
||||
|
||||
|
||||
def _apply_critic_proxy(settings: AgentSettings, llm: LLM) -> AgentSettings:
|
||||
"""Route the critic through the LLM proxy when available.
|
||||
|
||||
If the LLM base URL matches the OpenHands proxy pattern, configure the
|
||||
critic to use the proxy's ``/vllm`` endpoint. Otherwise disable the
|
||||
critic (external users don't have access to the hosted service).
|
||||
"""
|
||||
if not settings.verification.critic_enabled:
|
||||
return settings
|
||||
|
||||
base_url = llm.base_url
|
||||
if base_url and _CRITIC_PROXY_PATTERN.match(base_url):
|
||||
return settings.model_copy(
|
||||
update={
|
||||
'verification': settings.verification.model_copy(
|
||||
update={
|
||||
'critic_server_url': f'{base_url.rstrip("/")}/vllm',
|
||||
'critic_model_name': 'critic',
|
||||
}
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
# No proxy → disable critic
|
||||
return settings.model_copy(
|
||||
update={
|
||||
'verification': settings.verification.model_copy(
|
||||
update={'critic_enabled': False}
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@dataclass
|
||||
class LiveStatusAppConversationService(AppConversationServiceBase):
|
||||
"""AppConversationService which combines live status info from the sandbox with stored data."""
|
||||
@@ -918,15 +879,46 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
|
||||
def _get_agent_settings(
|
||||
self, user: UserInfo, llm_model: str | None
|
||||
) -> AgentSettings:
|
||||
agent_settings = user.to_agent_settings()
|
||||
if llm_model is None:
|
||||
return agent_settings
|
||||
"""Resolve SDK ``AgentSettings`` for this request.
|
||||
|
||||
return agent_settings.model_copy(
|
||||
update={
|
||||
'llm': agent_settings.llm.model_copy(update={'model': llm_model}),
|
||||
}
|
||||
)
|
||||
Applies model override and, for users going through the
|
||||
OpenHands LLM proxy, fills in the critic endpoint so that
|
||||
``create_agent()`` builds a correctly-routed critic.
|
||||
"""
|
||||
settings = user.to_agent_settings()
|
||||
if llm_model is not None:
|
||||
settings = settings.model_copy(
|
||||
update={
|
||||
'llm': settings.llm.model_copy(
|
||||
update={'model': llm_model}
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
# Resolve critic endpoint for proxy users
|
||||
if (
|
||||
settings.verification.critic_enabled
|
||||
and not settings.verification.critic_server_url
|
||||
and settings.llm.model.startswith('openhands/')
|
||||
):
|
||||
proxy_url = (
|
||||
settings.llm.base_url or self.openhands_provider_base_url
|
||||
)
|
||||
if proxy_url:
|
||||
settings = settings.model_copy(
|
||||
update={
|
||||
'verification': settings.verification.model_copy(
|
||||
update={
|
||||
'critic_server_url': (
|
||||
f'{proxy_url.rstrip("/")}/vllm'
|
||||
),
|
||||
'critic_model_name': 'critic',
|
||||
}
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
return settings
|
||||
|
||||
def _configure_llm(self, user: UserInfo, llm_model: str | None) -> LLM:
|
||||
"""Configure LLM settings.
|
||||
@@ -1163,41 +1155,24 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
|
||||
|
||||
return llm, mcp_config
|
||||
|
||||
def _create_agent_with_context(
|
||||
def _create_agent(
|
||||
self,
|
||||
llm: LLM,
|
||||
agent_type: AgentType,
|
||||
system_message_suffix: str | None,
|
||||
mcp_config: dict,
|
||||
condenser_max_size: int | None,
|
||||
secrets: dict[str, SecretValue] | None = None,
|
||||
git_provider: ProviderType | None = None,
|
||||
working_dir: str | None = None,
|
||||
agent_settings: AgentSettings | None = None,
|
||||
) -> Agent:
|
||||
"""Create an agent with appropriate tools and context based on agent type.
|
||||
"""Create an agent from fully-resolved settings.
|
||||
|
||||
When *agent_settings* is provided the agent is built via
|
||||
``AgentSettings.create_agent()`` which wires LLM, condenser,
|
||||
tools, agent_context and critic from the settings object.
|
||||
Runtime-only overrides (MCP config, system-prompt tweaks) are
|
||||
applied via ``model_copy`` afterwards.
|
||||
|
||||
Args:
|
||||
llm: Configured LLM instance
|
||||
agent_type: Type of agent to create (PLAN or DEFAULT)
|
||||
system_message_suffix: Optional suffix for system messages
|
||||
mcp_config: MCP configuration dictionary
|
||||
condenser_max_size: condenser_max_size setting
|
||||
secrets: Optional dictionary of secrets for authentication
|
||||
git_provider: Optional git provider type for computing plan path
|
||||
working_dir: Optional working directory for computing plan path
|
||||
agent_settings: Resolved SDK agent settings for this conversation
|
||||
|
||||
Returns:
|
||||
Configured Agent instance with context
|
||||
Supplies runtime-determined fields (tools, agent context, MCP
|
||||
config, system-prompt overrides) and delegates to
|
||||
``AgentSettings.create_agent()``.
|
||||
"""
|
||||
# -- Determine tools based on agent type --
|
||||
# Tools
|
||||
plan_path = None
|
||||
if agent_type == AgentType.PLAN and working_dir:
|
||||
plan_path = self._compute_plan_path(working_dir, git_provider)
|
||||
@@ -1207,7 +1182,7 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
|
||||
else get_default_tools(enable_browser=True)
|
||||
)
|
||||
|
||||
# -- Build system message suffix --
|
||||
# System message suffix
|
||||
effective_suffix = system_message_suffix
|
||||
if agent_type == AgentType.PLAN:
|
||||
effective_suffix = (
|
||||
@@ -1216,38 +1191,20 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
|
||||
else PLANNING_AGENT_INSTRUCTION
|
||||
)
|
||||
|
||||
# -- Build the agent from settings when available --
|
||||
if agent_settings is not None:
|
||||
# Route critic through the LLM proxy (or disable it).
|
||||
agent_settings = _apply_critic_proxy(agent_settings, llm)
|
||||
|
||||
# Populate runtime-determined fields, then let
|
||||
# create_agent() wire LLM, condenser, critic, etc.
|
||||
agent_settings = agent_settings.model_copy(
|
||||
update={
|
||||
'llm': llm,
|
||||
'tools': tools,
|
||||
'agent_context': AgentContext(
|
||||
system_message_suffix=effective_suffix,
|
||||
secrets=secrets,
|
||||
),
|
||||
}
|
||||
)
|
||||
agent = agent_settings.create_agent()
|
||||
else:
|
||||
# Legacy path: no SDK settings — build agent manually.
|
||||
condenser = self._create_condenser(llm, agent_type, condenser_max_size)
|
||||
agent = Agent(
|
||||
llm=llm,
|
||||
tools=tools,
|
||||
condenser=condenser,
|
||||
agent_context=AgentContext(
|
||||
# Build agent from settings
|
||||
assert agent_settings is not None
|
||||
agent = agent_settings.model_copy(
|
||||
update={
|
||||
'llm': llm,
|
||||
'tools': tools,
|
||||
'agent_context': AgentContext(
|
||||
system_message_suffix=effective_suffix,
|
||||
secrets=secrets,
|
||||
),
|
||||
)
|
||||
}
|
||||
).create_agent()
|
||||
|
||||
# -- Apply runtime-only overrides not captured by settings --
|
||||
# Runtime-only Agent overrides not captured by settings
|
||||
runtime_overrides: dict[str, Any] = {'mcp_config': mcp_config}
|
||||
if agent_type == AgentType.PLAN:
|
||||
runtime_overrides['system_prompt_filename'] = 'system_prompt_planning.j2'
|
||||
@@ -1569,13 +1526,12 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
|
||||
llm, mcp_config = await self._configure_llm_and_mcp(user, llm_model)
|
||||
agent_settings = self._get_agent_settings(user, llm_model)
|
||||
|
||||
# Create agent with context
|
||||
agent = self._create_agent_with_context(
|
||||
# Create agent from settings
|
||||
agent = self._create_agent(
|
||||
llm,
|
||||
agent_type,
|
||||
system_message_suffix,
|
||||
mcp_config,
|
||||
user.condenser_max_size,
|
||||
secrets=secrets,
|
||||
git_provider=git_provider,
|
||||
working_dir=project_dir,
|
||||
|
||||
@@ -841,136 +841,108 @@ class TestLiveStatusAppConversationService:
|
||||
# Assert
|
||||
assert path == '/workspace/project/agents-tmp-config/PLAN.md'
|
||||
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.get_planning_tools'
|
||||
)
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
|
||||
)
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.format_plan_structure'
|
||||
)
|
||||
def test_create_agent_with_context_planning_agent(
|
||||
self, mock_format_plan, mock_create_condenser, mock_get_tools
|
||||
):
|
||||
"""Test _create_agent_with_context for planning agent type."""
|
||||
# Arrange
|
||||
mock_llm = Mock(spec=LLM)
|
||||
mock_llm.model_copy.return_value = mock_llm
|
||||
mock_get_tools.return_value = []
|
||||
mock_condenser = Mock()
|
||||
mock_create_condenser.return_value = mock_condenser
|
||||
mock_format_plan.return_value = 'test_plan_structure'
|
||||
mcp_config = {'default': {'url': 'test'}}
|
||||
system_message_suffix = 'Test suffix'
|
||||
working_dir = '/workspace/project'
|
||||
git_provider = ProviderType.GITHUB
|
||||
def test_get_agent_settings_resolves_critic_proxy(self):
|
||||
"""_get_agent_settings sets critic endpoint for openhands/ models."""
|
||||
self.mock_user.sdk_settings_values = {
|
||||
'llm.model': 'openhands/default',
|
||||
'verification.critic_enabled': True,
|
||||
}
|
||||
self.service.openhands_provider_base_url = (
|
||||
'https://llm-proxy.app.all-hands.dev'
|
||||
)
|
||||
|
||||
# Act
|
||||
with patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
|
||||
) as mock_agent_class:
|
||||
mock_agent_instance = Mock()
|
||||
mock_agent_instance.model_copy.return_value = mock_agent_instance
|
||||
mock_agent_class.return_value = mock_agent_instance
|
||||
settings = self.service._get_agent_settings(self.mock_user, None)
|
||||
|
||||
self.service._create_agent_with_context(
|
||||
mock_llm,
|
||||
AgentType.PLAN,
|
||||
system_message_suffix,
|
||||
mcp_config,
|
||||
self.mock_user.condenser_max_size,
|
||||
git_provider=git_provider,
|
||||
working_dir=working_dir,
|
||||
)
|
||||
assert settings.verification.critic_enabled is True
|
||||
assert (
|
||||
settings.verification.critic_server_url
|
||||
== 'https://llm-proxy.app.all-hands.dev/vllm'
|
||||
)
|
||||
assert settings.verification.critic_model_name == 'critic'
|
||||
|
||||
# Assert — Agent() receives llm, tools, condenser, agent_context
|
||||
mock_get_tools.assert_called_once_with(
|
||||
plan_path='/workspace/project/.agents_tmp/PLAN.md'
|
||||
)
|
||||
mock_agent_class.assert_called_once()
|
||||
call_kwargs = mock_agent_class.call_args[1]
|
||||
assert call_kwargs['llm'] == mock_llm
|
||||
assert call_kwargs['condenser'] == mock_condenser
|
||||
assert call_kwargs['agent_context'].system_message_suffix.startswith(
|
||||
PLANNING_AGENT_INSTRUCTION
|
||||
)
|
||||
mock_create_condenser.assert_called_once_with(
|
||||
mock_llm, AgentType.PLAN, self.mock_user.condenser_max_size
|
||||
)
|
||||
def test_get_agent_settings_no_critic_proxy_for_external_models(self):
|
||||
"""_get_agent_settings leaves critic settings alone for non-proxy models."""
|
||||
self.mock_user.sdk_settings_values = {
|
||||
'llm.model': 'anthropic/claude-3',
|
||||
'verification.critic_enabled': True,
|
||||
}
|
||||
|
||||
# Runtime overrides applied via model_copy
|
||||
copy_kwargs = mock_agent_instance.model_copy.call_args[1]['update']
|
||||
assert copy_kwargs['mcp_config'] == mcp_config
|
||||
assert copy_kwargs['system_prompt_filename'] == 'system_prompt_planning.j2'
|
||||
assert (
|
||||
copy_kwargs['system_prompt_kwargs']['plan_structure']
|
||||
== 'test_plan_structure'
|
||||
)
|
||||
assert copy_kwargs['security_analyzer'] is None
|
||||
settings = self.service._get_agent_settings(self.mock_user, None)
|
||||
|
||||
# critic_enabled honored, but no proxy routing applied
|
||||
assert settings.verification.critic_enabled is True
|
||||
assert settings.verification.critic_server_url is None
|
||||
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools'
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.get_planning_tools',
|
||||
return_value=[],
|
||||
)
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
|
||||
)
|
||||
def test_create_agent_with_context_default_agent(
|
||||
self, mock_create_condenser, mock_get_tools
|
||||
):
|
||||
"""Test _create_agent_with_context for default agent type."""
|
||||
# Arrange
|
||||
mock_llm = Mock(spec=LLM)
|
||||
mock_llm.model_copy.return_value = mock_llm
|
||||
mock_get_tools.return_value = []
|
||||
mock_condenser = Mock()
|
||||
mock_create_condenser.return_value = mock_condenser
|
||||
def test_create_agent_planning_agent(self, _mock_get_tools):
|
||||
"""Planning agent gets planning tools, prompt overrides, and instruction."""
|
||||
llm = LLM(model='test-model', api_key=SecretStr('k'))
|
||||
settings = AgentSettings(llm=LLM(model='test-model'))
|
||||
mcp_config = {'default': {'url': 'test'}}
|
||||
|
||||
# Act
|
||||
with patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
|
||||
) as mock_agent_class:
|
||||
mock_agent_instance = Mock()
|
||||
mock_agent_instance.model_copy.return_value = mock_agent_instance
|
||||
mock_agent_class.return_value = mock_agent_instance
|
||||
agent = self.service._create_agent(
|
||||
llm,
|
||||
AgentType.PLAN,
|
||||
'Test suffix',
|
||||
mcp_config,
|
||||
working_dir='/workspace/project',
|
||||
git_provider=ProviderType.GITHUB,
|
||||
agent_settings=settings,
|
||||
)
|
||||
|
||||
self.service._create_agent_with_context(
|
||||
mock_llm,
|
||||
AgentType.DEFAULT,
|
||||
None,
|
||||
mcp_config,
|
||||
self.mock_user.condenser_max_size,
|
||||
)
|
||||
|
||||
# Assert — Agent() receives core fields
|
||||
mock_agent_class.assert_called_once()
|
||||
call_kwargs = mock_agent_class.call_args[1]
|
||||
assert call_kwargs['llm'] == mock_llm
|
||||
assert call_kwargs['condenser'] == mock_condenser
|
||||
mock_get_tools.assert_called_once_with(enable_browser=True)
|
||||
mock_create_condenser.assert_called_once_with(
|
||||
mock_llm, AgentType.DEFAULT, self.mock_user.condenser_max_size
|
||||
)
|
||||
|
||||
# Runtime overrides applied via model_copy
|
||||
copy_kwargs = mock_agent_instance.model_copy.call_args[1]['update']
|
||||
assert copy_kwargs['system_prompt_kwargs']['cli_mode'] is False
|
||||
assert copy_kwargs['mcp_config'] == mcp_config
|
||||
assert agent.system_prompt_filename == 'system_prompt_planning.j2'
|
||||
assert 'plan_structure' in agent.system_prompt_kwargs
|
||||
assert agent.mcp_config == mcp_config
|
||||
assert agent.agent_context is not None
|
||||
assert agent.agent_context.system_message_suffix.startswith(
|
||||
PLANNING_AGENT_INSTRUCTION
|
||||
)
|
||||
assert 'Test suffix' in agent.agent_context.system_message_suffix
|
||||
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
|
||||
return_value=[],
|
||||
)
|
||||
def test_create_agent_with_context_applies_sdk_agent_settings(
|
||||
def test_create_agent_default_agent(self, _mock_get_tools):
|
||||
"""Default agent gets default tools and cli_mode=False."""
|
||||
llm = LLM(model='test-model', api_key=SecretStr('k'))
|
||||
settings = AgentSettings(llm=LLM(model='test-model'))
|
||||
|
||||
agent = self.service._create_agent(
|
||||
llm,
|
||||
AgentType.DEFAULT,
|
||||
None,
|
||||
{},
|
||||
agent_settings=settings,
|
||||
)
|
||||
|
||||
assert agent.system_prompt_kwargs == {'cli_mode': False}
|
||||
assert agent.agent_context is not None
|
||||
assert agent.agent_context.system_message_suffix is None
|
||||
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
|
||||
return_value=[],
|
||||
)
|
||||
def test_create_agent_applies_sdk_agent_settings(
|
||||
self, _mock_get_tools
|
||||
):
|
||||
"""Resolved SDK AgentSettings should affect V1 agent startup."""
|
||||
"""Resolved SDK AgentSettings should affect V1 agent startup.
|
||||
|
||||
Settings are expected to be fully resolved by _get_agent_settings
|
||||
(critic endpoint, model override, etc.) before reaching
|
||||
_create_agent.
|
||||
"""
|
||||
llm = LLM(
|
||||
model='openhands/default',
|
||||
base_url='https://llm-proxy.app.all-hands.dev',
|
||||
api_key=SecretStr('test_api_key'),
|
||||
)
|
||||
# Settings as _get_agent_settings would return them — critic
|
||||
# endpoint already resolved.
|
||||
agent_settings = AgentSettings.model_validate(
|
||||
{
|
||||
'llm': {
|
||||
@@ -982,6 +954,8 @@ class TestLiveStatusAppConversationService:
|
||||
'verification': {
|
||||
'critic_enabled': True,
|
||||
'critic_mode': 'all_actions',
|
||||
'critic_server_url': 'https://llm-proxy.app.all-hands.dev/vllm',
|
||||
'critic_model_name': 'critic',
|
||||
'enable_iterative_refinement': True,
|
||||
'critic_threshold': 0.75,
|
||||
'max_refinement_iterations': 2,
|
||||
@@ -989,12 +963,11 @@ class TestLiveStatusAppConversationService:
|
||||
}
|
||||
)
|
||||
|
||||
agent = self.service._create_agent_with_context(
|
||||
agent = self.service._create_agent(
|
||||
llm,
|
||||
AgentType.DEFAULT,
|
||||
None,
|
||||
{},
|
||||
condenser_max_size=None,
|
||||
agent_settings=agent_settings,
|
||||
)
|
||||
|
||||
@@ -1007,134 +980,6 @@ class TestLiveStatusAppConversationService:
|
||||
assert agent.critic.iterative_refinement.success_threshold == 0.75
|
||||
assert agent.critic.iterative_refinement.max_iterations == 2
|
||||
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.get_planning_tools'
|
||||
)
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
|
||||
)
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.format_plan_structure'
|
||||
)
|
||||
def test_create_agent_with_context_planning_agent_applies_instruction(
|
||||
self, mock_format_plan, mock_create_condenser, mock_get_tools
|
||||
):
|
||||
"""Test _create_agent_with_context applies PLANNING_AGENT_INSTRUCTION for plan agents."""
|
||||
# Arrange
|
||||
mock_llm = Mock(spec=LLM)
|
||||
mock_llm.model_copy.return_value = mock_llm
|
||||
mock_get_tools.return_value = []
|
||||
mock_condenser = Mock()
|
||||
mock_create_condenser.return_value = mock_condenser
|
||||
mock_format_plan.return_value = 'test_plan_structure'
|
||||
mcp_config = {}
|
||||
|
||||
# Act
|
||||
with patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
|
||||
) as mock_agent_class:
|
||||
mock_agent_instance = Mock()
|
||||
mock_agent_instance.model_copy.return_value = mock_agent_instance
|
||||
mock_agent_class.return_value = mock_agent_instance
|
||||
|
||||
self.service._create_agent_with_context(
|
||||
mock_llm,
|
||||
AgentType.PLAN,
|
||||
None, # No existing suffix
|
||||
mcp_config,
|
||||
self.mock_user.condenser_max_size,
|
||||
)
|
||||
|
||||
# Assert — agent_context goes to Agent() constructor
|
||||
call_kwargs = mock_agent_class.call_args[1]
|
||||
assert (
|
||||
call_kwargs['agent_context'].system_message_suffix
|
||||
== PLANNING_AGENT_INSTRUCTION
|
||||
)
|
||||
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.get_planning_tools'
|
||||
)
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
|
||||
)
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.format_plan_structure'
|
||||
)
|
||||
def test_create_agent_with_context_planning_agent_prepends_to_existing_suffix(
|
||||
self, mock_format_plan, mock_create_condenser, mock_get_tools
|
||||
):
|
||||
"""Test _create_agent_with_context prepends planning instruction to existing suffix."""
|
||||
# Arrange
|
||||
mock_llm = Mock(spec=LLM)
|
||||
mock_llm.model_copy.return_value = mock_llm
|
||||
mock_get_tools.return_value = []
|
||||
mock_condenser = Mock()
|
||||
mock_create_condenser.return_value = mock_condenser
|
||||
mock_format_plan.return_value = 'test_plan_structure'
|
||||
mcp_config = {}
|
||||
existing_suffix = 'Custom user instruction from integration'
|
||||
|
||||
# Act
|
||||
with patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
|
||||
) as mock_agent_class:
|
||||
mock_agent_instance = Mock()
|
||||
mock_agent_instance.model_copy.return_value = mock_agent_instance
|
||||
mock_agent_class.return_value = mock_agent_instance
|
||||
|
||||
self.service._create_agent_with_context(
|
||||
mock_llm,
|
||||
AgentType.PLAN,
|
||||
existing_suffix,
|
||||
mcp_config,
|
||||
self.mock_user.condenser_max_size,
|
||||
)
|
||||
|
||||
# Assert — agent_context goes to Agent() constructor
|
||||
call_kwargs = mock_agent_class.call_args[1]
|
||||
suffix = call_kwargs['agent_context'].system_message_suffix
|
||||
assert suffix.startswith(PLANNING_AGENT_INSTRUCTION)
|
||||
assert existing_suffix in suffix
|
||||
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools'
|
||||
)
|
||||
@patch(
|
||||
'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
|
||||
)
|
||||
def test_create_agent_with_context_default_agent_no_planning_instruction(
|
||||
self, mock_create_condenser, mock_get_tools
|
||||
):
|
||||
"""Test _create_agent_with_context does NOT add planning instruction for default agent."""
|
||||
# Arrange
|
||||
mock_llm = Mock(spec=LLM)
|
||||
mock_llm.model_copy.return_value = mock_llm
|
||||
mock_get_tools.return_value = []
|
||||
mock_condenser = Mock()
|
||||
mock_create_condenser.return_value = mock_condenser
|
||||
mcp_config = {}
|
||||
|
||||
# Act
|
||||
with patch(
|
||||
'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
|
||||
) as mock_agent_class:
|
||||
mock_agent_instance = Mock()
|
||||
mock_agent_instance.model_copy.return_value = mock_agent_instance
|
||||
mock_agent_class.return_value = mock_agent_instance
|
||||
|
||||
self.service._create_agent_with_context(
|
||||
mock_llm,
|
||||
AgentType.DEFAULT,
|
||||
None,
|
||||
mcp_config,
|
||||
self.mock_user.condenser_max_size,
|
||||
)
|
||||
|
||||
# Assert — agent_context goes to Agent() constructor
|
||||
call_kwargs = mock_agent_class.call_args[1]
|
||||
assert call_kwargs['agent_context'].system_message_suffix is None
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_finalize_conversation_request_with_skills(self):
|
||||
"""Test _finalize_conversation_request with skills loading."""
|
||||
@@ -1279,7 +1124,7 @@ class TestLiveStatusAppConversationService:
|
||||
return_value=(mock_llm, mock_mcp_config)
|
||||
)
|
||||
self.service._get_agent_settings = Mock(return_value=Mock(spec=AgentSettings))
|
||||
self.service._create_agent_with_context = Mock(return_value=mock_agent)
|
||||
self.service._create_agent = Mock(return_value=mock_agent)
|
||||
self.service._finalize_conversation_request = AsyncMock(
|
||||
return_value=mock_final_request
|
||||
)
|
||||
@@ -1313,12 +1158,11 @@ class TestLiveStatusAppConversationService:
|
||||
# When selected_repository='test/repo', project_dir is resolved
|
||||
# to '/test/dir/repo' via get_project_dir. All downstream calls
|
||||
# (agent context, workspace, skills) must use this path.
|
||||
self.service._create_agent_with_context.assert_called_once_with(
|
||||
self.service._create_agent.assert_called_once_with(
|
||||
mock_llm,
|
||||
AgentType.DEFAULT,
|
||||
'Test suffix',
|
||||
mock_mcp_config,
|
||||
self.mock_user.condenser_max_size,
|
||||
secrets=mock_secrets,
|
||||
git_provider=ProviderType.GITHUB,
|
||||
working_dir='/test/dir/repo',
|
||||
@@ -2240,7 +2084,7 @@ class TestLiveStatusAppConversationService:
|
||||
return_value=mock_secrets
|
||||
)
|
||||
self.service._configure_llm_and_mcp = AsyncMock(return_value=(mock_llm, {}))
|
||||
self.service._create_agent_with_context = Mock(return_value=mock_agent)
|
||||
self.service._create_agent = Mock(return_value=mock_agent)
|
||||
|
||||
captured = {}
|
||||
|
||||
@@ -2277,7 +2121,7 @@ class TestLiveStatusAppConversationService:
|
||||
self.service._configure_llm_and_mcp = AsyncMock(
|
||||
return_value=(Mock(spec=LLM), {})
|
||||
)
|
||||
self.service._create_agent_with_context = Mock(return_value=Mock(spec=Agent))
|
||||
self.service._create_agent = Mock(return_value=Mock(spec=Agent))
|
||||
|
||||
captured = {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user