File size: 13,792 Bytes
22087d0 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | from typing import List, Dict, Optional
import time
import asyncio
from core.utils.logger import logger
from core.tools.tool_registry import get_tool_info, get_tool_class
from .detector import ParameterDetector
from .config import JITConfig
from .result_types import (
ActivationResult, ActivationSuccess, ActivationError,
ActivationErrorType, BatchActivationResult
)
class JITLoader:
_instance = None
def __new__(cls):
if cls._instance is None:
cls._instance = super().__new__(cls)
logger.info("⚡ [JIT] Loader initialized")
return cls._instance
@staticmethod
def get_core_tools() -> List[str]:
return [
'expand_msg_tool',
'message_tool',
'task_list_tool',
'sb_shell_tool',
'sb_files_tool',
'sb_file_reader_tool',
'sb_spreadsheet_tool',
'web_search_tool',
'image_search_tool',
'sb_vision_tool',
'sb_image_edit_tool',
'browser_tool',
'sb_git_sync',
'sb_upload_file_tool',
'sb_expose_tool',
'sb_kb_tool', # Knowledge base operations
]
@staticmethod
async def activate_tool(
tool_name: str,
thread_manager,
project_id: Optional[str] = None,
jit_config: Optional[JITConfig] = None
) -> ActivationResult:
start_time = time.time()
if jit_config:
is_valid, error_msg = jit_config.validate_activation_request(tool_name)
if not is_valid:
logger.warning(f"⚠️ [JIT] Tool '{tool_name}' blocked: {error_msg}")
return ActivationError(
error_type=ActivationErrorType.BLOCKED_BY_CONFIG,
message=error_msg,
tool_name=tool_name
)
tool_info = get_tool_info(tool_name)
if not tool_info:
logger.error(f"⚡ [JIT] Tool '{tool_name}' not found in registry")
return ActivationError(
error_type=ActivationErrorType.TOOL_NOT_FOUND,
message=f"Tool '{tool_name}' not found in tool registry",
tool_name=tool_name
)
_, module_path, class_name = tool_info
try:
tool_class = get_tool_class(module_path, class_name)
logger.debug(f"⚡ [JIT] Loaded class {class_name} from {module_path}")
except ImportError as e:
logger.error(f"❌ [JIT] Import failed for '{tool_name}': {e}")
return ActivationError(
error_type=ActivationErrorType.IMPORT_ERROR,
message=str(e),
tool_name=tool_name,
details={'module': module_path, 'class': class_name}
)
try:
detector = ParameterDetector()
init_params = detector.detect_init_parameters(tool_class)
kwargs = detector.build_kwargs(init_params, thread_manager, project_id)
logger.info(f"⚡ [JIT] Activating '{tool_name}' with params: {list(kwargs.keys())}")
thread_manager.add_tool(tool_class, **kwargs)
thread_manager.tool_registry.invalidate_function_cache()
elapsed_ms = (time.time() - start_time) * 1000
logger.info(f"✅ [JIT] Tool '{tool_name}' activated successfully in {elapsed_ms:.1f}ms")
return ActivationSuccess(
tool_name=tool_name,
load_time_ms=elapsed_ms,
dependencies_loaded=[]
)
except Exception as e:
logger.error(f"❌ [JIT] Failed to activate tool '{tool_name}': {e}", exc_info=True)
return ActivationError(
error_type=ActivationErrorType.INIT_FAILED,
message=str(e),
tool_name=tool_name
)
@staticmethod
async def activate_multiple(
tool_names: List[str],
thread_manager,
project_id: Optional[str] = None,
jit_config: Optional[JITConfig] = None
) -> BatchActivationResult:
from .dependencies import get_dependency_resolver
start_time = time.time()
logger.info(f"⚡ [JIT] Activating {len(tool_names)} tools (with dependency resolution)")
resolver = get_dependency_resolver()
allowed_tools = jit_config.get_allowed_tools() if jit_config else None
resolution = resolver.resolve_loading_order(tool_names, allowed_tools)
sorted_tools = resolution['order']
dependencies = resolution['dependencies']
skipped = resolution['skipped']
if dependencies:
logger.info(f"⚡ [JIT DEP] Auto-loading {len(dependencies)} dependencies: {dependencies}")
if skipped:
logger.warning(f"⚠️ [JIT DEP] Skipped {len(skipped)} blocked dependencies: {skipped}")
logger.info(f"⚡ [JIT DEP] Loading order: {sorted_tools}")
successful = []
failed = []
for tool_name in sorted_tools:
result = await JITLoader.activate_tool(tool_name, thread_manager, project_id, jit_config)
if isinstance(result, ActivationSuccess):
successful.append(result)
else:
failed.append(result)
total_time = (time.time() - start_time) * 1000
batch_result = BatchActivationResult(
successful=successful,
failed=failed,
total_time_ms=total_time
)
logger.info(f"⚡ [JIT] {batch_result}")
return batch_result
@staticmethod
async def activate_tool_legacy(
tool_name: str,
thread_manager,
project_id: Optional[str] = None,
jit_config: Optional[JITConfig] = None
) -> bool:
result = await JITLoader.activate_tool(tool_name, thread_manager, project_id, jit_config)
return isinstance(result, ActivationSuccess)
@staticmethod
async def activate_mcp_tool(
tool_name: str,
thread_manager,
project_id: Optional[str] = None,
jit_config: Optional[JITConfig] = None
) -> ActivationResult:
start_time = time.time()
mcp_loader = getattr(thread_manager, 'mcp_loader', None)
if not mcp_loader:
logger.error(f"⚡ [JIT MCP] MCP loader not available for tool '{tool_name}'")
return ActivationError(
error_type=ActivationErrorType.TOOL_NOT_FOUND,
message="MCP loader not initialized in thread manager",
tool_name=tool_name
)
logger.debug(f"⚡ [JIT MCP] Activating MCP tool '{tool_name}'")
try:
result = await mcp_loader.activate_tool(tool_name)
if isinstance(result, ActivationSuccess):
tool_info = await mcp_loader.get_tool_info(tool_name)
schema = tool_info.schema if tool_info else None
if schema:
account_id = getattr(mcp_loader, 'agent_config', {}).get('account_id')
tool_wrapper = await JITLoader._create_mcp_tool_wrapper(tool_name, schema, tool_info, account_id=account_id)
from core.agentpress.tool import ToolSchema, SchemaType
openapi_schema = {
"type": "function",
"function": {
"name": schema.get("name", tool_name),
"description": schema.get("description", f"Execute {tool_name} tool"),
"parameters": schema.get("input_schema", {
"type": "object",
"properties": {},
"required": []
})
}
}
tool_schema = ToolSchema(
schema=openapi_schema,
schema_type=SchemaType.OPENAPI
)
thread_manager.tool_registry.tools[tool_name] = {
"instance": tool_wrapper,
"schema": tool_schema
}
thread_manager.tool_registry.invalidate_function_cache()
thread_manager.tool_registry.invalidate_schema_cache()
elapsed_ms = (time.time() - start_time) * 1000
logger.info(f"✅ [JIT MCP] Tool '{tool_name}' activated successfully in {elapsed_ms:.1f}ms")
return ActivationSuccess(
tool_name=tool_name,
load_time_ms=elapsed_ms,
dependencies_loaded=[]
)
else:
return result
except Exception as e:
logger.error(f"❌ [JIT MCP] Failed to activate tool '{tool_name}': {e}", exc_info=True)
return ActivationError(
error_type=ActivationErrorType.INIT_FAILED,
message=str(e),
tool_name=tool_name
)
@staticmethod
async def _create_mcp_tool_wrapper(tool_name: str, schema: Dict, tool_info, account_id: str = None):
from core.jit.mcp_tool_wrapper import MCPToolExecutor
class MCPToolWrapper:
def __init__(self, tool_name: str, schema: Dict, tool_info, account_id: str = None):
self.tool_name = tool_name
self.schema = schema
self.tool_info = tool_info
self._executor = MCPToolExecutor(tool_info.mcp_config, account_id=account_id)
def __getattr__(self, method_name: str):
"""Handle dynamic method calls for MCP tools (same pattern as legacy MCPToolWrapper)"""
if method_name == self.tool_name:
# Return a callable method for this tool
async def mcp_method(**kwargs):
return await self._executor.execute_tool(self.tool_name, kwargs)
return mcp_method
raise AttributeError(f"'MCPToolWrapper' object has no attribute '{method_name}'")
async def execute(self, **kwargs):
"""Execute the MCP tool with given parameters"""
return await self._executor.execute_tool(self.tool_name, kwargs)
def get_schema(self):
"""Return tool schema for registration"""
return self.schema
return MCPToolWrapper(tool_name, schema, tool_info, account_id=account_id)
@staticmethod
async def activate_multiple_with_mcp(
tool_names: List[str],
thread_manager,
project_id: Optional[str] = None,
jit_config: Optional[JITConfig] = None
) -> BatchActivationResult:
from .dependencies import get_dependency_resolver
start_time = time.time()
logger.info(f"⚡ [JIT] Activating {len(tool_names)} tools (regular + MCP with dependency resolution)")
mcp_loader = getattr(thread_manager, 'mcp_loader', None)
regular_tools = []
mcp_tools = []
for tool_name in tool_names:
if mcp_loader and await mcp_loader.is_tool_available(tool_name):
mcp_tools.append(tool_name)
else:
regular_tools.append(tool_name)
logger.info(f"⚡ [JIT] Split: {len(regular_tools)} regular tools, {len(mcp_tools)} MCP tools")
successful = []
failed = []
if regular_tools:
regular_result = await JITLoader.activate_multiple(
regular_tools, thread_manager, project_id, jit_config
)
successful.extend(regular_result.successful)
failed.extend(regular_result.failed)
if mcp_tools:
mcp_tasks = [
JITLoader.activate_mcp_tool(tool_name, thread_manager, project_id, jit_config)
for tool_name in mcp_tools
]
mcp_results = await asyncio.gather(*mcp_tasks, return_exceptions=True)
for tool_name, result in zip(mcp_tools, mcp_results):
if isinstance(result, Exception):
failed.append(ActivationError(
error_type=ActivationErrorType.INIT_FAILED,
message=str(result),
tool_name=tool_name
))
elif isinstance(result, ActivationSuccess):
successful.append(result)
else:
failed.append(result)
total_time = (time.time() - start_time) * 1000
batch_result = BatchActivationResult(
successful=successful,
failed=failed,
total_time_ms=total_time
)
logger.info(f"⚡ [JIT] {batch_result}")
return batch_result
@staticmethod
def get_activation_stats(thread_manager) -> Dict[str, any]:
registered_tools = list(thread_manager.tool_registry.tools.keys())
return {
'total_activated': len(registered_tools),
'activated_tools': registered_tools,
'core_tools': JITLoader.get_core_tools()
}
def get_jit_loader() -> JITLoader:
return JITLoader()
|