@micdrop/mistral 1.0.4 → 1.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.mts +2 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +17 -10
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +17 -10
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
package/dist/index.d.mts
CHANGED
|
@@ -7,10 +7,11 @@ interface MistralAgentOptions extends AgentOptions {
|
|
|
7
7
|
model?: string;
|
|
8
8
|
settings?: Omit<ChatCompletionStreamRequest, 'messages' | 'model'>;
|
|
9
9
|
maxRetry?: number;
|
|
10
|
+
maxSteps?: number;
|
|
10
11
|
}
|
|
11
12
|
declare class MistralAgent extends Agent<MistralAgentOptions> {
|
|
12
13
|
private mistral;
|
|
13
|
-
private
|
|
14
|
+
private counter;
|
|
14
15
|
private running;
|
|
15
16
|
constructor(options: MistralAgentOptions);
|
|
16
17
|
answer(): PassThrough;
|
package/dist/index.d.ts
CHANGED
|
@@ -7,10 +7,11 @@ interface MistralAgentOptions extends AgentOptions {
|
|
|
7
7
|
model?: string;
|
|
8
8
|
settings?: Omit<ChatCompletionStreamRequest, 'messages' | 'model'>;
|
|
9
9
|
maxRetry?: number;
|
|
10
|
+
maxSteps?: number;
|
|
10
11
|
}
|
|
11
12
|
declare class MistralAgent extends Agent<MistralAgentOptions> {
|
|
12
13
|
private mistral;
|
|
13
|
-
private
|
|
14
|
+
private counter;
|
|
14
15
|
private running;
|
|
15
16
|
constructor(options: MistralAgentOptions);
|
|
16
17
|
answer(): PassThrough;
|
package/dist/index.js
CHANGED
|
@@ -39,25 +39,31 @@ var import_server = require("@micdrop/server");
|
|
|
39
39
|
var import_mistralai = require("@mistralai/mistralai");
|
|
40
40
|
var import_stream = require("stream");
|
|
41
41
|
var import_zod_v4 = __toESM(require("zod-v4"));
|
|
42
|
-
var DEFAULT_MODEL = "
|
|
42
|
+
var DEFAULT_MODEL = "mistral-large-latest";
|
|
43
43
|
var DEFAULT_MAX_RETRY = 3;
|
|
44
|
+
var DEFAULT_MAX_STEPS = 5;
|
|
45
|
+
var DEFAULT_RETRY_DELAY = 500;
|
|
44
46
|
var MistralAgent = class extends import_server.Agent {
|
|
45
47
|
constructor(options) {
|
|
46
48
|
super(options);
|
|
47
|
-
this.
|
|
49
|
+
this.counter = 0;
|
|
48
50
|
this.running = false;
|
|
49
51
|
this.mistral = new import_mistralai.Mistral({ apiKey: options.apiKey });
|
|
50
52
|
}
|
|
51
53
|
answer() {
|
|
52
54
|
this.log("Start answering");
|
|
53
|
-
this.
|
|
55
|
+
this.counter++;
|
|
54
56
|
const stream = new import_stream.PassThrough();
|
|
55
57
|
this.generateAnswer(stream);
|
|
56
58
|
return stream;
|
|
57
59
|
}
|
|
58
|
-
async generateAnswer(stream,
|
|
60
|
+
async generateAnswer(stream, stepCount = 0, tryCount = 0) {
|
|
61
|
+
if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {
|
|
62
|
+
console.error("[MistralAgent] Max steps reached");
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
const counter = this.counter;
|
|
59
66
|
this.running = true;
|
|
60
|
-
this.cancelled = false;
|
|
61
67
|
if (this.conversation.length === 1) {
|
|
62
68
|
this.conversation.push({
|
|
63
69
|
role: "user",
|
|
@@ -67,7 +73,6 @@ var MistralAgent = class extends import_server.Agent {
|
|
|
67
73
|
let extracting = false;
|
|
68
74
|
const extractOptions = this.getExtractOptions();
|
|
69
75
|
try {
|
|
70
|
-
console.log("buildMessages", this.buildMessages());
|
|
71
76
|
const result = await this.mistral.chat.stream({
|
|
72
77
|
model: this.options.model || DEFAULT_MODEL,
|
|
73
78
|
messages: this.buildMessages(),
|
|
@@ -77,7 +82,7 @@ var MistralAgent = class extends import_server.Agent {
|
|
|
77
82
|
let fullAnswer = "";
|
|
78
83
|
let skipAnswer = false;
|
|
79
84
|
for await (const event of result) {
|
|
80
|
-
if (this.
|
|
85
|
+
if (counter !== this.counter) return;
|
|
81
86
|
const delta = event.data.choices[0]?.delta;
|
|
82
87
|
const chunk = delta?.content;
|
|
83
88
|
const toolCalls = delta?.toolCalls;
|
|
@@ -113,6 +118,7 @@ var MistralAgent = class extends import_server.Agent {
|
|
|
113
118
|
}
|
|
114
119
|
}
|
|
115
120
|
}
|
|
121
|
+
if (counter !== this.counter) return;
|
|
116
122
|
if (fullAnswer) {
|
|
117
123
|
const { message, metadata } = this.extract(fullAnswer);
|
|
118
124
|
this.addAssistantMessage(message, metadata);
|
|
@@ -122,12 +128,13 @@ var MistralAgent = class extends import_server.Agent {
|
|
|
122
128
|
content: " "
|
|
123
129
|
});
|
|
124
130
|
} else {
|
|
125
|
-
await this.generateAnswer(stream,
|
|
131
|
+
await this.generateAnswer(stream, stepCount + 1);
|
|
126
132
|
}
|
|
127
133
|
} catch (error) {
|
|
128
134
|
console.error("[MistralAgent] Error:", error);
|
|
129
135
|
if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRY)) {
|
|
130
|
-
await
|
|
136
|
+
await new Promise((resolve) => setTimeout(resolve, DEFAULT_RETRY_DELAY));
|
|
137
|
+
await this.generateAnswer(stream, stepCount, tryCount + 1);
|
|
131
138
|
}
|
|
132
139
|
} finally {
|
|
133
140
|
if (stream.writable) {
|
|
@@ -192,8 +199,8 @@ var MistralAgent = class extends import_server.Agent {
|
|
|
192
199
|
cancel() {
|
|
193
200
|
if (!this.running) return;
|
|
194
201
|
this.log("Cancel");
|
|
195
|
-
this.cancelled = true;
|
|
196
202
|
this.running = false;
|
|
203
|
+
this.counter++;
|
|
197
204
|
}
|
|
198
205
|
};
|
|
199
206
|
// Annotate the CommonJS export names for ESM import in node:
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts","../src/MistralAgent.ts"],"sourcesContent":["export * from './MistralAgent'\n","import { Agent, AgentOptions } from '@micdrop/server'\nimport { Mistral } from '@mistralai/mistralai'\nimport {\n ChatCompletionStreamRequest,\n ChatCompletionStreamRequestMessages,\n} from '@mistralai/mistralai/models/components'\nimport { PassThrough, Writable } from 'stream'\nimport z, { toJSONSchema } from 'zod-v4'\n\nexport interface MistralAgentOptions extends AgentOptions {\n apiKey: string\n model?: string\n settings?: Omit<ChatCompletionStreamRequest, 'messages' | 'model'>\n maxRetry?: number\n}\n\nconst DEFAULT_MODEL = '
|
|
1
|
+
{"version":3,"sources":["../src/index.ts","../src/MistralAgent.ts"],"sourcesContent":["export * from './MistralAgent'\n","import { Agent, AgentOptions } from '@micdrop/server'\nimport { Mistral } from '@mistralai/mistralai'\nimport {\n ChatCompletionStreamRequest,\n ChatCompletionStreamRequestMessages,\n} from '@mistralai/mistralai/models/components'\nimport { PassThrough, Writable } from 'stream'\nimport z, { toJSONSchema } from 'zod-v4'\n\nexport interface MistralAgentOptions extends AgentOptions {\n apiKey: string\n model?: string\n settings?: Omit<ChatCompletionStreamRequest, 'messages' | 'model'>\n maxRetry?: number\n maxSteps?: number\n}\n\nconst DEFAULT_MODEL = 'mistral-large-latest'\nconst DEFAULT_MAX_RETRY = 3\nconst DEFAULT_MAX_STEPS = 5\nconst DEFAULT_RETRY_DELAY = 500\n\nexport class MistralAgent extends Agent<MistralAgentOptions> {\n private mistral: Mistral\n private counter = 0\n private running: boolean = false\n\n constructor(options: MistralAgentOptions) {\n super(options)\n this.mistral = new Mistral({ apiKey: options.apiKey })\n }\n\n answer() {\n this.log('Start answering')\n this.counter++\n const stream = new PassThrough()\n this.generateAnswer(stream)\n return stream\n }\n\n private async generateAnswer(stream: Writable, stepCount = 0, tryCount = 0) {\n if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {\n console.error('[MistralAgent] Max steps reached')\n return\n }\n\n const counter = this.counter\n this.running = true\n\n // Hack: Mistral needs a user message if there is only a system message\n if (this.conversation.length === 1) {\n this.conversation.push({\n role: 'user',\n content: '',\n })\n }\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n const result = await this.mistral.chat.stream({\n model: this.options.model || DEFAULT_MODEL,\n messages: this.buildMessages(),\n tools: this.buildTools(),\n ...this.options.settings,\n })\n let fullAnswer = ''\n let skipAnswer = false\n\n // Handle response events\n for await (const event of result) {\n if (counter !== this.counter) return\n const delta = event.data.choices[0]?.delta\n const chunk = delta?.content\n const toolCalls = delta?.toolCalls\n\n // Text chunk\n if (typeof chunk === 'string') {\n if (chunk === '') continue\n this.log(`Answer chunk: \"${chunk}\"`)\n fullAnswer += chunk\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = fullAnswer.indexOf(extractOptions.startTag)\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = fullAnswer.slice(0, startTagIndex).trimEnd()\n stream.write(messagePart)\n continue\n }\n } else {\n // Extracting, don't write to stream\n continue\n }\n }\n stream.write(chunk)\n } else if (toolCalls?.length) {\n for (const toolCall of toolCalls) {\n const result = await this.executeTool({\n role: 'tool_call',\n toolCallId: toolCall.id || '',\n toolName: toolCall.function.name,\n parameters: toolCall.function.arguments as string,\n })\n if (result.skipAnswer) {\n skipAnswer = true\n }\n }\n }\n }\n\n if (counter !== this.counter) return\n\n if (fullAnswer) {\n // Add full answer to conversation\n const { message, metadata } = this.extract(fullAnswer)\n this.addAssistantMessage(message, metadata)\n } else if (skipAnswer) {\n // Hack: Mistral needs an assistant message after tool calls\n this.conversation.push({\n role: 'assistant',\n content: ' ',\n })\n } else {\n // Query again in case of tool call\n await this.generateAnswer(stream, stepCount + 1)\n }\n } catch (error: any) {\n console.error('[MistralAgent] Error:', error)\n if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRY)) {\n await new Promise((resolve) => setTimeout(resolve, DEFAULT_RETRY_DELAY))\n await this.generateAnswer(stream, stepCount, tryCount + 1)\n }\n } finally {\n if (stream.writable) {\n stream.end()\n }\n this.running = false\n }\n }\n\n private buildMessages(): ChatCompletionStreamRequestMessages[] {\n return this.conversation.map(\n (message): ChatCompletionStreamRequestMessages => {\n switch (message.role) {\n case 'user':\n case 'assistant':\n case 'system':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n role: 'assistant',\n toolCalls: [\n {\n type: 'function',\n id: message.toolCallId,\n function: {\n name: message.toolName,\n arguments: JSON.stringify(message.parameters),\n },\n },\n ],\n }\n case 'tool_result':\n return {\n role: 'tool',\n toolCallId: message.toolCallId,\n name: message.toolName,\n content: [\n {\n type: 'text',\n text: message.output,\n },\n ],\n }\n }\n }\n )\n }\n\n private buildTools(): ChatCompletionStreamRequest['tools'] {\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return undefined\n\n return this.tools.map((tool) => ({\n type: 'function',\n function: {\n name: tool.name,\n description: tool.description,\n parameters: toJSONSchema(tool.inputSchema || z.object()),\n },\n }))\n }\n\n cancel() {\n if (!this.running) return\n this.log('Cancel')\n this.running = false\n\n // Increment counter to avoid processing messages from previous calls\n this.counter++\n }\n}\n"],"mappings":"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","names":["result","z"]}
|
package/dist/index.mjs
CHANGED
|
@@ -3,25 +3,31 @@ import { Agent } from "@micdrop/server";
|
|
|
3
3
|
import { Mistral } from "@mistralai/mistralai";
|
|
4
4
|
import { PassThrough } from "stream";
|
|
5
5
|
import z, { toJSONSchema } from "zod-v4";
|
|
6
|
-
var DEFAULT_MODEL = "
|
|
6
|
+
var DEFAULT_MODEL = "mistral-large-latest";
|
|
7
7
|
var DEFAULT_MAX_RETRY = 3;
|
|
8
|
+
var DEFAULT_MAX_STEPS = 5;
|
|
9
|
+
var DEFAULT_RETRY_DELAY = 500;
|
|
8
10
|
var MistralAgent = class extends Agent {
|
|
9
11
|
constructor(options) {
|
|
10
12
|
super(options);
|
|
11
|
-
this.
|
|
13
|
+
this.counter = 0;
|
|
12
14
|
this.running = false;
|
|
13
15
|
this.mistral = new Mistral({ apiKey: options.apiKey });
|
|
14
16
|
}
|
|
15
17
|
answer() {
|
|
16
18
|
this.log("Start answering");
|
|
17
|
-
this.
|
|
19
|
+
this.counter++;
|
|
18
20
|
const stream = new PassThrough();
|
|
19
21
|
this.generateAnswer(stream);
|
|
20
22
|
return stream;
|
|
21
23
|
}
|
|
22
|
-
async generateAnswer(stream,
|
|
24
|
+
async generateAnswer(stream, stepCount = 0, tryCount = 0) {
|
|
25
|
+
if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {
|
|
26
|
+
console.error("[MistralAgent] Max steps reached");
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const counter = this.counter;
|
|
23
30
|
this.running = true;
|
|
24
|
-
this.cancelled = false;
|
|
25
31
|
if (this.conversation.length === 1) {
|
|
26
32
|
this.conversation.push({
|
|
27
33
|
role: "user",
|
|
@@ -31,7 +37,6 @@ var MistralAgent = class extends Agent {
|
|
|
31
37
|
let extracting = false;
|
|
32
38
|
const extractOptions = this.getExtractOptions();
|
|
33
39
|
try {
|
|
34
|
-
console.log("buildMessages", this.buildMessages());
|
|
35
40
|
const result = await this.mistral.chat.stream({
|
|
36
41
|
model: this.options.model || DEFAULT_MODEL,
|
|
37
42
|
messages: this.buildMessages(),
|
|
@@ -41,7 +46,7 @@ var MistralAgent = class extends Agent {
|
|
|
41
46
|
let fullAnswer = "";
|
|
42
47
|
let skipAnswer = false;
|
|
43
48
|
for await (const event of result) {
|
|
44
|
-
if (this.
|
|
49
|
+
if (counter !== this.counter) return;
|
|
45
50
|
const delta = event.data.choices[0]?.delta;
|
|
46
51
|
const chunk = delta?.content;
|
|
47
52
|
const toolCalls = delta?.toolCalls;
|
|
@@ -77,6 +82,7 @@ var MistralAgent = class extends Agent {
|
|
|
77
82
|
}
|
|
78
83
|
}
|
|
79
84
|
}
|
|
85
|
+
if (counter !== this.counter) return;
|
|
80
86
|
if (fullAnswer) {
|
|
81
87
|
const { message, metadata } = this.extract(fullAnswer);
|
|
82
88
|
this.addAssistantMessage(message, metadata);
|
|
@@ -86,12 +92,13 @@ var MistralAgent = class extends Agent {
|
|
|
86
92
|
content: " "
|
|
87
93
|
});
|
|
88
94
|
} else {
|
|
89
|
-
await this.generateAnswer(stream,
|
|
95
|
+
await this.generateAnswer(stream, stepCount + 1);
|
|
90
96
|
}
|
|
91
97
|
} catch (error) {
|
|
92
98
|
console.error("[MistralAgent] Error:", error);
|
|
93
99
|
if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRY)) {
|
|
94
|
-
await
|
|
100
|
+
await new Promise((resolve) => setTimeout(resolve, DEFAULT_RETRY_DELAY));
|
|
101
|
+
await this.generateAnswer(stream, stepCount, tryCount + 1);
|
|
95
102
|
}
|
|
96
103
|
} finally {
|
|
97
104
|
if (stream.writable) {
|
|
@@ -156,8 +163,8 @@ var MistralAgent = class extends Agent {
|
|
|
156
163
|
cancel() {
|
|
157
164
|
if (!this.running) return;
|
|
158
165
|
this.log("Cancel");
|
|
159
|
-
this.cancelled = true;
|
|
160
166
|
this.running = false;
|
|
167
|
+
this.counter++;
|
|
161
168
|
}
|
|
162
169
|
};
|
|
163
170
|
export {
|
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/MistralAgent.ts"],"sourcesContent":["import { Agent, AgentOptions } from '@micdrop/server'\nimport { Mistral } from '@mistralai/mistralai'\nimport {\n ChatCompletionStreamRequest,\n ChatCompletionStreamRequestMessages,\n} from '@mistralai/mistralai/models/components'\nimport { PassThrough, Writable } from 'stream'\nimport z, { toJSONSchema } from 'zod-v4'\n\nexport interface MistralAgentOptions extends AgentOptions {\n apiKey: string\n model?: string\n settings?: Omit<ChatCompletionStreamRequest, 'messages' | 'model'>\n maxRetry?: number\n}\n\nconst DEFAULT_MODEL = '
|
|
1
|
+
{"version":3,"sources":["../src/MistralAgent.ts"],"sourcesContent":["import { Agent, AgentOptions } from '@micdrop/server'\nimport { Mistral } from '@mistralai/mistralai'\nimport {\n ChatCompletionStreamRequest,\n ChatCompletionStreamRequestMessages,\n} from '@mistralai/mistralai/models/components'\nimport { PassThrough, Writable } from 'stream'\nimport z, { toJSONSchema } from 'zod-v4'\n\nexport interface MistralAgentOptions extends AgentOptions {\n apiKey: string\n model?: string\n settings?: Omit<ChatCompletionStreamRequest, 'messages' | 'model'>\n maxRetry?: number\n maxSteps?: number\n}\n\nconst DEFAULT_MODEL = 'mistral-large-latest'\nconst DEFAULT_MAX_RETRY = 3\nconst DEFAULT_MAX_STEPS = 5\nconst DEFAULT_RETRY_DELAY = 500\n\nexport class MistralAgent extends Agent<MistralAgentOptions> {\n private mistral: Mistral\n private counter = 0\n private running: boolean = false\n\n constructor(options: MistralAgentOptions) {\n super(options)\n this.mistral = new Mistral({ apiKey: options.apiKey })\n }\n\n answer() {\n this.log('Start answering')\n this.counter++\n const stream = new PassThrough()\n this.generateAnswer(stream)\n return stream\n }\n\n private async generateAnswer(stream: Writable, stepCount = 0, tryCount = 0) {\n if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {\n console.error('[MistralAgent] Max steps reached')\n return\n }\n\n const counter = this.counter\n this.running = true\n\n // Hack: Mistral needs a user message if there is only a system message\n if (this.conversation.length === 1) {\n this.conversation.push({\n role: 'user',\n content: '',\n })\n }\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n const result = await this.mistral.chat.stream({\n model: this.options.model || DEFAULT_MODEL,\n messages: this.buildMessages(),\n tools: this.buildTools(),\n ...this.options.settings,\n })\n let fullAnswer = ''\n let skipAnswer = false\n\n // Handle response events\n for await (const event of result) {\n if (counter !== this.counter) return\n const delta = event.data.choices[0]?.delta\n const chunk = delta?.content\n const toolCalls = delta?.toolCalls\n\n // Text chunk\n if (typeof chunk === 'string') {\n if (chunk === '') continue\n this.log(`Answer chunk: \"${chunk}\"`)\n fullAnswer += chunk\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = fullAnswer.indexOf(extractOptions.startTag)\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = fullAnswer.slice(0, startTagIndex).trimEnd()\n stream.write(messagePart)\n continue\n }\n } else {\n // Extracting, don't write to stream\n continue\n }\n }\n stream.write(chunk)\n } else if (toolCalls?.length) {\n for (const toolCall of toolCalls) {\n const result = await this.executeTool({\n role: 'tool_call',\n toolCallId: toolCall.id || '',\n toolName: toolCall.function.name,\n parameters: toolCall.function.arguments as string,\n })\n if (result.skipAnswer) {\n skipAnswer = true\n }\n }\n }\n }\n\n if (counter !== this.counter) return\n\n if (fullAnswer) {\n // Add full answer to conversation\n const { message, metadata } = this.extract(fullAnswer)\n this.addAssistantMessage(message, metadata)\n } else if (skipAnswer) {\n // Hack: Mistral needs an assistant message after tool calls\n this.conversation.push({\n role: 'assistant',\n content: ' ',\n })\n } else {\n // Query again in case of tool call\n await this.generateAnswer(stream, stepCount + 1)\n }\n } catch (error: any) {\n console.error('[MistralAgent] Error:', error)\n if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRY)) {\n await new Promise((resolve) => setTimeout(resolve, DEFAULT_RETRY_DELAY))\n await this.generateAnswer(stream, stepCount, tryCount + 1)\n }\n } finally {\n if (stream.writable) {\n stream.end()\n }\n this.running = false\n }\n }\n\n private buildMessages(): ChatCompletionStreamRequestMessages[] {\n return this.conversation.map(\n (message): ChatCompletionStreamRequestMessages => {\n switch (message.role) {\n case 'user':\n case 'assistant':\n case 'system':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n role: 'assistant',\n toolCalls: [\n {\n type: 'function',\n id: message.toolCallId,\n function: {\n name: message.toolName,\n arguments: JSON.stringify(message.parameters),\n },\n },\n ],\n }\n case 'tool_result':\n return {\n role: 'tool',\n toolCallId: message.toolCallId,\n name: message.toolName,\n content: [\n {\n type: 'text',\n text: message.output,\n },\n ],\n }\n }\n }\n )\n }\n\n private buildTools(): ChatCompletionStreamRequest['tools'] {\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return undefined\n\n return this.tools.map((tool) => ({\n type: 'function',\n function: {\n name: tool.name,\n description: tool.description,\n parameters: toJSONSchema(tool.inputSchema || z.object()),\n },\n }))\n }\n\n cancel() {\n if (!this.running) return\n this.log('Cancel')\n this.running = false\n\n // Increment counter to avoid processing messages from previous calls\n this.counter++\n }\n}\n"],"mappings":"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","names":["result"]}
|