Skip to content

Fix/issue 477 mcp crash resilience #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahmedennaifer wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix/issue 477 mcp crash resilience #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
993f7b2
fix: gracefully handle MCP server failures instead of crashing (#477)
ahmedennaifer Apr 9, 2026
7662df6
fix: gracefully handle MCP server failures instead of crashing (#477)
ahmedennaifer Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 19 additions & 99 deletions libs/idun_agent_engine/src/idun_agent_engine/core/config_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
from idun_agent_schema.engine.observability_v2 import ObservabilityConfig
from idun_agent_schema.engine.prompt import PromptConfig
from idun_agent_schema.engine.sso import SSOConfig
from yaml import YAMLError

from idun_agent_engine.server.server_config import ServerAPIConfig

Expand Down Expand Up @@ -98,118 +97,39 @@ def with_server_config(
return self

def with_config_from_api(self, agent_api_key: str, url: str) -> "ConfigBuilder":
"""Fetches the yaml config file, from idun agent manager api.
"""Fetch config from the idun agent manager API and populate the builder.

Requires the agent api key to pass in the headers.
"""
import requests
import requests # TODO: replace with httpx
import yaml

headers = {"auth": f"Bearer {agent_api_key}"}
try:
logger.info(f"Fetching config from {url}/api/v1/agents/config")
response = requests.get(url=url + "/api/v1/agents/config", headers=headers)
response = requests.get(
url=url + "/api/v1/agents/config", headers=headers
)
if response.status_code != 200:
raise ValueError(
f"Error sending retrieving config from url. response : {response.json()}"
f"Error retrieving config from url. response: {response.text}"
)
yaml_config = yaml.safe_load(response.text)
try:
self._server_config = yaml_config.get("engine_config", {}).get("server")
except Exception as e:
raise YAMLError(
f"Failed to parse yaml file for ServerConfig: {e}"
) from e
try:
self._agent_config = yaml_config.get("engine_config", {}).get("agent")
except Exception as e:
raise YAMLError(
f"Failed to parse yaml file for Engine config: {e}"
) from e
try:
guardrails_data = yaml_config.get("engine_config", {}).get("guardrails")

if not guardrails_data:
self._guardrails = None
else:
self._guardrails = Guardrails.model_validate(guardrails_data)

except Exception as e:
raise YAMLError(f"Failed to parse yaml file for Guardrails: {e}") from e

try:
observability_list = yaml_config.get("engine_config", {}).get(
"observability"
)
if observability_list:
self._observability = [
ObservabilityConfig.model_validate(obs)
for obs in observability_list
]
else:
self._observability = None
except Exception as e:
raise YAMLError(
f"Failed to parse yaml file for Observability: {e}"
) from e
try:
sso_data = yaml_config.get("engine_config", {}).get("sso")
if sso_data:
self._sso = SSOConfig.model_validate(sso_data)
else:
self._sso = None
except Exception as e:
raise YAMLError(f"Failed to parse yaml file for SSO: {e}") from e

# try:
# mcp_servers_list = yaml_config.get("engine_config", {}).get("mcp_servers") or yaml_config.get("engine_config", {}).get("mcpServers") # TODO to fix camelcase issues
# if mcp_servers_list:
# self._mcp_servers = [
# MCPServer.model_validate(server) for server in mcp_servers_list
# ]
# else:
# self._mcp_servers = None
# except Exception as e:
# raise YAMLError(f"Failed to parse yaml file for MCP Servers: {e}") from e

try:
from idun_agent_schema.engine.integrations import IntegrationConfig

integrations_list = yaml_config.get("engine_config", {}).get(
"integrations"
)
if integrations_list:
self._integrations = [
IntegrationConfig.model_validate(i) for i in integrations_list
]
else:
self._integrations = None
except Exception as e:
raise YAMLError(
f"Failed to parse yaml file for Integrations: {e}"
) from e

try:
prompts_list = yaml_config.get("engine_config", {}).get("prompts")
if prompts_list:
self._prompts = [
PromptConfig.model_validate(p) for p in prompts_list
]
logger.info(
f"Loaded {len(self._prompts)} prompt(s) from API config"
)
else:
self._prompts = None
logger.debug("No prompts found in API config")
except Exception as e:
raise YAMLError(
f"Failed to parse yaml file for Prompts: {e}"
) from e
raw = yaml.safe_load(response.text)
engine_data = raw.get("engine_config", {})
engine_config = EngineConfig.model_validate(engine_data)

self._server_config = engine_config.server
self._agent_config = engine_config.agent
self._guardrails = engine_config.guardrails
self._observability = engine_config.observability
self._mcp_servers = engine_config.mcp_servers
self._sso = engine_config.sso
self._integrations = engine_config.integrations
self._prompts = engine_config.prompts

return self

except Exception as e:
raise ValueError(f"Error occured while getting config from api: {e}") from e
raise ValueError(f"Error occurred while getting config from api: {e}") from e

def with_langgraph_agent(
self,
Expand Down
49 changes: 42 additions & 7 deletions libs/idun_agent_engine/src/idun_agent_engine/mcp/registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,26 @@ def __init__(self, configs: list[MCPServer] | None = None) -> None:
self._client: MultiServerMCPClient | None = None

if self._configs:
connections: dict[str, Connection] = {
config.name: cast(Connection, config.as_connection_dict())
for config in self._configs
}
self._client = MultiServerMCPClient(connections)
connections: dict[str, Connection] = {}
for config in self._configs:
try:
connections[config.name] = cast(
Connection, config.as_connection_dict()
)
except Exception:
logger.exception(
"⚠️ Failed to build connection for MCP server '%s', skipping.",
config.name,
)

if connections:
try:
self._client = MultiServerMCPClient(connections)
except Exception:
logger.exception(
"⚠️ Failed to create MultiServerMCPClient, "
"continuing without MCP servers."
)

@property
def enabled(self) -> bool:
Expand Down Expand Up @@ -159,10 +174,30 @@ def get_session(self, name: str):
return self.client.session(name)

async def get_tools(self, name: str | None = None) -> list[Any]:
"""Load tools from all servers or a specific one."""
"""Load tools from all servers or a specific one.

When loading from all servers, each server is tried individually
so a single broken server does not prevent the others from loading.
"""
if not self._client:
raise RuntimeError("MCP client registry is not enabled.")
tools = await self._client.get_tools(server_name=name)

if name:
tools = await self._client.get_tools(server_name=name)
else:
tools = []
for server_name in self._client.connections:
try:
server_tools = await self._client.get_tools(
server_name=server_name
)
tools.extend(server_tools)
except Exception:
logger.exception(
"⚠️ Failed to load tools from MCP server '%s', skipping.",
server_name,
)

for tool in tools:
if hasattr(tool, "args_schema"):
_sanitize_schema(tool.args_schema)
Expand Down
6 changes: 5 additions & 1 deletion libs/idun_agent_engine/src/idun_agent_engine/server/lifespan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ async def configure_app(app: FastAPI, engine_config):
guardrails = []

# Use ConfigBuilder's centralized agent initialization, passing the registry
mcp_registry = MCPClientRegistry(engine_config.mcp_servers or [])
try:
mcp_registry = MCPClientRegistry(engine_config.mcp_servers or [])
except Exception as e:
logger.exception(f"⚠️ Failed to initialize MCP registry: {e}, continuing without MCP servers")
mcp_registry = MCPClientRegistry()
set_active_registry(mcp_registry)
app.state.mcp_registry = mcp_registry
try:
Expand Down
Loading
Loading