@micdrop/ai-sdk 1.1.1 → 2.1.0
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/README.md +3 -1
- package/dist/index.d.mts +2 -3
- package/dist/index.d.ts +2 -3
- package/dist/index.js +18 -16
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +18 -16
- package/dist/index.mjs.map +1 -1
- package/package.json +7 -4
package/README.md
CHANGED
|
@@ -18,6 +18,8 @@ And install the provider you want to use, for example OpenAI:
|
|
|
18
18
|
npm install @ai-sdk/openai
|
|
19
19
|
```
|
|
20
20
|
|
|
21
|
+
This package relies on AI SDK 7, which needs Node.js 22 or later and providers from the same major version, such as `@ai-sdk/openai` 4.
|
|
22
|
+
|
|
21
23
|
## AI SDK Agent
|
|
22
24
|
|
|
23
25
|
### Usage with MicdropServer
|
|
@@ -91,7 +93,7 @@ See the [Agent interface](https://micdrop.dev/docs/ai-integration/custom-integra
|
|
|
91
93
|
|
|
92
94
|
The AI SDK Agent supports any provider compatible with the Vercel AI SDK:
|
|
93
95
|
|
|
94
|
-
- **OpenAI**: `openai('gpt-4o')`, `openai('gpt-
|
|
96
|
+
- **OpenAI**: `openai('gpt-4o')`, `openai('gpt-5.6-luna')`
|
|
95
97
|
- **Anthropic**: `anthropic('claude-3-5-sonnet-20241022')`
|
|
96
98
|
- **Google**: `google('gemini-1.5-pro')`, `google('gemini-1.5-flash')`
|
|
97
99
|
- **Mistral**: `mistral('mistral-large-latest')`
|
package/dist/index.d.mts
CHANGED
|
@@ -15,11 +15,10 @@ interface AiSdkAgentOptions extends AgentOptions {
|
|
|
15
15
|
maxRetry?: number;
|
|
16
16
|
}
|
|
17
17
|
declare class AiSdkAgent extends Agent<AiSdkAgentOptions> {
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
protected generateAnswer(stream: PassThrough, signal: AbortSignal): Promise<void>;
|
|
19
|
+
private buildInstructions;
|
|
20
20
|
private buildMessages;
|
|
21
21
|
private buildTools;
|
|
22
|
-
cancel(): void;
|
|
23
22
|
}
|
|
24
23
|
|
|
25
24
|
export { AiSdkAgent, type AiSdkAgentOptions };
|
package/dist/index.d.ts
CHANGED
|
@@ -15,11 +15,10 @@ interface AiSdkAgentOptions extends AgentOptions {
|
|
|
15
15
|
maxRetry?: number;
|
|
16
16
|
}
|
|
17
17
|
declare class AiSdkAgent extends Agent<AiSdkAgentOptions> {
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
protected generateAnswer(stream: PassThrough, signal: AbortSignal): Promise<void>;
|
|
19
|
+
private buildInstructions;
|
|
20
20
|
private buildMessages;
|
|
21
21
|
private buildTools;
|
|
22
|
-
cancel(): void;
|
|
23
22
|
}
|
|
24
23
|
|
|
25
24
|
export { AiSdkAgent, type AiSdkAgentOptions };
|
package/dist/index.js
CHANGED
|
@@ -29,17 +29,16 @@ var import_server = require("@micdrop/server");
|
|
|
29
29
|
var import_ai = require("ai");
|
|
30
30
|
var import_zod = require("zod");
|
|
31
31
|
var DEFAULT_MAX_RETRY = 3;
|
|
32
|
+
var FIRST_MESSAGE_PROMPT = "The call starts now.";
|
|
32
33
|
var AiSdkAgent = class extends import_server.Agent {
|
|
33
|
-
async generateAnswer(stream) {
|
|
34
|
-
const abortController = new AbortController();
|
|
35
|
-
this.abortController = abortController;
|
|
36
|
-
const signal = this.abortController.signal;
|
|
34
|
+
async generateAnswer(stream, signal) {
|
|
37
35
|
let skipAnswer = false;
|
|
38
36
|
let extracting = false;
|
|
39
37
|
const extractOptions = this.getExtractOptions();
|
|
40
38
|
try {
|
|
41
39
|
const result = (0, import_ai.streamText)({
|
|
42
40
|
model: this.options.model,
|
|
41
|
+
instructions: this.buildInstructions(),
|
|
43
42
|
messages: this.buildMessages(),
|
|
44
43
|
tools: this.buildTools(),
|
|
45
44
|
maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,
|
|
@@ -57,7 +56,7 @@ var AiSdkAgent = class extends import_server.Agent {
|
|
|
57
56
|
abortSignal: signal
|
|
58
57
|
});
|
|
59
58
|
for await (const textPart of result.textStream) {
|
|
60
|
-
if (skipAnswer) return;
|
|
59
|
+
if (skipAnswer || signal.aborted) return;
|
|
61
60
|
this.log(`Answer chunk: "${textPart}"`);
|
|
62
61
|
if (extractOptions) {
|
|
63
62
|
if (!extracting) {
|
|
@@ -74,25 +73,30 @@ var AiSdkAgent = class extends import_server.Agent {
|
|
|
74
73
|
}
|
|
75
74
|
stream.write(textPart);
|
|
76
75
|
}
|
|
77
|
-
if (skipAnswer) return;
|
|
76
|
+
if (skipAnswer || signal.aborted) return;
|
|
78
77
|
const fullText = await result.text;
|
|
78
|
+
if (signal.aborted) return;
|
|
79
79
|
const { message, metadata } = this.extract(fullText);
|
|
80
80
|
this.addAssistantMessage(message, metadata);
|
|
81
|
-
this.abortController = void 0;
|
|
82
81
|
} catch (error) {
|
|
83
|
-
if (
|
|
82
|
+
if (!signal.aborted) {
|
|
84
83
|
console.error("[AiSdkAgent] Error answering:", error);
|
|
85
84
|
this.log("Generation failed, giving up");
|
|
86
85
|
this.emit("Failed");
|
|
87
86
|
}
|
|
88
87
|
}
|
|
89
88
|
}
|
|
89
|
+
// The AI SDK takes the system prompt apart from the conversation
|
|
90
|
+
buildInstructions() {
|
|
91
|
+
return this.conversation.flatMap((message) => message.role === "system" ? message.content : []).join("\n\n");
|
|
92
|
+
}
|
|
90
93
|
buildMessages() {
|
|
91
|
-
|
|
94
|
+
const messages = this.conversation.flatMap((message) => {
|
|
92
95
|
switch (message.role) {
|
|
96
|
+
case "system":
|
|
97
|
+
return [];
|
|
93
98
|
case "user":
|
|
94
99
|
case "assistant":
|
|
95
|
-
case "system":
|
|
96
100
|
return {
|
|
97
101
|
role: message.role,
|
|
98
102
|
content: message.content
|
|
@@ -126,6 +130,10 @@ var AiSdkAgent = class extends import_server.Agent {
|
|
|
126
130
|
};
|
|
127
131
|
}
|
|
128
132
|
});
|
|
133
|
+
if (messages.length === 0) {
|
|
134
|
+
messages.push({ role: "user", content: FIRST_MESSAGE_PROMPT });
|
|
135
|
+
}
|
|
136
|
+
return messages;
|
|
129
137
|
}
|
|
130
138
|
buildTools() {
|
|
131
139
|
const tools = {};
|
|
@@ -145,12 +153,6 @@ var AiSdkAgent = class extends import_server.Agent {
|
|
|
145
153
|
});
|
|
146
154
|
return tools;
|
|
147
155
|
}
|
|
148
|
-
cancel() {
|
|
149
|
-
if (!this.abortController) return;
|
|
150
|
-
this.log("Cancel");
|
|
151
|
-
this.abortController.abort();
|
|
152
|
-
this.abortController = void 0;
|
|
153
|
-
}
|
|
154
156
|
};
|
|
155
157
|
// Annotate the CommonJS export names for ESM import in node:
|
|
156
158
|
0 && (module.exports = {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts","../src/AiSdkAgent.ts"],"sourcesContent":["export * from './AiSdkAgent'","import { ProviderOptions } from '@ai-sdk/provider-utils'\nimport { Agent, AgentOptions } from '@micdrop/server'\nimport {\n CallSettings,\n LanguageModel,\n ModelMessage,\n stepCountIs,\n streamText,\n tool,\n ToolSet,\n} from 'ai'\nimport { PassThrough } from 'stream'\nimport { z } from 'zod'\n\nexport interface AiSdkAgentOptions extends AgentOptions {\n model: LanguageModel\n settings?: CallSettings\n /**\n * Parameters read by a single provider, keyed by provider name, for anything\n * `settings` has no field for. `{ openai: { reasoningEffort: 'none' } }`\n * turns reasoning off, which a spoken turn needs.\n */\n providerOptions?: ProviderOptions\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n
|
|
1
|
+
{"version":3,"sources":["../src/index.ts","../src/AiSdkAgent.ts"],"sourcesContent":["export * from './AiSdkAgent'","import { ProviderOptions } from '@ai-sdk/provider-utils'\nimport { Agent, AgentOptions } from '@micdrop/server'\nimport {\n CallSettings,\n LanguageModel,\n ModelMessage,\n stepCountIs,\n streamText,\n tool,\n ToolSet,\n} from 'ai'\nimport { PassThrough } from 'stream'\nimport { z } from 'zod'\n\nexport interface AiSdkAgentOptions extends AgentOptions {\n model: LanguageModel\n settings?: CallSettings\n /**\n * Parameters read by a single provider, keyed by provider name, for anything\n * `settings` has no field for. `{ openai: { reasoningEffort: 'none' } }`\n * turns reasoning off, which a spoken turn needs.\n */\n providerOptions?: ProviderOptions\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nconst FIRST_MESSAGE_PROMPT = 'The call starts now.'\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n protected async generateAnswer(\n stream: PassThrough,\n signal: AbortSignal\n ): Promise<void> {\n let skipAnswer = false\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n // Generate response using AI SDK\n const result = streamText({\n model: this.options.model,\n instructions: this.buildInstructions(),\n messages: this.buildMessages(),\n tools: this.buildTools(),\n maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,\n providerOptions: this.options.providerOptions,\n stopWhen: stepCountIs(5),\n onStepFinish: (step) => {\n const tools = step.toolCalls.map((toolCall) =>\n this.getTool(toolCall.toolName)\n )\n if (tools.some((t) => t?.skipAnswer)) {\n skipAnswer = true\n }\n },\n ...this.options.settings,\n abortSignal: signal,\n })\n\n for await (const textPart of result.textStream) {\n if (skipAnswer || signal.aborted) return\n this.log(`Answer chunk: \"${textPart}\"`)\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = textPart.indexOf(extractOptions.startTag)\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = textPart.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\n // Send chunk\n stream.write(textPart)\n }\n if (skipAnswer || signal.aborted) return\n\n const fullText = await result.text\n // A cancelled answer was never heard in full, it stays out of the\n // conversation\n if (signal.aborted) return\n const { message, metadata } = this.extract(fullText)\n\n // Emit message\n this.addAssistantMessage(message, metadata)\n } catch (error: any) {\n // An aborted request throws too, but that is the cancellation the base\n // asked for, not a failure to report\n if (!signal.aborted) {\n console.error('[AiSdkAgent] Error answering:', error)\n this.log('Generation failed, giving up')\n this.emit('Failed')\n }\n }\n }\n\n // The AI SDK takes the system prompt apart from the conversation\n private buildInstructions() {\n return this.conversation\n .flatMap((message) => (message.role === 'system' ? message.content : []))\n .join('\\n\\n')\n }\n\n private buildMessages(): ModelMessage[] {\n const messages = this.conversation.flatMap((message): ModelMessage | [] => {\n switch (message.role) {\n case 'system':\n return []\n case 'user':\n case 'assistant':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n role: 'assistant',\n content: [\n {\n type: 'tool-call',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n input: JSON.parse(message.parameters),\n },\n ],\n }\n case 'tool_result':\n return {\n role: 'tool',\n content: [\n {\n type: 'tool-result',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n output: {\n type: 'json',\n value: JSON.parse(message.output),\n },\n },\n ],\n }\n }\n })\n\n // Asked for the opening line, with nothing said yet: the SDK refuses a\n // prompt without a message, and the model needs something to answer to\n if (messages.length === 0) {\n messages.push({ role: 'user', content: FIRST_MESSAGE_PROMPT })\n }\n return messages\n }\n\n private buildTools() {\n const tools: ToolSet = {}\n\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return tools\n\n this.tools.forEach((t) => {\n tools[t.name] = tool({\n description: t.description,\n inputSchema: (t.inputSchema || z.object({})) as z.ZodObject,\n execute: (args: any, { toolCallId }: { toolCallId: string }) =>\n this.executeTool({\n role: 'tool_call',\n toolCallId,\n toolName: t.name,\n parameters: JSON.stringify(args),\n }),\n })\n })\n return tools\n }\n}\n"],"mappings":"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","names":[]}
|
package/dist/index.mjs
CHANGED
|
@@ -7,17 +7,16 @@ import {
|
|
|
7
7
|
} from "ai";
|
|
8
8
|
import { z } from "zod";
|
|
9
9
|
var DEFAULT_MAX_RETRY = 3;
|
|
10
|
+
var FIRST_MESSAGE_PROMPT = "The call starts now.";
|
|
10
11
|
var AiSdkAgent = class extends Agent {
|
|
11
|
-
async generateAnswer(stream) {
|
|
12
|
-
const abortController = new AbortController();
|
|
13
|
-
this.abortController = abortController;
|
|
14
|
-
const signal = this.abortController.signal;
|
|
12
|
+
async generateAnswer(stream, signal) {
|
|
15
13
|
let skipAnswer = false;
|
|
16
14
|
let extracting = false;
|
|
17
15
|
const extractOptions = this.getExtractOptions();
|
|
18
16
|
try {
|
|
19
17
|
const result = streamText({
|
|
20
18
|
model: this.options.model,
|
|
19
|
+
instructions: this.buildInstructions(),
|
|
21
20
|
messages: this.buildMessages(),
|
|
22
21
|
tools: this.buildTools(),
|
|
23
22
|
maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,
|
|
@@ -35,7 +34,7 @@ var AiSdkAgent = class extends Agent {
|
|
|
35
34
|
abortSignal: signal
|
|
36
35
|
});
|
|
37
36
|
for await (const textPart of result.textStream) {
|
|
38
|
-
if (skipAnswer) return;
|
|
37
|
+
if (skipAnswer || signal.aborted) return;
|
|
39
38
|
this.log(`Answer chunk: "${textPart}"`);
|
|
40
39
|
if (extractOptions) {
|
|
41
40
|
if (!extracting) {
|
|
@@ -52,25 +51,30 @@ var AiSdkAgent = class extends Agent {
|
|
|
52
51
|
}
|
|
53
52
|
stream.write(textPart);
|
|
54
53
|
}
|
|
55
|
-
if (skipAnswer) return;
|
|
54
|
+
if (skipAnswer || signal.aborted) return;
|
|
56
55
|
const fullText = await result.text;
|
|
56
|
+
if (signal.aborted) return;
|
|
57
57
|
const { message, metadata } = this.extract(fullText);
|
|
58
58
|
this.addAssistantMessage(message, metadata);
|
|
59
|
-
this.abortController = void 0;
|
|
60
59
|
} catch (error) {
|
|
61
|
-
if (
|
|
60
|
+
if (!signal.aborted) {
|
|
62
61
|
console.error("[AiSdkAgent] Error answering:", error);
|
|
63
62
|
this.log("Generation failed, giving up");
|
|
64
63
|
this.emit("Failed");
|
|
65
64
|
}
|
|
66
65
|
}
|
|
67
66
|
}
|
|
67
|
+
// The AI SDK takes the system prompt apart from the conversation
|
|
68
|
+
buildInstructions() {
|
|
69
|
+
return this.conversation.flatMap((message) => message.role === "system" ? message.content : []).join("\n\n");
|
|
70
|
+
}
|
|
68
71
|
buildMessages() {
|
|
69
|
-
|
|
72
|
+
const messages = this.conversation.flatMap((message) => {
|
|
70
73
|
switch (message.role) {
|
|
74
|
+
case "system":
|
|
75
|
+
return [];
|
|
71
76
|
case "user":
|
|
72
77
|
case "assistant":
|
|
73
|
-
case "system":
|
|
74
78
|
return {
|
|
75
79
|
role: message.role,
|
|
76
80
|
content: message.content
|
|
@@ -104,6 +108,10 @@ var AiSdkAgent = class extends Agent {
|
|
|
104
108
|
};
|
|
105
109
|
}
|
|
106
110
|
});
|
|
111
|
+
if (messages.length === 0) {
|
|
112
|
+
messages.push({ role: "user", content: FIRST_MESSAGE_PROMPT });
|
|
113
|
+
}
|
|
114
|
+
return messages;
|
|
107
115
|
}
|
|
108
116
|
buildTools() {
|
|
109
117
|
const tools = {};
|
|
@@ -123,12 +131,6 @@ var AiSdkAgent = class extends Agent {
|
|
|
123
131
|
});
|
|
124
132
|
return tools;
|
|
125
133
|
}
|
|
126
|
-
cancel() {
|
|
127
|
-
if (!this.abortController) return;
|
|
128
|
-
this.log("Cancel");
|
|
129
|
-
this.abortController.abort();
|
|
130
|
-
this.abortController = void 0;
|
|
131
|
-
}
|
|
132
134
|
};
|
|
133
135
|
export {
|
|
134
136
|
AiSdkAgent
|
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/AiSdkAgent.ts"],"sourcesContent":["import { ProviderOptions } from '@ai-sdk/provider-utils'\nimport { Agent, AgentOptions } from '@micdrop/server'\nimport {\n CallSettings,\n LanguageModel,\n ModelMessage,\n stepCountIs,\n streamText,\n tool,\n ToolSet,\n} from 'ai'\nimport { PassThrough } from 'stream'\nimport { z } from 'zod'\n\nexport interface AiSdkAgentOptions extends AgentOptions {\n model: LanguageModel\n settings?: CallSettings\n /**\n * Parameters read by a single provider, keyed by provider name, for anything\n * `settings` has no field for. `{ openai: { reasoningEffort: 'none' } }`\n * turns reasoning off, which a spoken turn needs.\n */\n providerOptions?: ProviderOptions\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n
|
|
1
|
+
{"version":3,"sources":["../src/AiSdkAgent.ts"],"sourcesContent":["import { ProviderOptions } from '@ai-sdk/provider-utils'\nimport { Agent, AgentOptions } from '@micdrop/server'\nimport {\n CallSettings,\n LanguageModel,\n ModelMessage,\n stepCountIs,\n streamText,\n tool,\n ToolSet,\n} from 'ai'\nimport { PassThrough } from 'stream'\nimport { z } from 'zod'\n\nexport interface AiSdkAgentOptions extends AgentOptions {\n model: LanguageModel\n settings?: CallSettings\n /**\n * Parameters read by a single provider, keyed by provider name, for anything\n * `settings` has no field for. `{ openai: { reasoningEffort: 'none' } }`\n * turns reasoning off, which a spoken turn needs.\n */\n providerOptions?: ProviderOptions\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nconst FIRST_MESSAGE_PROMPT = 'The call starts now.'\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n protected async generateAnswer(\n stream: PassThrough,\n signal: AbortSignal\n ): Promise<void> {\n let skipAnswer = false\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n // Generate response using AI SDK\n const result = streamText({\n model: this.options.model,\n instructions: this.buildInstructions(),\n messages: this.buildMessages(),\n tools: this.buildTools(),\n maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,\n providerOptions: this.options.providerOptions,\n stopWhen: stepCountIs(5),\n onStepFinish: (step) => {\n const tools = step.toolCalls.map((toolCall) =>\n this.getTool(toolCall.toolName)\n )\n if (tools.some((t) => t?.skipAnswer)) {\n skipAnswer = true\n }\n },\n ...this.options.settings,\n abortSignal: signal,\n })\n\n for await (const textPart of result.textStream) {\n if (skipAnswer || signal.aborted) return\n this.log(`Answer chunk: \"${textPart}\"`)\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = textPart.indexOf(extractOptions.startTag)\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = textPart.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\n // Send chunk\n stream.write(textPart)\n }\n if (skipAnswer || signal.aborted) return\n\n const fullText = await result.text\n // A cancelled answer was never heard in full, it stays out of the\n // conversation\n if (signal.aborted) return\n const { message, metadata } = this.extract(fullText)\n\n // Emit message\n this.addAssistantMessage(message, metadata)\n } catch (error: any) {\n // An aborted request throws too, but that is the cancellation the base\n // asked for, not a failure to report\n if (!signal.aborted) {\n console.error('[AiSdkAgent] Error answering:', error)\n this.log('Generation failed, giving up')\n this.emit('Failed')\n }\n }\n }\n\n // The AI SDK takes the system prompt apart from the conversation\n private buildInstructions() {\n return this.conversation\n .flatMap((message) => (message.role === 'system' ? message.content : []))\n .join('\\n\\n')\n }\n\n private buildMessages(): ModelMessage[] {\n const messages = this.conversation.flatMap((message): ModelMessage | [] => {\n switch (message.role) {\n case 'system':\n return []\n case 'user':\n case 'assistant':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n role: 'assistant',\n content: [\n {\n type: 'tool-call',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n input: JSON.parse(message.parameters),\n },\n ],\n }\n case 'tool_result':\n return {\n role: 'tool',\n content: [\n {\n type: 'tool-result',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n output: {\n type: 'json',\n value: JSON.parse(message.output),\n },\n },\n ],\n }\n }\n })\n\n // Asked for the opening line, with nothing said yet: the SDK refuses a\n // prompt without a message, and the model needs something to answer to\n if (messages.length === 0) {\n messages.push({ role: 'user', content: FIRST_MESSAGE_PROMPT })\n }\n return messages\n }\n\n private buildTools() {\n const tools: ToolSet = {}\n\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return tools\n\n this.tools.forEach((t) => {\n tools[t.name] = tool({\n description: t.description,\n inputSchema: (t.inputSchema || z.object({})) as z.ZodObject,\n execute: (args: any, { toolCallId }: { toolCallId: string }) =>\n this.executeTool({\n role: 'tool_call',\n toolCallId,\n toolName: t.name,\n parameters: JSON.stringify(args),\n }),\n })\n })\n return tools\n }\n}\n"],"mappings":"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","names":[]}
|
package/package.json
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@micdrop/ai-sdk",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "AI SDK implementation for @micdrop/server",
|
|
5
5
|
"author": "Godefroy de Compreignac",
|
|
6
6
|
"license": "MIT",
|
|
7
|
+
"engines": {
|
|
8
|
+
"node": ">=22"
|
|
9
|
+
},
|
|
7
10
|
"main": "./dist/index.js",
|
|
8
11
|
"module": "./dist/index.mjs",
|
|
9
12
|
"types": "./dist/index.d.ts",
|
|
@@ -34,11 +37,11 @@
|
|
|
34
37
|
"ai-sdk"
|
|
35
38
|
],
|
|
36
39
|
"dependencies": {
|
|
37
|
-
"@ai-sdk/provider-utils": "^
|
|
38
|
-
"ai": "^
|
|
40
|
+
"@ai-sdk/provider-utils": "^5.0.70",
|
|
41
|
+
"ai": "^7.0.155"
|
|
39
42
|
},
|
|
40
43
|
"peerDependencies": {
|
|
41
|
-
"@micdrop/server": "
|
|
44
|
+
"@micdrop/server": ">=2.10.0",
|
|
42
45
|
"zod": "^4"
|
|
43
46
|
},
|
|
44
47
|
"devDependencies": {
|