@micdrop/mistral 1.0.2 → 1.0.3
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 +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +110 -9
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +100 -9
- package/dist/index.mjs.map +1 -1
- package/package.json +6 -3
package/dist/index.d.mts
CHANGED
|
@@ -6,6 +6,7 @@ interface MistralAgentOptions extends AgentOptions {
|
|
|
6
6
|
apiKey: string;
|
|
7
7
|
model?: string;
|
|
8
8
|
settings?: Omit<ChatCompletionStreamRequest, 'messages' | 'model'>;
|
|
9
|
+
maxRetry?: number;
|
|
9
10
|
}
|
|
10
11
|
declare class MistralAgent extends Agent<MistralAgentOptions> {
|
|
11
12
|
private mistral;
|
|
@@ -14,6 +15,8 @@ declare class MistralAgent extends Agent<MistralAgentOptions> {
|
|
|
14
15
|
constructor(options: MistralAgentOptions);
|
|
15
16
|
answer(): PassThrough;
|
|
16
17
|
private generateAnswer;
|
|
18
|
+
private buildMessages;
|
|
19
|
+
private buildTools;
|
|
17
20
|
cancel(): void;
|
|
18
21
|
}
|
|
19
22
|
|
package/dist/index.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ interface MistralAgentOptions extends AgentOptions {
|
|
|
6
6
|
apiKey: string;
|
|
7
7
|
model?: string;
|
|
8
8
|
settings?: Omit<ChatCompletionStreamRequest, 'messages' | 'model'>;
|
|
9
|
+
maxRetry?: number;
|
|
9
10
|
}
|
|
10
11
|
declare class MistralAgent extends Agent<MistralAgentOptions> {
|
|
11
12
|
private mistral;
|
|
@@ -14,6 +15,8 @@ declare class MistralAgent extends Agent<MistralAgentOptions> {
|
|
|
14
15
|
constructor(options: MistralAgentOptions);
|
|
15
16
|
answer(): PassThrough;
|
|
16
17
|
private generateAnswer;
|
|
18
|
+
private buildMessages;
|
|
19
|
+
private buildTools;
|
|
17
20
|
cancel(): void;
|
|
18
21
|
}
|
|
19
22
|
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __create = Object.create;
|
|
2
3
|
var __defProp = Object.defineProperty;
|
|
3
4
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
5
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
5
7
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
8
|
var __export = (target, all) => {
|
|
7
9
|
for (var name in all)
|
|
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
15
17
|
}
|
|
16
18
|
return to;
|
|
17
19
|
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
18
28
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
29
|
|
|
20
30
|
// src/index.ts
|
|
@@ -28,7 +38,9 @@ module.exports = __toCommonJS(index_exports);
|
|
|
28
38
|
var import_server = require("@micdrop/server");
|
|
29
39
|
var import_mistralai = require("@mistralai/mistralai");
|
|
30
40
|
var import_stream = require("stream");
|
|
41
|
+
var import_zod_v4 = __toESM(require("zod-v4"));
|
|
31
42
|
var DEFAULT_MODEL = "ministral-8b-latest";
|
|
43
|
+
var DEFAULT_MAX_RETRY = 3;
|
|
32
44
|
var MistralAgent = class extends import_server.Agent {
|
|
33
45
|
constructor(options) {
|
|
34
46
|
super(options);
|
|
@@ -43,7 +55,7 @@ var MistralAgent = class extends import_server.Agent {
|
|
|
43
55
|
this.generateAnswer(stream);
|
|
44
56
|
return stream;
|
|
45
57
|
}
|
|
46
|
-
async generateAnswer(stream) {
|
|
58
|
+
async generateAnswer(stream, callCount = 0, tryCount = 0) {
|
|
47
59
|
this.running = true;
|
|
48
60
|
this.cancelled = false;
|
|
49
61
|
if (this.conversation.length === 1) {
|
|
@@ -52,29 +64,65 @@ var MistralAgent = class extends import_server.Agent {
|
|
|
52
64
|
content: ""
|
|
53
65
|
});
|
|
54
66
|
}
|
|
67
|
+
let extracting = false;
|
|
68
|
+
const extractOptions = this.getExtractOptions();
|
|
55
69
|
try {
|
|
56
70
|
const result = await this.mistral.chat.stream({
|
|
57
71
|
model: this.options.model || DEFAULT_MODEL,
|
|
58
|
-
messages: this.
|
|
59
|
-
|
|
60
|
-
content: message.content
|
|
61
|
-
})),
|
|
72
|
+
messages: this.buildMessages(),
|
|
73
|
+
tools: this.buildTools(),
|
|
62
74
|
...this.options.settings
|
|
63
75
|
});
|
|
64
76
|
let fullAnswer = "";
|
|
77
|
+
let skipAnswer = false;
|
|
65
78
|
for await (const event of result) {
|
|
66
79
|
if (this.cancelled) return;
|
|
67
|
-
const
|
|
80
|
+
const delta = event.data.choices[0]?.delta;
|
|
81
|
+
const chunk = delta?.content;
|
|
82
|
+
const toolCalls = delta?.toolCalls;
|
|
68
83
|
if (typeof chunk === "string") {
|
|
84
|
+
if (chunk === "") continue;
|
|
69
85
|
this.log(`Answer chunk: "${chunk}"`);
|
|
70
|
-
stream.write(chunk);
|
|
71
86
|
fullAnswer += chunk;
|
|
87
|
+
if (extractOptions) {
|
|
88
|
+
if (!extracting) {
|
|
89
|
+
const startTagIndex = fullAnswer.indexOf(extractOptions.startTag);
|
|
90
|
+
if (startTagIndex !== -1) {
|
|
91
|
+
extracting = true;
|
|
92
|
+
const messagePart = fullAnswer.slice(0, startTagIndex).trimEnd();
|
|
93
|
+
stream.write(messagePart);
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
} else {
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
stream.write(chunk);
|
|
101
|
+
} else if (toolCalls?.length) {
|
|
102
|
+
for (const toolCall of toolCalls) {
|
|
103
|
+
const result2 = await this.executeTool({
|
|
104
|
+
role: "tool_call",
|
|
105
|
+
toolCallId: toolCall.id || "",
|
|
106
|
+
toolName: toolCall.function.name,
|
|
107
|
+
parameters: toolCall.function.arguments
|
|
108
|
+
});
|
|
109
|
+
if (result2.skipAnswer) {
|
|
110
|
+
skipAnswer = true;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
72
113
|
}
|
|
73
114
|
}
|
|
74
|
-
|
|
115
|
+
if (fullAnswer) {
|
|
116
|
+
const { message, metadata } = this.extract(fullAnswer);
|
|
117
|
+
this.addAssistantMessage(message, metadata);
|
|
118
|
+
} else if (!skipAnswer) {
|
|
119
|
+
await this.generateAnswer(stream, callCount + 1);
|
|
120
|
+
}
|
|
75
121
|
} catch (error) {
|
|
76
122
|
console.error("[MistralAgent] Error:", error);
|
|
77
|
-
|
|
123
|
+
if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRY)) {
|
|
124
|
+
await this.generateAnswer(stream, callCount, tryCount + 1);
|
|
125
|
+
}
|
|
78
126
|
} finally {
|
|
79
127
|
if (stream.writable) {
|
|
80
128
|
stream.end();
|
|
@@ -82,6 +130,59 @@ var MistralAgent = class extends import_server.Agent {
|
|
|
82
130
|
this.running = false;
|
|
83
131
|
}
|
|
84
132
|
}
|
|
133
|
+
buildMessages() {
|
|
134
|
+
return this.conversation.map(
|
|
135
|
+
(message) => {
|
|
136
|
+
switch (message.role) {
|
|
137
|
+
case "user":
|
|
138
|
+
case "assistant":
|
|
139
|
+
case "system":
|
|
140
|
+
return {
|
|
141
|
+
role: message.role,
|
|
142
|
+
content: message.content
|
|
143
|
+
};
|
|
144
|
+
case "tool_call":
|
|
145
|
+
return {
|
|
146
|
+
role: "assistant",
|
|
147
|
+
toolCalls: [
|
|
148
|
+
{
|
|
149
|
+
type: "function",
|
|
150
|
+
id: message.toolCallId,
|
|
151
|
+
function: {
|
|
152
|
+
name: message.toolName,
|
|
153
|
+
arguments: JSON.stringify(message.parameters)
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
]
|
|
157
|
+
};
|
|
158
|
+
case "tool_result":
|
|
159
|
+
return {
|
|
160
|
+
role: "tool",
|
|
161
|
+
toolCallId: message.toolCallId,
|
|
162
|
+
name: message.toolName,
|
|
163
|
+
content: [
|
|
164
|
+
{
|
|
165
|
+
type: "text",
|
|
166
|
+
text: message.output
|
|
167
|
+
}
|
|
168
|
+
]
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
);
|
|
173
|
+
}
|
|
174
|
+
buildTools() {
|
|
175
|
+
const enableTools = this.conversation.length > 1;
|
|
176
|
+
if (!enableTools) return void 0;
|
|
177
|
+
return this.tools.map((tool) => ({
|
|
178
|
+
type: "function",
|
|
179
|
+
function: {
|
|
180
|
+
name: tool.name,
|
|
181
|
+
description: tool.description,
|
|
182
|
+
parameters: (0, import_zod_v4.toJSONSchema)(tool.inputSchema || import_zod_v4.default.object())
|
|
183
|
+
}
|
|
184
|
+
}));
|
|
185
|
+
}
|
|
85
186
|
cancel() {
|
|
86
187
|
if (!this.running) return;
|
|
87
188
|
this.log("Cancel");
|
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 {
|
|
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 = 'ministral-8b-latest'\nconst DEFAULT_MAX_RETRY = 3\n\nexport class MistralAgent extends Agent<MistralAgentOptions> {\n private mistral: Mistral\n private cancelled: boolean = false\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.cancelled = false\n const stream = new PassThrough()\n this.generateAnswer(stream)\n return stream\n }\n\n private async generateAnswer(stream: Writable, callCount = 0, tryCount = 0) {\n this.running = true\n this.cancelled = false\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 (this.cancelled) 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 (fullAnswer) {\n // Add full answer to conversation\n const { message, metadata } = this.extract(fullAnswer)\n this.addAssistantMessage(message, metadata)\n } else if (!skipAnswer) {\n // Query again in case of tool call\n await this.generateAnswer(stream, callCount + 1)\n }\n } catch (error: any) {\n console.error('[MistralAgent] Error:', error)\n if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRY)) {\n await this.generateAnswer(stream, callCount, 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.cancelled = true\n this.running = false\n }\n}\n"],"mappings":"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","names":["result","z"]}
|
package/dist/index.mjs
CHANGED
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
import { Agent } from "@micdrop/server";
|
|
3
3
|
import { Mistral } from "@mistralai/mistralai";
|
|
4
4
|
import { PassThrough } from "stream";
|
|
5
|
+
import z, { toJSONSchema } from "zod-v4";
|
|
5
6
|
var DEFAULT_MODEL = "ministral-8b-latest";
|
|
7
|
+
var DEFAULT_MAX_RETRY = 3;
|
|
6
8
|
var MistralAgent = class extends Agent {
|
|
7
9
|
constructor(options) {
|
|
8
10
|
super(options);
|
|
@@ -17,7 +19,7 @@ var MistralAgent = class extends Agent {
|
|
|
17
19
|
this.generateAnswer(stream);
|
|
18
20
|
return stream;
|
|
19
21
|
}
|
|
20
|
-
async generateAnswer(stream) {
|
|
22
|
+
async generateAnswer(stream, callCount = 0, tryCount = 0) {
|
|
21
23
|
this.running = true;
|
|
22
24
|
this.cancelled = false;
|
|
23
25
|
if (this.conversation.length === 1) {
|
|
@@ -26,29 +28,65 @@ var MistralAgent = class extends Agent {
|
|
|
26
28
|
content: ""
|
|
27
29
|
});
|
|
28
30
|
}
|
|
31
|
+
let extracting = false;
|
|
32
|
+
const extractOptions = this.getExtractOptions();
|
|
29
33
|
try {
|
|
30
34
|
const result = await this.mistral.chat.stream({
|
|
31
35
|
model: this.options.model || DEFAULT_MODEL,
|
|
32
|
-
messages: this.
|
|
33
|
-
|
|
34
|
-
content: message.content
|
|
35
|
-
})),
|
|
36
|
+
messages: this.buildMessages(),
|
|
37
|
+
tools: this.buildTools(),
|
|
36
38
|
...this.options.settings
|
|
37
39
|
});
|
|
38
40
|
let fullAnswer = "";
|
|
41
|
+
let skipAnswer = false;
|
|
39
42
|
for await (const event of result) {
|
|
40
43
|
if (this.cancelled) return;
|
|
41
|
-
const
|
|
44
|
+
const delta = event.data.choices[0]?.delta;
|
|
45
|
+
const chunk = delta?.content;
|
|
46
|
+
const toolCalls = delta?.toolCalls;
|
|
42
47
|
if (typeof chunk === "string") {
|
|
48
|
+
if (chunk === "") continue;
|
|
43
49
|
this.log(`Answer chunk: "${chunk}"`);
|
|
44
|
-
stream.write(chunk);
|
|
45
50
|
fullAnswer += chunk;
|
|
51
|
+
if (extractOptions) {
|
|
52
|
+
if (!extracting) {
|
|
53
|
+
const startTagIndex = fullAnswer.indexOf(extractOptions.startTag);
|
|
54
|
+
if (startTagIndex !== -1) {
|
|
55
|
+
extracting = true;
|
|
56
|
+
const messagePart = fullAnswer.slice(0, startTagIndex).trimEnd();
|
|
57
|
+
stream.write(messagePart);
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
} else {
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
stream.write(chunk);
|
|
65
|
+
} else if (toolCalls?.length) {
|
|
66
|
+
for (const toolCall of toolCalls) {
|
|
67
|
+
const result2 = await this.executeTool({
|
|
68
|
+
role: "tool_call",
|
|
69
|
+
toolCallId: toolCall.id || "",
|
|
70
|
+
toolName: toolCall.function.name,
|
|
71
|
+
parameters: toolCall.function.arguments
|
|
72
|
+
});
|
|
73
|
+
if (result2.skipAnswer) {
|
|
74
|
+
skipAnswer = true;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
46
77
|
}
|
|
47
78
|
}
|
|
48
|
-
|
|
79
|
+
if (fullAnswer) {
|
|
80
|
+
const { message, metadata } = this.extract(fullAnswer);
|
|
81
|
+
this.addAssistantMessage(message, metadata);
|
|
82
|
+
} else if (!skipAnswer) {
|
|
83
|
+
await this.generateAnswer(stream, callCount + 1);
|
|
84
|
+
}
|
|
49
85
|
} catch (error) {
|
|
50
86
|
console.error("[MistralAgent] Error:", error);
|
|
51
|
-
|
|
87
|
+
if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRY)) {
|
|
88
|
+
await this.generateAnswer(stream, callCount, tryCount + 1);
|
|
89
|
+
}
|
|
52
90
|
} finally {
|
|
53
91
|
if (stream.writable) {
|
|
54
92
|
stream.end();
|
|
@@ -56,6 +94,59 @@ var MistralAgent = class extends Agent {
|
|
|
56
94
|
this.running = false;
|
|
57
95
|
}
|
|
58
96
|
}
|
|
97
|
+
buildMessages() {
|
|
98
|
+
return this.conversation.map(
|
|
99
|
+
(message) => {
|
|
100
|
+
switch (message.role) {
|
|
101
|
+
case "user":
|
|
102
|
+
case "assistant":
|
|
103
|
+
case "system":
|
|
104
|
+
return {
|
|
105
|
+
role: message.role,
|
|
106
|
+
content: message.content
|
|
107
|
+
};
|
|
108
|
+
case "tool_call":
|
|
109
|
+
return {
|
|
110
|
+
role: "assistant",
|
|
111
|
+
toolCalls: [
|
|
112
|
+
{
|
|
113
|
+
type: "function",
|
|
114
|
+
id: message.toolCallId,
|
|
115
|
+
function: {
|
|
116
|
+
name: message.toolName,
|
|
117
|
+
arguments: JSON.stringify(message.parameters)
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
]
|
|
121
|
+
};
|
|
122
|
+
case "tool_result":
|
|
123
|
+
return {
|
|
124
|
+
role: "tool",
|
|
125
|
+
toolCallId: message.toolCallId,
|
|
126
|
+
name: message.toolName,
|
|
127
|
+
content: [
|
|
128
|
+
{
|
|
129
|
+
type: "text",
|
|
130
|
+
text: message.output
|
|
131
|
+
}
|
|
132
|
+
]
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
);
|
|
137
|
+
}
|
|
138
|
+
buildTools() {
|
|
139
|
+
const enableTools = this.conversation.length > 1;
|
|
140
|
+
if (!enableTools) return void 0;
|
|
141
|
+
return this.tools.map((tool) => ({
|
|
142
|
+
type: "function",
|
|
143
|
+
function: {
|
|
144
|
+
name: tool.name,
|
|
145
|
+
description: tool.description,
|
|
146
|
+
parameters: toJSONSchema(tool.inputSchema || z.object())
|
|
147
|
+
}
|
|
148
|
+
}));
|
|
149
|
+
}
|
|
59
150
|
cancel() {
|
|
60
151
|
if (!this.running) return;
|
|
61
152
|
this.log("Cancel");
|
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 {
|
|
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 = 'ministral-8b-latest'\nconst DEFAULT_MAX_RETRY = 3\n\nexport class MistralAgent extends Agent<MistralAgentOptions> {\n private mistral: Mistral\n private cancelled: boolean = false\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.cancelled = false\n const stream = new PassThrough()\n this.generateAnswer(stream)\n return stream\n }\n\n private async generateAnswer(stream: Writable, callCount = 0, tryCount = 0) {\n this.running = true\n this.cancelled = false\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 (this.cancelled) 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 (fullAnswer) {\n // Add full answer to conversation\n const { message, metadata } = this.extract(fullAnswer)\n this.addAssistantMessage(message, metadata)\n } else if (!skipAnswer) {\n // Query again in case of tool call\n await this.generateAnswer(stream, callCount + 1)\n }\n } catch (error: any) {\n console.error('[MistralAgent] Error:', error)\n if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRY)) {\n await this.generateAnswer(stream, callCount, 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.cancelled = true\n this.running = false\n }\n}\n"],"mappings":"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","names":["result"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@micdrop/mistral",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.3",
|
|
4
4
|
"description": "Mistral implementation for @micdrop/server",
|
|
5
5
|
"author": "Lonestone",
|
|
6
6
|
"license": "MIT",
|
|
@@ -35,10 +35,13 @@
|
|
|
35
35
|
"tts"
|
|
36
36
|
],
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@mistralai/mistralai": "^1.7.3"
|
|
38
|
+
"@mistralai/mistralai": "^1.7.3",
|
|
39
|
+
"zod": "^3.24.1",
|
|
40
|
+
"zod-v4": "npm:zod@^4.0.5"
|
|
39
41
|
},
|
|
40
42
|
"peerDependencies": {
|
|
41
|
-
"@micdrop/server": "*"
|
|
43
|
+
"@micdrop/server": "*",
|
|
44
|
+
"zod": "^4"
|
|
42
45
|
},
|
|
43
46
|
"devDependencies": {
|
|
44
47
|
"@types/node": "^22.13.4",
|