Skip to content
Open
Changes from all commits
Commits
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
46 changes: 20 additions & 26 deletions vllm_mlx/mcp/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ def __init__(
self.default_timeout = default_timeout or manager.config.default_timeout
self.validate_arguments = validate_arguments
self.sandbox = sandbox or get_sandbox()
# Lazily-built lookup index: full_name and short name → MCPTool.
# Rebuilt whenever the tool count changes (e.g. after refresh_tools).
self._tool_index: dict[str, "MCPTool"] = {}
self._tool_index_size: int = -1

async def execute_tool_calls(
self,
Expand All @@ -119,17 +123,21 @@ async def execute_tool_calls(
else:
return await self._execute_sequential(tool_calls)

def _get_tool_index(self) -> dict[str, "MCPTool"]:
"""Return a name→tool index, rebuilding it if the tool list changed."""
tools = self.manager.get_all_tools()
if len(tools) != self._tool_index_size:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it reasonable to assume that a tool wouldn't be removed simultaneously to a different tool being added?

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think we should have that assumption

idx: dict[str, "MCPTool"] = {}
for t in tools:
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this for loop adds some latency, we could rewrite it more efficient.

idx[t.full_name] = t
idx.setdefault(t.name, t) # short name maps to first match
self._tool_index = idx
self._tool_index_size = len(tools)
return self._tool_index

def _get_tool_by_name(self, full_name: str) -> Optional[MCPTool]:
"""Get a tool by its full name (server__tool or just tool)."""
for tool in self.manager.get_all_tools():
if tool.full_name == full_name:
return tool
# Try without server prefix
if "__" not in full_name:
for tool in self.manager.get_all_tools():
if tool.name == full_name:
return tool
return None
return self._get_tool_index().get(full_name)

def _validate_tool_call(self, tool_call: Dict[str, Any]) -> Optional[str]:
"""
Expand Down Expand Up @@ -186,11 +194,8 @@ def _get_server_for_tool(self, full_name: str) -> str:
"""Extract server name from full tool name or find it."""
if "__" in full_name:
return full_name.split("__")[0]
# Find which server has this tool
for tool in self.manager.get_all_tools():
if tool.name == full_name:
return tool.server_name
return "unknown"
tool = self._get_tool_index().get(full_name)
return tool.server_name if tool else "unknown"

async def _execute_parallel(
self,
Expand Down Expand Up @@ -465,18 +470,7 @@ def extract_and_validate(

def _tool_exists(self, full_name: str) -> bool:
"""Check if a tool exists in any connected server."""
# Check by full name
for tool in self.manager.get_all_tools():
if tool.full_name == full_name:
return True

# Check by just tool name (without server prefix)
if "__" not in full_name:
for tool in self.manager.get_all_tools():
if tool.name == full_name:
return True

return False
return full_name in self._get_tool_index()


async def execute_single_tool(
Expand Down
Loading