@micdrop/mistral 1.0.6 → 1.0.8

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  import { AgentOptions, Agent } from '@micdrop/server';
2
2
  import { ChatCompletionStreamRequest } from '@mistralai/mistralai/models/components';
3
- import { PassThrough } from 'stream';
3
+ import { Writable } from 'stream';
4
4
 
5
5
  interface MistralAgentOptions extends AgentOptions {
6
6
  apiKey: string;
@@ -11,11 +11,8 @@ interface MistralAgentOptions extends AgentOptions {
11
11
  }
12
12
  declare class MistralAgent extends Agent<MistralAgentOptions> {
13
13
  private mistral;
14
- private counter;
15
- private running;
16
14
  constructor(options: MistralAgentOptions);
17
- answer(): PassThrough;
18
- private generateAnswer;
15
+ protected generateAnswer(stream: Writable, stepCount?: number, tryCount?: number): Promise<void>;
19
16
  private buildMessages;
20
17
  private buildTools;
21
18
  cancel(): void;
package/dist/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { AgentOptions, Agent } from '@micdrop/server';
2
2
  import { ChatCompletionStreamRequest } from '@mistralai/mistralai/models/components';
3
- import { PassThrough } from 'stream';
3
+ import { Writable } from 'stream';
4
4
 
5
5
  interface MistralAgentOptions extends AgentOptions {
6
6
  apiKey: string;
@@ -11,11 +11,8 @@ interface MistralAgentOptions extends AgentOptions {
11
11
  }
12
12
  declare class MistralAgent extends Agent<MistralAgentOptions> {
13
13
  private mistral;
14
- private counter;
15
- private running;
16
14
  constructor(options: MistralAgentOptions);
17
- answer(): PassThrough;
18
- private generateAnswer;
15
+ protected generateAnswer(stream: Writable, stepCount?: number, tryCount?: number): Promise<void>;
19
16
  private buildMessages;
20
17
  private buildTools;
21
18
  cancel(): void;
package/dist/index.js CHANGED
@@ -37,7 +37,6 @@ module.exports = __toCommonJS(index_exports);
37
37
  // src/MistralAgent.ts
38
38
  var import_server = require("@micdrop/server");
39
39
  var import_mistralai = require("@mistralai/mistralai");
40
- var import_stream = require("stream");
41
40
  var import_zod_v4 = __toESM(require("zod-v4"));
42
41
  var DEFAULT_MODEL = "mistral-large-latest";
43
42
  var DEFAULT_MAX_RETRY = 3;
@@ -46,24 +45,14 @@ var DEFAULT_RETRY_DELAY = 500;
46
45
  var MistralAgent = class extends import_server.Agent {
47
46
  constructor(options) {
48
47
  super(options);
49
- this.counter = 0;
50
- this.running = false;
51
48
  this.mistral = new import_mistralai.Mistral({ apiKey: options.apiKey });
52
49
  }
53
- answer() {
54
- this.log("Start answering");
55
- this.counter++;
56
- const stream = new import_stream.PassThrough();
57
- this.generateAnswer(stream);
58
- return stream;
59
- }
60
50
  async generateAnswer(stream, stepCount = 0, tryCount = 0) {
61
51
  if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {
62
52
  console.error("[MistralAgent] Max steps reached");
63
53
  return;
64
54
  }
65
- const counter = this.counter;
66
- this.running = true;
55
+ const answerCount = this.answerCount;
67
56
  if (this.conversation.length === 1) {
68
57
  this.conversation.push({
69
58
  role: "user",
@@ -82,7 +71,7 @@ var MistralAgent = class extends import_server.Agent {
82
71
  let fullAnswer = "";
83
72
  let skipAnswer = false;
84
73
  for await (const event of result) {
85
- if (counter !== this.counter) return;
74
+ if (answerCount !== this.answerCount) return;
86
75
  const delta = event.data.choices[0]?.delta;
87
76
  const chunk = delta?.content;
88
77
  const toolCalls = delta?.toolCalls;
@@ -118,7 +107,7 @@ var MistralAgent = class extends import_server.Agent {
118
107
  }
119
108
  }
120
109
  }
121
- if (counter !== this.counter) return;
110
+ if (answerCount !== this.answerCount) return;
122
111
  if (fullAnswer) {
123
112
  const { message, metadata } = this.extract(fullAnswer);
124
113
  this.addAssistantMessage(message, metadata);
@@ -136,11 +125,6 @@ var MistralAgent = class extends import_server.Agent {
136
125
  await new Promise((resolve) => setTimeout(resolve, DEFAULT_RETRY_DELAY));
137
126
  await this.generateAnswer(stream, stepCount, tryCount + 1);
138
127
  }
139
- } finally {
140
- if (stream.writable) {
141
- stream.end();
142
- }
143
- this.running = false;
144
128
  }
145
129
  }
146
130
  buildMessages() {
@@ -197,10 +181,10 @@ var MistralAgent = class extends import_server.Agent {
197
181
  }));
198
182
  }
199
183
  cancel() {
200
- if (!this.running) return;
184
+ if (!this.answering) return;
201
185
  this.log("Cancel");
202
- this.running = false;
203
- this.counter++;
186
+ this.answering = false;
187
+ this.answerCount++;
204
188
  }
205
189
  };
206
190
  // 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 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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,oBAAoC;AACpC,uBAAwB;AAKxB,oBAAsC;AACtC,oBAAgC;AAUhC,IAAM,gBAAgB;AACtB,IAAM,oBAAoB;AAC1B,IAAM,oBAAoB;AAC1B,IAAM,sBAAsB;AAErB,IAAM,eAAN,cAA2B,oBAA2B;AAAA,EAK3D,YAAY,SAA8B;AACxC,UAAM,OAAO;AAJf,SAAQ,UAAU;AAClB,SAAQ,UAAmB;AAIzB,SAAK,UAAU,IAAI,yBAAQ,EAAE,QAAQ,QAAQ,OAAO,CAAC;AAAA,EACvD;AAAA,EAEA,SAAS;AACP,SAAK,IAAI,iBAAiB;AAC1B,SAAK;AACL,UAAM,SAAS,IAAI,0BAAY;AAC/B,SAAK,eAAe,MAAM;AAC1B,WAAO;AAAA,EACT;AAAA,EAEA,MAAc,eAAe,QAAkB,YAAY,GAAG,WAAW,GAAG;AAC1E,QAAI,cAAc,KAAK,QAAQ,YAAY,oBAAoB;AAC7D,cAAQ,MAAM,kCAAkC;AAChD;AAAA,IACF;AAEA,UAAM,UAAU,KAAK;AACrB,SAAK,UAAU;AAGf,QAAI,KAAK,aAAa,WAAW,GAAG;AAClC,WAAK,aAAa,KAAK;AAAA,QACrB,MAAM;AAAA,QACN,SAAS;AAAA,MACX,CAAC;AAAA,IACH;AAGA,QAAI,aAAa;AACjB,UAAM,iBAAiB,KAAK,kBAAkB;AAE9C,QAAI;AACF,YAAM,SAAS,MAAM,KAAK,QAAQ,KAAK,OAAO;AAAA,QAC5C,OAAO,KAAK,QAAQ,SAAS;AAAA,QAC7B,UAAU,KAAK,cAAc;AAAA,QAC7B,OAAO,KAAK,WAAW;AAAA,QACvB,GAAG,KAAK,QAAQ;AAAA,MAClB,CAAC;AACD,UAAI,aAAa;AACjB,UAAI,aAAa;AAGjB,uBAAiB,SAAS,QAAQ;AAChC,YAAI,YAAY,KAAK,QAAS;AAC9B,cAAM,QAAQ,MAAM,KAAK,QAAQ,CAAC,GAAG;AACrC,cAAM,QAAQ,OAAO;AACrB,cAAM,YAAY,OAAO;AAGzB,YAAI,OAAO,UAAU,UAAU;AAC7B,cAAI,UAAU,GAAI;AAClB,eAAK,IAAI,kBAAkB,KAAK,GAAG;AACnC,wBAAc;AAGd,cAAI,gBAAgB;AAClB,gBAAI,CAAC,YAAY;AACf,oBAAM,gBAAgB,WAAW,QAAQ,eAAe,QAAQ;AAChE,kBAAI,kBAAkB,IAAI;AACxB,6BAAa;AACb,sBAAM,cAAc,WAAW,MAAM,GAAG,aAAa,EAAE,QAAQ;AAC/D,uBAAO,MAAM,WAAW;AACxB;AAAA,cACF;AAAA,YACF,OAAO;AAEL;AAAA,YACF;AAAA,UACF;AACA,iBAAO,MAAM,KAAK;AAAA,QACpB,WAAW,WAAW,QAAQ;AAC5B,qBAAW,YAAY,WAAW;AAChC,kBAAMA,UAAS,MAAM,KAAK,YAAY;AAAA,cACpC,MAAM;AAAA,cACN,YAAY,SAAS,MAAM;AAAA,cAC3B,UAAU,SAAS,SAAS;AAAA,cAC5B,YAAY,SAAS,SAAS;AAAA,YAChC,CAAC;AACD,gBAAIA,QAAO,YAAY;AACrB,2BAAa;AAAA,YACf;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAEA,UAAI,YAAY,KAAK,QAAS;AAE9B,UAAI,YAAY;AAEd,cAAM,EAAE,SAAS,SAAS,IAAI,KAAK,QAAQ,UAAU;AACrD,aAAK,oBAAoB,SAAS,QAAQ;AAAA,MAC5C,WAAW,YAAY;AAErB,aAAK,aAAa,KAAK;AAAA,UACrB,MAAM;AAAA,UACN,SAAS;AAAA,QACX,CAAC;AAAA,MACH,OAAO;AAEL,cAAM,KAAK,eAAe,QAAQ,YAAY,CAAC;AAAA,MACjD;AAAA,IACF,SAAS,OAAY;AACnB,cAAQ,MAAM,yBAAyB,KAAK;AAC5C,UAAI,YAAY,KAAK,QAAQ,YAAY,oBAAoB;AAC3D,cAAM,IAAI,QAAQ,CAAC,YAAY,WAAW,SAAS,mBAAmB,CAAC;AACvE,cAAM,KAAK,eAAe,QAAQ,WAAW,WAAW,CAAC;AAAA,MAC3D;AAAA,IACF,UAAE;AACA,UAAI,OAAO,UAAU;AACnB,eAAO,IAAI;AAAA,MACb;AACA,WAAK,UAAU;AAAA,IACjB;AAAA,EACF;AAAA,EAEQ,gBAAuD;AAC7D,WAAO,KAAK,aAAa;AAAA,MACvB,CAAC,YAAiD;AAChD,gBAAQ,QAAQ,MAAM;AAAA,UACpB,KAAK;AAAA,UACL,KAAK;AAAA,UACL,KAAK;AACH,mBAAO;AAAA,cACL,MAAM,QAAQ;AAAA,cACd,SAAS,QAAQ;AAAA,YACnB;AAAA,UACF,KAAK;AACH,mBAAO;AAAA,cACL,MAAM;AAAA,cACN,WAAW;AAAA,gBACT;AAAA,kBACE,MAAM;AAAA,kBACN,IAAI,QAAQ;AAAA,kBACZ,UAAU;AAAA,oBACR,MAAM,QAAQ;AAAA,oBACd,WAAW,KAAK,UAAU,QAAQ,UAAU;AAAA,kBAC9C;AAAA,gBACF;AAAA,cACF;AAAA,YACF;AAAA,UACF,KAAK;AACH,mBAAO;AAAA,cACL,MAAM;AAAA,cACN,YAAY,QAAQ;AAAA,cACpB,MAAM,QAAQ;AAAA,cACd,SAAS;AAAA,gBACP;AAAA,kBACE,MAAM;AAAA,kBACN,MAAM,QAAQ;AAAA,gBAChB;AAAA,cACF;AAAA,YACF;AAAA,QACJ;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEQ,aAAmD;AAEzD,UAAM,cAAc,KAAK,aAAa,SAAS;AAC/C,QAAI,CAAC,YAAa,QAAO;AAEzB,WAAO,KAAK,MAAM,IAAI,CAAC,UAAU;AAAA,MAC/B,MAAM;AAAA,MACN,UAAU;AAAA,QACR,MAAM,KAAK;AAAA,QACX,aAAa,KAAK;AAAA,QAClB,gBAAY,4BAAa,KAAK,eAAe,cAAAC,QAAE,OAAO,CAAC;AAAA,MACzD;AAAA,IACF,EAAE;AAAA,EACJ;AAAA,EAEA,SAAS;AACP,QAAI,CAAC,KAAK,QAAS;AACnB,SAAK,IAAI,QAAQ;AACjB,SAAK,UAAU;AAGf,SAAK;AAAA,EACP;AACF;","names":["result","z"]}
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 { 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\n constructor(options: MistralAgentOptions) {\n super(options)\n this.mistral = new Mistral({ apiKey: options.apiKey })\n }\n\n protected async generateAnswer(\n stream: Writable,\n stepCount = 0,\n tryCount = 0\n ) {\n if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {\n console.error('[MistralAgent] Max steps reached')\n return\n }\n\n const answerCount = this.answerCount\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 (answerCount !== this.answerCount) 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 (answerCount !== this.answerCount) 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 }\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.answering) return\n this.log('Cancel')\n this.answering = false\n\n // Increment counter to avoid processing messages from previous calls\n this.answerCount++\n }\n}\n"],"mappings":"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","names":["result","z"]}
package/dist/index.mjs CHANGED
@@ -1,7 +1,6 @@
1
1
  // src/MistralAgent.ts
2
2
  import { Agent } from "@micdrop/server";
3
3
  import { Mistral } from "@mistralai/mistralai";
4
- import { PassThrough } from "stream";
5
4
  import z, { toJSONSchema } from "zod-v4";
6
5
  var DEFAULT_MODEL = "mistral-large-latest";
7
6
  var DEFAULT_MAX_RETRY = 3;
@@ -10,24 +9,14 @@ var DEFAULT_RETRY_DELAY = 500;
10
9
  var MistralAgent = class extends Agent {
11
10
  constructor(options) {
12
11
  super(options);
13
- this.counter = 0;
14
- this.running = false;
15
12
  this.mistral = new Mistral({ apiKey: options.apiKey });
16
13
  }
17
- answer() {
18
- this.log("Start answering");
19
- this.counter++;
20
- const stream = new PassThrough();
21
- this.generateAnswer(stream);
22
- return stream;
23
- }
24
14
  async generateAnswer(stream, stepCount = 0, tryCount = 0) {
25
15
  if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {
26
16
  console.error("[MistralAgent] Max steps reached");
27
17
  return;
28
18
  }
29
- const counter = this.counter;
30
- this.running = true;
19
+ const answerCount = this.answerCount;
31
20
  if (this.conversation.length === 1) {
32
21
  this.conversation.push({
33
22
  role: "user",
@@ -46,7 +35,7 @@ var MistralAgent = class extends Agent {
46
35
  let fullAnswer = "";
47
36
  let skipAnswer = false;
48
37
  for await (const event of result) {
49
- if (counter !== this.counter) return;
38
+ if (answerCount !== this.answerCount) return;
50
39
  const delta = event.data.choices[0]?.delta;
51
40
  const chunk = delta?.content;
52
41
  const toolCalls = delta?.toolCalls;
@@ -82,7 +71,7 @@ var MistralAgent = class extends Agent {
82
71
  }
83
72
  }
84
73
  }
85
- if (counter !== this.counter) return;
74
+ if (answerCount !== this.answerCount) return;
86
75
  if (fullAnswer) {
87
76
  const { message, metadata } = this.extract(fullAnswer);
88
77
  this.addAssistantMessage(message, metadata);
@@ -100,11 +89,6 @@ var MistralAgent = class extends Agent {
100
89
  await new Promise((resolve) => setTimeout(resolve, DEFAULT_RETRY_DELAY));
101
90
  await this.generateAnswer(stream, stepCount, tryCount + 1);
102
91
  }
103
- } finally {
104
- if (stream.writable) {
105
- stream.end();
106
- }
107
- this.running = false;
108
92
  }
109
93
  }
110
94
  buildMessages() {
@@ -161,10 +145,10 @@ var MistralAgent = class extends Agent {
161
145
  }));
162
146
  }
163
147
  cancel() {
164
- if (!this.running) return;
148
+ if (!this.answering) return;
165
149
  this.log("Cancel");
166
- this.running = false;
167
- this.counter++;
150
+ this.answering = false;
151
+ this.answerCount++;
168
152
  }
169
153
  };
170
154
  export {
@@ -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 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"]}
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 { 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\n constructor(options: MistralAgentOptions) {\n super(options)\n this.mistral = new Mistral({ apiKey: options.apiKey })\n }\n\n protected async generateAnswer(\n stream: Writable,\n stepCount = 0,\n tryCount = 0\n ) {\n if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {\n console.error('[MistralAgent] Max steps reached')\n return\n }\n\n const answerCount = this.answerCount\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 (answerCount !== this.answerCount) 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 (answerCount !== this.answerCount) 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 }\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.answering) return\n this.log('Cancel')\n this.answering = false\n\n // Increment counter to avoid processing messages from previous calls\n this.answerCount++\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.6",
3
+ "version": "1.0.8",
4
4
  "description": "Mistral implementation for @micdrop/server",
5
5
  "author": "Lonestone",
6
6
  "license": "MIT",