Merge pull request #1302 from NousResearch/hermes/hermes-315847fd
feat(mcp): salvage selective tool loading with utility policies
This commit is contained in:
Teknium
GitHub
commit
c1cca65168
8 changed files with 1286 additions and 257 deletions
|
|
@ -2447,3 +2447,229 @@ class TestDiscoveryFailedCount:
|
|||
_servers.pop("ok1", None)
|
||||
_servers.pop("ok2", None)
|
||||
_servers.pop("fail1", None)
|
||||
|
||||
|
||||
class TestMCPSelectiveToolLoading:
|
||||
"""Tests for per-server MCP filtering and utility tool policies."""
|
||||
|
||||
def _make_server(self, name, tool_names, session=None):
|
||||
server = _make_mock_server(
|
||||
name,
|
||||
session=session or SimpleNamespace(),
|
||||
tools=[_make_mcp_tool(n, n) for n in tool_names],
|
||||
)
|
||||
return server
|
||||
|
||||
def _run_discover(self, name, tool_names, config, session=None):
|
||||
from tools.registry import ToolRegistry
|
||||
from tools.mcp_tool import _discover_and_register_server, _servers
|
||||
|
||||
mock_registry = ToolRegistry()
|
||||
server = self._make_server(name, tool_names, session=session)
|
||||
|
||||
async def fake_connect(_name, _config):
|
||||
return server
|
||||
|
||||
async def run():
|
||||
with patch("tools.mcp_tool._connect_server", side_effect=fake_connect), \
|
||||
patch("tools.registry.registry", mock_registry), \
|
||||
patch("toolsets.create_custom_toolset"):
|
||||
return await _discover_and_register_server(name, config)
|
||||
|
||||
try:
|
||||
registered = asyncio.run(run())
|
||||
finally:
|
||||
_servers.pop(name, None)
|
||||
return registered, mock_registry
|
||||
|
||||
def test_include_takes_precedence_over_exclude(self):
|
||||
config = {
|
||||
"url": "https://mcp.example.com",
|
||||
"tools": {
|
||||
"include": ["create_service"],
|
||||
"exclude": ["create_service", "delete_service"],
|
||||
},
|
||||
}
|
||||
registered, _ = self._run_discover(
|
||||
"ink",
|
||||
["create_service", "delete_service", "list_services"],
|
||||
config,
|
||||
session=SimpleNamespace(),
|
||||
)
|
||||
assert registered == ["mcp_ink_create_service"]
|
||||
|
||||
def test_exclude_filter_registers_all_except_listed_tools(self):
|
||||
config = {
|
||||
"url": "https://mcp.example.com",
|
||||
"tools": {"exclude": ["delete_service"]},
|
||||
}
|
||||
registered, _ = self._run_discover(
|
||||
"ink_exclude",
|
||||
["create_service", "delete_service", "list_services"],
|
||||
config,
|
||||
session=SimpleNamespace(),
|
||||
)
|
||||
assert registered == [
|
||||
"mcp_ink_exclude_create_service",
|
||||
"mcp_ink_exclude_list_services",
|
||||
]
|
||||
|
||||
def test_include_filter_skips_utility_tools_without_capabilities(self):
|
||||
config = {
|
||||
"url": "https://mcp.example.com",
|
||||
"tools": {"include": ["create_service"]},
|
||||
}
|
||||
registered, mock_registry = self._run_discover(
|
||||
"ink_no_caps",
|
||||
["create_service", "delete_service"],
|
||||
config,
|
||||
session=SimpleNamespace(),
|
||||
)
|
||||
assert registered == ["mcp_ink_no_caps_create_service"]
|
||||
assert set(mock_registry.get_all_tool_names()) == {"mcp_ink_no_caps_create_service"}
|
||||
|
||||
def test_no_filter_registers_all_server_tools_when_no_utilities_supported(self):
|
||||
registered, _ = self._run_discover(
|
||||
"ink_no_filter",
|
||||
["create_service", "delete_service", "list_services"],
|
||||
{"url": "https://mcp.example.com"},
|
||||
session=SimpleNamespace(),
|
||||
)
|
||||
assert registered == [
|
||||
"mcp_ink_no_filter_create_service",
|
||||
"mcp_ink_no_filter_delete_service",
|
||||
"mcp_ink_no_filter_list_services",
|
||||
]
|
||||
|
||||
def test_resources_and_prompts_can_be_disabled_explicitly(self):
|
||||
session = SimpleNamespace(
|
||||
list_resources=AsyncMock(),
|
||||
read_resource=AsyncMock(),
|
||||
list_prompts=AsyncMock(),
|
||||
get_prompt=AsyncMock(),
|
||||
)
|
||||
config = {
|
||||
"url": "https://mcp.example.com",
|
||||
"tools": {
|
||||
"resources": False,
|
||||
"prompts": False,
|
||||
},
|
||||
}
|
||||
registered, _ = self._run_discover(
|
||||
"ink_disabled_utils",
|
||||
["create_service"],
|
||||
config,
|
||||
session=session,
|
||||
)
|
||||
assert registered == ["mcp_ink_disabled_utils_create_service"]
|
||||
|
||||
def test_registers_only_utility_tools_supported_by_server_capabilities(self):
|
||||
session = SimpleNamespace(
|
||||
list_resources=AsyncMock(return_value=SimpleNamespace(resources=[])),
|
||||
read_resource=AsyncMock(return_value=SimpleNamespace(contents=[])),
|
||||
)
|
||||
registered, _ = self._run_discover(
|
||||
"ink_resources_only",
|
||||
["create_service"],
|
||||
{"url": "https://mcp.example.com"},
|
||||
session=session,
|
||||
)
|
||||
assert "mcp_ink_resources_only_create_service" in registered
|
||||
assert "mcp_ink_resources_only_list_resources" in registered
|
||||
assert "mcp_ink_resources_only_read_resource" in registered
|
||||
assert "mcp_ink_resources_only_list_prompts" not in registered
|
||||
assert "mcp_ink_resources_only_get_prompt" not in registered
|
||||
|
||||
def test_existing_tool_names_reflect_registered_subset(self):
|
||||
from tools.mcp_tool import _existing_tool_names, _servers, _discover_and_register_server
|
||||
from tools.registry import ToolRegistry
|
||||
|
||||
mock_registry = ToolRegistry()
|
||||
server = self._make_server(
|
||||
"ink_existing",
|
||||
["create_service", "delete_service"],
|
||||
session=SimpleNamespace(),
|
||||
)
|
||||
|
||||
async def fake_connect(_name, _config):
|
||||
return server
|
||||
|
||||
async def run():
|
||||
with patch("tools.mcp_tool._connect_server", side_effect=fake_connect), \
|
||||
patch("tools.registry.registry", mock_registry), \
|
||||
patch("toolsets.create_custom_toolset"):
|
||||
return await _discover_and_register_server(
|
||||
"ink_existing",
|
||||
{"url": "https://mcp.example.com", "tools": {"include": ["create_service"]}},
|
||||
)
|
||||
|
||||
try:
|
||||
registered = asyncio.run(run())
|
||||
assert registered == ["mcp_ink_existing_create_service"]
|
||||
assert _existing_tool_names() == ["mcp_ink_existing_create_service"]
|
||||
finally:
|
||||
_servers.pop("ink_existing", None)
|
||||
|
||||
def test_no_toolset_created_when_everything_is_filtered_out(self):
|
||||
from tools.registry import ToolRegistry
|
||||
from tools.mcp_tool import _discover_and_register_server, _servers
|
||||
|
||||
mock_registry = ToolRegistry()
|
||||
server = self._make_server("ink_none", ["create_service"], session=SimpleNamespace())
|
||||
mock_create = MagicMock()
|
||||
|
||||
async def fake_connect(_name, _config):
|
||||
return server
|
||||
|
||||
async def run():
|
||||
with patch("tools.mcp_tool._connect_server", side_effect=fake_connect), \
|
||||
patch("tools.registry.registry", mock_registry), \
|
||||
patch("toolsets.create_custom_toolset", mock_create):
|
||||
return await _discover_and_register_server(
|
||||
"ink_none",
|
||||
{
|
||||
"url": "https://mcp.example.com",
|
||||
"tools": {
|
||||
"include": ["missing_tool"],
|
||||
"resources": False,
|
||||
"prompts": False,
|
||||
},
|
||||
},
|
||||
)
|
||||
|
||||
try:
|
||||
registered = asyncio.run(run())
|
||||
assert registered == []
|
||||
mock_create.assert_not_called()
|
||||
assert mock_registry.get_all_tool_names() == []
|
||||
finally:
|
||||
_servers.pop("ink_none", None)
|
||||
|
||||
def test_enabled_false_skips_connection_attempt(self):
|
||||
from tools.mcp_tool import discover_mcp_tools
|
||||
|
||||
connect_called = []
|
||||
|
||||
async def fake_connect(name, config):
|
||||
connect_called.append(name)
|
||||
return self._make_server(name, ["create_service"])
|
||||
|
||||
fake_config = {
|
||||
"ink": {
|
||||
"url": "https://mcp.example.com",
|
||||
"enabled": False,
|
||||
}
|
||||
}
|
||||
fake_toolsets = {
|
||||
"hermes-cli": {"tools": [], "description": "CLI", "includes": []},
|
||||
}
|
||||
|
||||
with patch("tools.mcp_tool._MCP_AVAILABLE", True), \
|
||||
patch("tools.mcp_tool._servers", {}), \
|
||||
patch("tools.mcp_tool._load_mcp_config", return_value=fake_config), \
|
||||
patch("tools.mcp_tool._connect_server", side_effect=fake_connect), \
|
||||
patch("toolsets.TOOLSETS", fake_toolsets):
|
||||
result = discover_mcp_tools()
|
||||
|
||||
assert connect_called == []
|
||||
assert result == []
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue