Add resilient error handling for Composio tool execution
Tool execution now returns actionable error messages when a connected account is missing, directing the admin to set up the connection. Tool loading is resilient to API failures, falling back to cached tools if available instead of crashing the agent run.
This commit is contained in:
1 parent
e83f379143
commit
81aae82211
1 file changed
+25
-13
@@ -48,11 +48,15 @@ export async function loadComposioTools(db: DatabaseSync, orgId: string): Promis
|
|||||||
if (cached && cached.toolkitsKey === toolkitsKey && Date.now() - cached.fetchedAt < CACHE_TTL_MS) {
|
if (cached && cached.toolkitsKey === toolkitsKey && Date.now() - cached.fetchedAt < CACHE_TTL_MS) {
|
||||||
return cached.tools;
|
return cached.tools;
|
||||||
}
|
}
|
||||||
const client = new ComposioClient(apiKey);
|
try {
|
||||||
const schemas = await client.getTools(toolkits);
|
const client = new ComposioClient(apiKey);
|
||||||
const tools = schemas.map(composioSchemaToToolDefinition);
|
const schemas = await client.getTools(toolkits);
|
||||||
toolCache.set(orgId, { tools, fetchedAt: Date.now(), toolkitsKey });
|
const tools = schemas.map(composioSchemaToToolDefinition);
|
||||||
return tools;
|
toolCache.set(orgId, { tools, fetchedAt: Date.now(), toolkitsKey });
|
||||||
|
return tools;
|
||||||
|
} catch {
|
||||||
|
return cached?.tools ?? [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function executeComposioTool(
|
export async function executeComposioTool(
|
||||||
@@ -61,17 +65,25 @@ export async function executeComposioTool(
|
|||||||
call: ToolCall,
|
call: ToolCall,
|
||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
const apiKey = getComposioApiKey(db, orgId);
|
const apiKey = getComposioApiKey(db, orgId);
|
||||||
if (!apiKey) return "ERROR: Composio API key is not configured.";
|
if (!apiKey) return "ERROR: Composio API key is not configured. Ask the admin to set it in Settings > Tools.";
|
||||||
const toolName = originalToolName(call.name);
|
const toolName = originalToolName(call.name);
|
||||||
const entityId = getComposioEntityId(db, orgId);
|
const entityId = getComposioEntityId(db, orgId);
|
||||||
const client = new ComposioClient(apiKey);
|
const client = new ComposioClient(apiKey);
|
||||||
const result = await client.executeTool({
|
try {
|
||||||
toolName,
|
const result = await client.executeTool({
|
||||||
arguments: call.arguments,
|
toolName,
|
||||||
entityId,
|
arguments: call.arguments,
|
||||||
});
|
entityId,
|
||||||
if (result.error) return `ERROR: ${result.error}`;
|
});
|
||||||
return JSON.stringify(result.data);
|
if (result.error) return `ERROR: ${result.error}`;
|
||||||
|
return JSON.stringify(result.data);
|
||||||
|
} catch (error) {
|
||||||
|
const message = error instanceof Error ? error.message : String(error);
|
||||||
|
if (message.includes("ConnectedAccount") || message.includes("connected account") || message.includes("entity_id")) {
|
||||||
|
return `ERROR: No connected account for this tool. The admin needs to connect the service at https://app.composio.dev before agents can use it.`;
|
||||||
|
}
|
||||||
|
return `ERROR: ${message}`;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getComposioApiKey(db: DatabaseSync, orgId: string): string | null {
|
function getComposioApiKey(db: DatabaseSync, orgId: string): string | null {
|
||||||
|
|||||||
Reference in new issue
Block a user