merge conflict

This commit is contained in:
Krishav Raj Singh 2025-07-31 03:43:43 +05:30
parent 1e5342b6dc
commit 7239ce4668
1 changed files with 2 additions and 1 deletions

View File

@ -70,7 +70,7 @@ class ToolManager:
self.thread_manager.add_tool(SandboxWebSearchTool, project_id=self.project_id, thread_manager=self.thread_manager)
self.thread_manager.add_tool(SandboxVisionTool, project_id=self.project_id, thread_id=self.thread_id, thread_manager=self.thread_manager)
self.thread_manager.add_tool(SandboxImageEditTool, project_id=self.project_id, thread_id=self.thread_id, thread_manager=self.thread_manager)
self.thread_manager.add_tool(TaskListTool, project_id=self.project_id, thread_manager=self.thread_manager, thread_id=self.thread_id)
if config.RAPID_API_KEY:
self.thread_manager.add_tool(DataProvidersTool)
@ -92,6 +92,7 @@ class ToolManager:
def register_custom_tools(self, enabled_tools: Dict[str, Any]):
self.thread_manager.add_tool(ExpandMessageTool, thread_id=self.thread_id, thread_manager=self.thread_manager)
self.thread_manager.add_tool(MessageTool)
self.thread_manager.add_tool(TaskListTool, project_id=self.project_id, thread_manager=self.thread_manager, thread_id=self.thread_id)
def safe_tool_check(tool_name: str) -> bool:
try: