mirror of
https://github.com/OpenHands/OpenHands.git
synced 2026-03-22 05:37:20 +08:00
Fix UserSettings creation from Org tables (#12635)
Co-authored-by: openhands <openhands@all-hands.dev> Co-authored-by: tofarr <tofarr@gmail.com>
This commit is contained in:
@@ -360,7 +360,7 @@ class OpenHandsMCPConfig:
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def create_default_mcp_server_config(
|
||||
async def create_default_mcp_server_config(
|
||||
host: str, config: 'OpenHandsConfig', user_id: str | None = None
|
||||
) -> tuple[MCPSHTTPServerConfig | None, list[MCPStdioServerConfig]]:
|
||||
"""Create a default MCP server configuration.
|
||||
|
||||
@@ -153,10 +153,11 @@ async def run_controller(
|
||||
# Add MCP tools to the agent
|
||||
if agent.config.enable_mcp:
|
||||
# Add OpenHands' MCP server by default
|
||||
_, openhands_mcp_stdio_servers = (
|
||||
OpenHandsMCPConfigImpl.create_default_mcp_server_config(
|
||||
config.mcp_host, config, None
|
||||
)
|
||||
(
|
||||
_,
|
||||
openhands_mcp_stdio_servers,
|
||||
) = await OpenHandsMCPConfigImpl.create_default_mcp_server_config(
|
||||
config.mcp_host, config, None
|
||||
)
|
||||
runtime.config.mcp.stdio_servers.extend(openhands_mcp_stdio_servers)
|
||||
|
||||
|
||||
@@ -202,10 +202,11 @@ class WebSession:
|
||||
self.logger.debug(f'Merged custom MCP Config: {mcp_config}')
|
||||
|
||||
# Add OpenHands' MCP server by default
|
||||
openhands_mcp_server, openhands_mcp_stdio_servers = (
|
||||
OpenHandsMCPConfigImpl.create_default_mcp_server_config(
|
||||
self.config.mcp_host, self.config, self.user_id
|
||||
)
|
||||
(
|
||||
openhands_mcp_server,
|
||||
openhands_mcp_stdio_servers,
|
||||
) = await OpenHandsMCPConfigImpl.create_default_mcp_server_config(
|
||||
self.config.mcp_host, self.config, self.user_id
|
||||
)
|
||||
|
||||
if openhands_mcp_server:
|
||||
|
||||
Reference in New Issue
Block a user