-
Notifications
You must be signed in to change notification settings - Fork 162
perf: O(1) tool lookup in ToolExecutor via lazily-cached name index #449
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.
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
clickbrain
wants to merge
1
commit into
waybarrios:main
Choose a base branch
from
clickbrain:perf/mcp-executor-o1-tool-lookup
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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, | ||
|
|
@@ -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: | ||
| idx: dict[str, "MCPTool"] = {} | ||
| for t in tools: | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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]: | ||
| """ | ||
|
|
@@ -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, | ||
|
|
@@ -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( | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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