From 8b08958efe8820d1d125621bb914ab8ecf5ffd7a Mon Sep 17 00:00:00 2001 From: Rohit Malhotra Date: Wed, 21 May 2025 15:17:43 -0400 Subject: [PATCH] [Fix]: make mcp config optional in settings (#8622) --- openhands/server/session/session.py | 4 ++-- openhands/storage/data_models/settings.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openhands/server/session/session.py b/openhands/server/session/session.py index 4f4c6aa038..3db070a221 100644 --- a/openhands/server/session/session.py +++ b/openhands/server/session/session.py @@ -12,7 +12,7 @@ from openhands.core.config.condenser_config import ( CondenserPipelineConfig, LLMSummarizingCondenserConfig, ) -from openhands.core.config.mcp_config import OpenHandsMCPConfigImpl +from openhands.core.config.mcp_config import MCPConfig, OpenHandsMCPConfigImpl from openhands.core.exceptions import MicroagentValidationError from openhands.core.logger import OpenHandsLoggerAdapter from openhands.core.schema import AgentState @@ -116,7 +116,7 @@ class Session: or settings.sandbox_runtime_container_image else self.config.sandbox.runtime_container_image ) - self.config.mcp = settings.mcp_config + self.config.mcp = settings.mcp_config or MCPConfig(sse_servers=[], stdio_servers=[]) # Add OpenHands' MCP server by default openhands_mcp_server = OpenHandsMCPConfigImpl.create_default_mcp_server_config(self.config.mcp_host, self.user_id) if openhands_mcp_server: diff --git a/openhands/storage/data_models/settings.py b/openhands/storage/data_models/settings.py index 26027189a2..5967e310e4 100644 --- a/openhands/storage/data_models/settings.py +++ b/openhands/storage/data_models/settings.py @@ -38,7 +38,7 @@ class Settings(BaseModel): user_consents_to_analytics: bool | None = None sandbox_base_container_image: str | None = None sandbox_runtime_container_image: str | None = None - mcp_config: MCPConfig = Field(default_factory=MCPConfig) + mcp_config: MCPConfig | None = None model_config = {