diff --git a/setup.py b/setup.py index eecbb10c026..4715d73580d 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ def get_version() -> str: extras["hf_xet"] = [HF_XET_VERSION] -extras["mcp"] = ["mcp>=1.8.0, <2.0.0"] +extras["mcp"] = ["mcp>=1.9.4, <2.0.0"] # list_tools(cursor=...) only paginates correctly from 1.9.4 extras["testing"] = ( extras["oauth"] diff --git a/src/huggingface_hub/inference/_mcp/mcp_client.py b/src/huggingface_hub/inference/_mcp/mcp_client.py index 7331d13fa61..00c0b572fd9 100644 --- a/src/huggingface_hub/inference/_mcp/mcp_client.py +++ b/src/huggingface_hub/inference/_mcp/mcp_client.py @@ -210,17 +210,21 @@ async def add_mcp_server(self, type: ServerType, **params: Any): logger.debug("Initializing session...") await session.initialize() - # List available tools + # List available tools, following `nextCursor` since servers may paginate tools/list response = await session.list_tools() - logger.debug("Connected to server with tools:", [tool.name for tool in response.tools]) + tools: list[mcp_types.Tool] = list(response.tools) + while response.nextCursor: + response = await session.list_tools(cursor=response.nextCursor) + tools.extend(response.tools) + logger.debug("Connected to server with tools:", [tool.name for tool in tools]) # Filter tools based on allowed_tools configuration - filtered_tools = response.tools + filtered_tools = tools if allowed_tools is not None: - filtered_tools = [tool for tool in response.tools if tool.name in allowed_tools] + filtered_tools = [tool for tool in tools if tool.name in allowed_tools] logger.debug( - f"Tool filtering applied. Using {len(filtered_tools)} of {len(response.tools)} available tools: {[tool.name for tool in filtered_tools]}" + f"Tool filtering applied. Using {len(filtered_tools)} of {len(tools)} available tools: {[tool.name for tool in filtered_tools]}" ) for tool in filtered_tools: