Skip to content

feat: configurable retries and timeouts for callTool #5

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.

Sign up for GitHub

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
joeymeere wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: configurable retries and timeouts for callTool #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 49 additions & 15 deletions packages/daemon/src/daemon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export class Daemon implements IDaemon {
) {
this.modelApiKeys = {
generationKey: opts.modelApiKeys.generationKey,
}
};

this.keypair = opts.privateKey;

Expand Down Expand Up @@ -243,21 +243,38 @@ export class Daemon implements IDaemon {
private async callTool(
toolName: string,
toolURL: string,
args: any
args: any,
opts?: { timeout?: number; retries?: number }
): Promise<any> {
const client = this.mcpClients[toolURL].client;

const result = (
await client.callTool({
name: toolName,
arguments: args,
})
).content as TextContent[];
let retryCount = 0;
try {
const client = this.mcpClients[toolURL].client;

if (result[0].text.includes("Error")) {
throw new Error(result[0].text);
} else {
return JSON.parse(result[0].text);
const result = (
await client.callTool(
{
name: toolName,
arguments: args,
},
undefined,
{ timeout: opts?.timeout ?? 15000 }
)
).content as TextContent[];

if (result[0].text.includes("Error")) {
return result[0].text;
} else {
return JSON.parse(result[0].text);
}
} catch (e) {
if (opts?.retries && opts.retries > 0) {
retryCount++;
return this.callTool(toolName, toolURL, args, {
...opts,
retries: opts.retries - retryCount,
});
}
console.error("Failed to call tool: " + `[${toolName}:${toolURL}]`);
}
}

Expand All @@ -272,6 +289,10 @@ export class Daemon implements IDaemon {
[key: string]: any; // key = `serverUrl-toolName`
};
modelOverride?: ModelSettings;
// Set a timeout for each tool call (in milliseconds)
timeout?: number;
// Set a number of retries for each tool call
retries?: number;
}
): Promise<IMessageLifecycle> {
if (!this.keypair) {
Expand Down Expand Up @@ -323,6 +344,10 @@ export class Daemon implements IDaemon {
this.callTool(tool.tool.name, tool.serverUrl, {
lifecycle,
args: toolArgs,
opts: {
timeout: opts?.timeout ?? 15000,
retries: opts?.retries ?? 3,
},
})
);
}
Expand All @@ -340,7 +365,8 @@ export class Daemon implements IDaemon {
.flat();
}

const modelSettings = opts?.modelOverride ?? this.character.modelSettings.generation;
const modelSettings =
opts?.modelOverride ?? this.character.modelSettings.generation;
if (!modelSettings.apiKey) {
modelSettings.apiKey = this.modelApiKeys.generationKey;
}
Expand All @@ -362,6 +388,10 @@ export class Daemon implements IDaemon {
this.callTool(tool.tool.name, tool.serverUrl, {
lifecycle,
args: toolArgs,
opts: {
timeout: opts?.timeout ?? 15000,
retries: opts?.retries ?? 3,
},
})
);
}
Expand Down Expand Up @@ -400,6 +430,10 @@ export class Daemon implements IDaemon {
this.callTool(tool.tool.name, tool.serverUrl, {
lifecycle,
args: toolArgs,
opts: {
timeout: opts?.timeout ?? 15000,
retries: opts?.retries ?? 3,
},
})
);
}
Expand Down