Building AI agents, atomically
fix: discover all pages of MCP tools resources and prompts
liangzhechen6556e52126a1bfd
diff --git a/atomic-agents/atomic_agents/connectors/mcp/mcp_definition_service.py b/atomic-agents/atomic_agents/connectors/mcp/mcp_definition_service.pyindex a969496..1836bdf 100644--- a/atomic-agents/atomic_agents/connectors/mcp/mcp_definition_service.py+++ b/atomic-agents/atomic_agents/connectors/mcp/mcp_definition_service.py@@ -4,7 +4,7 @@ import loggingimport reimport shlexfrom contextlib import AsyncExitStack-from typing import List, NamedTuple, Optional, Dict, Any+from typing import List, NamedTuple, Optional, Dict, Any, Callable, Awaitablefrom enum import Enumfrom mcp import ClientSession, StdioServerParameters@@ -19,6 +19,18 @@ from urllib.parse import unquote as decode_urilogger = logging.getLogger(__name__)+async def _fetch_all_pages(list_page: Callable[..., Awaitable[Any]], items_attribute: str) -> List[Any]:+ """Collect an MCP list response, following its opaque continuation cursors."""+ response = await list_page()+ items = list(getattr(response, items_attribute) or [])+ cursor = getattr(response, "nextCursor", None)+ while isinstance(cursor, str):+ response = await list_page(cursor=cursor)+ items.extend(getattr(response, items_attribute) or [])+ cursor = getattr(response, "nextCursor", None)+ return items++class MCPTransportType(Enum):"""Enum for MCP transport types."""@@ -163,8 +175,8 @@ class MCPDefinitionService:# `initialize` is idempotent – calling it twice is safe and# ensures the session is ready.await session.initialize()- response = await session.list_tools()- for mcp_tool in response.tools:+ mcp_tools = await _fetch_all_pages(session.list_tools, "tools")+ for mcp_tool in mcp_tools:# Capture outputSchema if the MCP server provides oneoutput_schema = getattr(mcp_tool, "outputSchema", None)definitions.append(@@ -248,17 +260,15 @@ class MCPDefinitionService:try:await session.initialize()- response: types.ListResourcesResult = await session.list_resources()-- resources_iterable: List[types.Resource] = list(response.resources or [])+ resources_iterable: List[types.Resource] = await _fetch_all_pages(session.list_resources, "resources")try:- res_templates: types.ListResourceTemplatesResult = await session.list_resource_templates()+ res_templates = await _fetch_all_pages(session.list_resource_templates, "resourceTemplates")except McpError as error:if error.error.code != types.METHOD_NOT_FOUND:raiseelse:- for template in res_templates.resourceTemplates:+ for template in res_templates:# Resource templates have no "input_schema" value and use URI templates with parameters.resources_iterable.append(types.Resource(@@ -370,8 +380,8 @@ class MCPDefinitionService:prompts: List[MCPPromptDefinition] = []try:await session.initialize()- response: types.ListPromptsResult = await session.list_prompts()- for mcp_prompt in response.prompts:+ mcp_prompts = await _fetch_all_pages(session.list_prompts, "prompts")+ for mcp_prompt in mcp_prompts:arguments: List[types.PromptArgument] = mcp_prompt.arguments or []prompts.append(MCPPromptDefinition(diff --git a/atomic-agents/tests/connectors/mcp/test_paginated_discovery.py b/atomic-agents/tests/connectors/mcp/test_paginated_discovery.pynew file mode 100644index 0000000..5e5e2fc--- /dev/null+++ b/atomic-agents/tests/connectors/mcp/test_paginated_discovery.py@@ -0,0 +1,78 @@+from unittest.mock import AsyncMock, call++import pytest+from mcp import ClientSession+from mcp import types++from atomic_agents.connectors.mcp import MCPDefinitionService++[email protected]("empty_first_page", [False, True])+async def test_discover_all_tool_pages(empty_first_page):+ first = types.Tool(name="first", inputSchema={"type": "object"})+ last = types.Tool(name="last", inputSchema={"type": "object"}, outputSchema={"type": "string"})+ session = AsyncMock(spec=ClientSession)+ session.list_tools.side_effect = [+ types.ListToolsResult(tools=[] if empty_first_page else [first], nextCursor="tools-next"),+ types.ListToolsResult(tools=[last]),+ ]++ definitions = await MCPDefinitionService.fetch_tool_definitions_from_session(session)++ assert [definition.name for definition in definitions] == ([] if empty_first_page else ["first"]) + ["last"]+ assert definitions[-1].output_schema == {"type": "string"}+ assert session.list_tools.await_args_list == [call(), call(cursor="tools-next")]+ session.initialize.assert_awaited_once()++[email protected]("empty_first_page", [False, True])+async def test_discover_all_prompt_pages(empty_first_page):+ session = AsyncMock(spec=ClientSession)+ session.list_prompts.side_effect = [+ types.ListPromptsResult(prompts=[] if empty_first_page else [types.Prompt(name="first")], nextCursor="prompts-next"),+ types.ListPromptsResult(+ prompts=[types.Prompt(name="last", arguments=[types.PromptArgument(name="topic", required=True)])]+ ),+ ]++ definitions = await MCPDefinitionService.fetch_prompt_definitions_from_session(session)++ assert [definition.name for definition in definitions] == ([] if empty_first_page else ["first"]) + ["last"]+ assert definitions[-1].input_schema["required"] == ["topic"]+ assert session.list_prompts.await_args_list == [call(), call(cursor="prompts-next")]++[email protected]("empty_first_page", [False, True])+async def test_discover_all_resource_and_template_pages(empty_first_page):+ session = AsyncMock(spec=ClientSession)+ session.list_resources.side_effect = [+ types.ListResourcesResult(+ resources=[] if empty_first_page else [types.Resource(name="first", uri="file:///first")],+ nextCursor="resources-next",+ ),+ types.ListResourcesResult(resources=[types.Resource(name="last", uri="file:///last", mimeType="text/plain")]),+ ]+ session.list_resource_templates.side_effect = [+ types.ListResourceTemplatesResult(+ resourceTemplates=(+ [] if empty_first_page else [types.ResourceTemplate(name="template-first", uriTemplate="file:///{id}")]+ ),+ nextCursor="templates-next",+ ),+ types.ListResourceTemplatesResult(+ resourceTemplates=[types.ResourceTemplate(name="template-last", uriTemplate="data:///{key}")]+ ),+ ]++ definitions = await MCPDefinitionService.fetch_resource_definitions_from_session(session)++ expected = ([] if empty_first_page else ["first"]) + ["last"]+ expected += ([] if empty_first_page else ["template-first"]) + ["template-last"]+ assert [definition.name for definition in definitions] == expected+ assert next(definition for definition in definitions if definition.name == "last").mime_type == "text/plain"+ assert definitions[-1].input_schema["required"] == ["key"]+ assert session.list_resources.await_args_list == [call(), call(cursor="resources-next")]+ assert session.list_resource_templates.await_args_list == [call(), call(cursor="templates-next")]