@aigne/core 1.11.0 → 1.13.0

package/lib/esm/models/bedrock-chat-model.d.ts

@@ -0,0 +1,70 @@
+import { BedrockRuntimeClient } from "@aws-sdk/client-bedrock-runtime";
+import { z } from "zod";
+import type { AgentInvokeOptions, AgentResponse } from "../agents/agent.js";
+import type { Context } from "../aigne/context.js";
+import { ChatModel, type ChatModelInput, type ChatModelOptions, type ChatModelOutput } from "./chat-model.js";
+export declare function extractLastJsonObject(text: string): string | null;
+export interface BedrockChatModelOptions {
+    accessKeyId?: string;
+    secretAccessKey?: string;
+    region?: string;
+    model?: string;
+    modelOptions?: ChatModelOptions;
+}
+export declare const bedrockChatModelOptionsSchema: z.ZodObject<{
+    region: z.ZodOptional<z.ZodString>;
+    model: z.ZodOptional<z.ZodString>;
+    modelOptions: z.ZodOptional<z.ZodObject<{
+        model: z.ZodOptional<z.ZodString>;
+        temperature: z.ZodOptional<z.ZodNumber>;
+        topP: z.ZodOptional<z.ZodNumber>;
+        frequencyPenalty: z.ZodOptional<z.ZodNumber>;
+        presencePenalty: z.ZodOptional<z.ZodNumber>;
+        parallelToolCalls: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        parallelToolCalls: boolean;
+        model?: string | undefined;
+        temperature?: number | undefined;
+        topP?: number | undefined;
+        frequencyPenalty?: number | undefined;
+        presencePenalty?: number | undefined;
+    }, {
+        model?: string | undefined;
+        temperature?: number | undefined;
+        topP?: number | undefined;
+        frequencyPenalty?: number | undefined;
+        presencePenalty?: number | undefined;
+        parallelToolCalls?: boolean | undefined;
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    modelOptions?: {
+        parallelToolCalls: boolean;
+        model?: string | undefined;
+        temperature?: number | undefined;
+        topP?: number | undefined;
+        frequencyPenalty?: number | undefined;
+        presencePenalty?: number | undefined;
+    } | undefined;
+    model?: string | undefined;
+    region?: string | undefined;
+}, {
+    modelOptions?: {
+        model?: string | undefined;
+        temperature?: number | undefined;
+        topP?: number | undefined;
+        frequencyPenalty?: number | undefined;
+        presencePenalty?: number | undefined;
+        parallelToolCalls?: boolean | undefined;
+    } | undefined;
+    model?: string | undefined;
+    region?: string | undefined;
+}>;
+export declare class BedrockChatModel extends ChatModel {
+    options?: BedrockChatModelOptions | undefined;
+    constructor(options?: BedrockChatModelOptions | undefined);
+    protected _client?: BedrockRuntimeClient;
+    get client(): BedrockRuntimeClient;
+    get modelOptions(): ChatModelOptions | undefined;
+    process(input: ChatModelInput, _context: Context, options?: AgentInvokeOptions): Promise<AgentResponse<ChatModelOutput>>;
+    private extractResultFromStream;
+}

package/lib/esm/models/bedrock-chat-model.js

@@ -0,0 +1,268 @@
+import { BedrockRuntimeClient, ConverseStreamCommand, } from "@aws-sdk/client-bedrock-runtime";
+import { nanoid } from "nanoid";
+import { z } from "zod";
+import { parseJSON } from "../utils/json-schema.js";
+import { getJsonOutputPrompt } from "../utils/prompts.js";
+import { agentResponseStreamToObject } from "../utils/stream-utils.js";
+import { checkArguments, isNonNullable } from "../utils/type-utils.js";
+import { ChatModel, } from "./chat-model.js";
+export function extractLastJsonObject(text) {
+    return text.replace(/<thinking>[\s\S]*?<\/thinking>/g, "").trim();
+}
+const BEDROCK_DEFAULT_CHAT_MODEL = "us.amazon.nova-lite-v1:0";
+export const bedrockChatModelOptionsSchema = z.object({
+    region: z.string().optional(),
+    model: z.string().optional(),
+    modelOptions: z
+        .object({
+        model: z.string().optional(),
+        temperature: z.number().optional(),
+        topP: z.number().optional(),
+        frequencyPenalty: z.number().optional(),
+        presencePenalty: z.number().optional(),
+        parallelToolCalls: z.boolean().optional().default(true),
+    })
+        .optional(),
+});
+export class BedrockChatModel extends ChatModel {
+    options;
+    constructor(options) {
+        if (options)
+            checkArguments("BedrockChatModel", bedrockChatModelOptionsSchema, options);
+        super();
+        this.options = options;
+    }
+    _client;
+    get client() {
+        const credentials = this.options?.accessKeyId && this.options?.secretAccessKey
+            ? {
+                accessKeyId: this.options.accessKeyId,
+                secretAccessKey: this.options.secretAccessKey,
+            }
+            : undefined;
+        this._client ??= new BedrockRuntimeClient({
+            region: this.options?.region,
+            credentials,
+        });
+        return this._client;
+    }
+    get modelOptions() {
+        return this.options?.modelOptions;
+    }
+    async process(input, _context, options) {
+        const modelId = input.modelOptions?.model ?? this.modelOptions?.model ?? BEDROCK_DEFAULT_CHAT_MODEL;
+        const { messages, system } = getRunMessages(input);
+        const toolConfig = convertTools(input);
+        const body = {
+            modelId,
+            messages,
+            system,
+            toolConfig,
+            inferenceConfig: {
+                temperature: input.modelOptions?.temperature ?? this.modelOptions?.temperature,
+                topP: input.modelOptions?.topP ?? this.modelOptions?.topP,
+            },
+        };
+        const command = new ConverseStreamCommand(body);
+        const response = await this.client.send(command);
+        const jsonMode = input.responseFormat?.type === "json_schema";
+        if (options?.streaming && !jsonMode) {
+            return this.extractResultFromStream(response.stream, modelId, false, true);
+        }
+        const result = await this.extractResultFromStream(response.stream, modelId, jsonMode, false);
+        return result;
+    }
+    async extractResultFromStream(stream, modelId, jsonMode, streaming) {
+        if (!stream)
+            throw new Error("Unable to get AI model response.");
+        const result = new ReadableStream({
+            start: async (controller) => {
+                try {
+                    controller.enqueue({ delta: { json: { model: modelId } } });
+                    const toolCalls = [];
+                    let text = "";
+                    let usage;
+                    for await (const chunk of stream) {
+                        if (chunk.contentBlockStart?.start?.toolUse) {
+                            const toolUse = chunk.contentBlockStart.start.toolUse;
+                            if (!toolUse.name)
+                                throw new Error("Tool use is invalid");
+                            if (chunk.contentBlockStart.contentBlockIndex === undefined)
+                                throw new Error("Tool use content block index is required");
+                            toolCalls[chunk.contentBlockStart.contentBlockIndex] = {
+                                type: "function",
+                                id: toolUse.toolUseId || nanoid(),
+                                function: {
+                                    name: toolUse.name,
+                                    arguments: {},
+                                },
+                                args: "",
+                            };
+                        }
+                        if (chunk.contentBlockDelta) {
+                            const block = chunk.contentBlockDelta;
+                            const delta = block.delta;
+                            if (delta?.text) {
+                                text += delta.text;
+                                if (!jsonMode) {
+                                    controller.enqueue({ delta: { text: { text: delta.text } } });
+                                }
+                            }
+                            if (delta?.toolUse) {
+                                if (block.contentBlockIndex === undefined)
+                                    throw new Error("Content block index is required");
+                                const call = toolCalls[block.contentBlockIndex];
+                                if (!call)
+                                    throw new Error("Tool call not found");
+                                call.args += delta.toolUse.input;
+                            }
+                        }
+                        if (chunk.metadata) {
+                            usage = chunk.metadata.usage;
+                        }
+                    }
+                    if (jsonMode && text) {
+                        const match = extractLastJsonObject(text);
+                        if (!match)
+                            throw new Error("Failed to extract JSON object from model output");
+                        controller.enqueue({
+                            delta: { json: { json: parseJSON(match) } },
+                        });
+                    }
+                    if (toolCalls.length) {
+                        controller.enqueue({
+                            delta: {
+                                json: {
+                                    toolCalls: toolCalls
+                                        .map(({ args, ...c }) => ({
+                                        ...c,
+                                        function: { ...c.function, arguments: parseJSON(args) },
+                                    }))
+                                        .filter(isNonNullable),
+                                },
+                            },
+                        });
+                    }
+                    controller.enqueue({ delta: { json: { usage } } });
+                    controller.close();
+                }
+                catch (error) {
+                    controller.error(error);
+                }
+            },
+        });
+        return streaming ? result : await agentResponseStreamToObject(result);
+    }
+}
+const getRunMessages = ({ messages: msgs, responseFormat, }) => {
+    const system = [];
+    const messages = [];
+    for (const msg of msgs) {
+        if (msg.role === "system") {
+            if (typeof msg.content !== "string")
+                throw new Error("System message must have content");
+            system.push({ text: msg.content });
+        }
+        else if (msg.role === "tool") {
+            if (!msg.toolCallId)
+                throw new Error("Tool message must have toolCallId");
+            if (typeof msg.content !== "string")
+                throw new Error("Tool message must have string content");
+            if (messages.at(-1)?.role === "user") {
+                messages.at(-1)?.content?.push({
+                    toolResult: { toolUseId: msg.toolCallId, content: [{ json: parseJSON(msg.content) }] },
+                });
+            }
+            else {
+                messages.push({
+                    role: "user",
+                    content: [
+                        {
+                            toolResult: {
+                                toolUseId: msg.toolCallId,
+                                content: [{ json: parseJSON(msg.content) }],
+                            },
+                        },
+                    ],
+                });
+            }
+        }
+        else if (msg.role === "user") {
+            if (!msg.content)
+                throw new Error("User message must have content");
+            messages.push({ role: "user", content: convertContent(msg.content) });
+        }
+        else if (msg.role === "agent") {
+            if (msg.toolCalls?.length) {
+                messages.push({
+                    role: "assistant",
+                    content: msg.toolCalls.map((i) => ({
+                        toolUse: {
+                            toolUseId: i.id,
+                            name: i.function.name,
+                            input: i.function.arguments,
+                        },
+                    })),
+                });
+            }
+            else if (msg.content) {
+                messages.push({ role: "assistant", content: convertContent(msg.content) });
+            }
+            else {
+                throw new Error("Agent message must have content or toolCalls");
+            }
+        }
+    }
+    if (messages.at(0)?.role !== "user") {
+        messages.unshift({ role: "user", content: [{ text: "." }] });
+    }
+    if (responseFormat?.type === "json_schema") {
+        system.push({
+            text: getJsonOutputPrompt(responseFormat.jsonSchema.schema),
+        });
+    }
+    return { messages, system };
+};
+function convertContent(content) {
+    if (typeof content === "string")
+        return [{ text: content }];
+    if (Array.isArray(content)) {
+        const blocks = [];
+        for (const item of content) {
+            if (item.type === "text")
+                blocks.push({ text: item.text });
+        }
+        return blocks;
+    }
+    throw new Error("Invalid chat message content");
+}
+function convertTools({ tools, toolChoice }) {
+    if (!tools?.length || toolChoice === "none")
+        return undefined;
+    let choice;
+    if (typeof toolChoice === "object" && "type" in toolChoice && toolChoice.type === "function") {
+        choice = { tool: { name: toolChoice.function.name } };
+    }
+    else if (toolChoice === "required") {
+        choice = { any: {} };
+    }
+    else if (toolChoice === "auto") {
+        choice = { auto: {} };
+    }
+    return {
+        tools: tools.map((i) => {
+            const parameters = i.function.parameters;
+            if (Object.keys(parameters).length === 0) {
+                parameters.type = "object";
+            }
+            return {
+                toolSpec: {
+                    name: i.function.name,
+                    description: i.function.description,
+                    inputSchema: { json: parameters },
+                },
+            };
+        }),
+        toolChoice: choice,
+    };
+}

package/lib/esm/models/chat-model.d.ts

@@ -1,11 +1,12 @@
 import { Agent, type Message } from "../agents/agent.js";
-import type { Context } from "../execution-engine/context.js";
+import type { Context } from "../aigne/context.js";
 export declare abstract class ChatModel extends Agent<ChatModelInput, ChatModelOutput> {
     constructor();
     protected supportsParallelToolCalls: boolean;
     getModelCapabilities(): {
         supportsParallelToolCalls: boolean;
     };
+    private validateToolNames;
     protected preprocess(input: ChatModelInput, context: Context): void;
     protected postprocess(input: ChatModelInput, output: ChatModelOutput, context: Context): void;
 }

package/lib/esm/models/chat-model.js

@@ -13,6 +13,13 @@ export class ChatModel extends Agent {
             supportsParallelToolCalls: this.supportsParallelToolCalls,
         };
     }
+    validateToolNames(tools) {
+        for (const tool of tools ?? []) {
+            if (!/^[a-zA-Z0-9_]+$/.test(tool.function.name)) {
+                throw new Error(`Tool name "${tool.function.name}" can only contain letters, numbers, and underscores`);
+            }
+        }
+    }
     preprocess(input, context) {
         super.preprocess(input, context);
         const { limits, usage } = context;
@@ -20,6 +27,7 @@ export class ChatModel extends Agent {
         if (limits?.maxTokens && usedTokens >= limits.maxTokens) {
             throw new Error(`Exceeded max tokens ${usedTokens}/${limits.maxTokens}`);
         }
+        this.validateToolNames(input.tools);
     }
     postprocess(input, output, context) {
         super.postprocess(input, output, context);

package/lib/esm/models/claude-chat-model.d.ts

@@ -1,7 +1,7 @@
 import Anthropic from "@anthropic-ai/sdk";
 import { z } from "zod";
-import type { AgentCallOptions, AgentResponse } from "../agents/agent.js";
-import type { Context } from "../execution-engine/context.js";
+import type { AgentInvokeOptions, AgentResponse } from "../agents/agent.js";
+import type { Context } from "../aigne/context.js";
 import { ChatModel, type ChatModelInput, type ChatModelOptions, type ChatModelOutput } from "./chat-model.js";
 export interface ClaudeChatModelOptions {
     apiKey?: string;
@@ -62,7 +62,7 @@ export declare class ClaudeChatModel extends ChatModel {
     protected _client?: Anthropic;
     get client(): Anthropic;
     get modelOptions(): ChatModelOptions | undefined;
-    process(input: ChatModelInput, _context: Context, options?: AgentCallOptions): Promise<AgentResponse<ChatModelOutput>>;
+    process(input: ChatModelInput, _context: Context, options?: AgentInvokeOptions): Promise<AgentResponse<ChatModelOutput>>;
     private extractResultFromClaudeStream;
     private requestStructuredOutput;
 }

package/lib/esm/models/gemini-chat-model.d.ts

@@ -5,4 +5,5 @@ export declare class GeminiChatModel extends OpenAIChatModel {
     protected supportsEndWithSystemMessage: boolean;
     protected supportsToolsUseWithJsonSchema: boolean;
     protected supportsParallelToolCalls: boolean;
+    protected supportsToolStreaming: boolean;
 }

package/lib/esm/models/gemini-chat-model.js

@@ -13,4 +13,5 @@ export class GeminiChatModel extends OpenAIChatModel {
     supportsEndWithSystemMessage = false;
     supportsToolsUseWithJsonSchema = false;
     supportsParallelToolCalls = false;
+    supportsToolStreaming = false;
 }

package/lib/esm/models/openai-chat-model.d.ts

@@ -1,8 +1,8 @@
 import OpenAI from "openai";
 import type { ChatCompletionMessageParam, ChatCompletionTool } from "openai/resources";
 import { z } from "zod";
-import type { AgentCallOptions, AgentResponse } from "../agents/agent.js";
-import type { Context } from "../execution-engine/context.js";
+import type { AgentInvokeOptions, AgentResponse } from "../agents/agent.js";
+import type { Context } from "../aigne/context.js";
 import { ChatModel, type ChatModelInput, type ChatModelInputMessage, type ChatModelInputTool, type ChatModelOptions, type ChatModelOutput, type Role } from "./chat-model.js";
 export interface OpenAIChatModelCapabilities {
     supportsNativeStructuredOutputs: boolean;
@@ -10,6 +10,7 @@ export interface OpenAIChatModelCapabilities {
     supportsToolsUseWithJsonSchema: boolean;
     supportsParallelToolCalls: boolean;
     supportsToolsEmptyParameters: boolean;
+    supportsToolStreaming: boolean;
     supportsTemperature: boolean;
 }
 export interface OpenAIChatModelOptions {
@@ -80,14 +81,16 @@ export declare class OpenAIChatModel extends ChatModel {
     protected supportsToolsUseWithJsonSchema: boolean;
     protected supportsParallelToolCalls: boolean;
     protected supportsToolsEmptyParameters: boolean;
+    protected supportsToolStreaming: boolean;
     protected supportsTemperature: boolean;
     get client(): OpenAI;
     get modelOptions(): ChatModelOptions | undefined;
-    process(input: ChatModelInput, _context: Context, options?: AgentCallOptions): Promise<AgentResponse<ChatModelOutput>>;
+    process(input: ChatModelInput, _context: Context, options?: AgentInvokeOptions): Promise<AgentResponse<ChatModelOutput>>;
     private getParallelToolCalls;
     private getRunMessages;
     private getRunResponseFormat;
     private requestStructuredOutput;
+    private extractResultFromStream;
 }
 export declare const ROLE_MAP: {
     [key in Role]: ChatCompletionMessageParam["role"];

package/lib/esm/models/openai-chat-model.js

@@ -45,6 +45,7 @@ export class OpenAIChatModel extends ChatModel {
     supportsToolsUseWithJsonSchema = true;
     supportsParallelToolCalls = true;
     supportsToolsEmptyParameters = true;
+    supportsToolStreaming = true;
     supportsTemperature = true;
     get client() {
         const apiKey = this.options?.apiKey || process.env[this.apiKeyEnvName] || this.apiKeyDefault;
@@ -86,9 +87,9 @@ export class OpenAIChatModel extends ChatModel {
             response_format: responseFormat,
         });
         if (options?.streaming && input.responseFormat?.type !== "json_schema") {
-            return await extractResultFromStream(stream, false, true);
+            return await this.extractResultFromStream(stream, false, true);
         }
-        const result = await extractResultFromStream(stream, jsonMode);
+        const result = await this.extractResultFromStream(stream, jsonMode);
         if (!this.supportsToolsUseWithJsonSchema &&
             !result.toolCalls?.length &&
             input.responseFormat?.type === "json_schema" &&
@@ -154,7 +155,103 @@ export class OpenAIChatModel extends ChatModel {
             ...body,
             response_format: resolvedResponseFormat,
         });
-        return extractResultFromStream(res, jsonMode);
+        return this.extractResultFromStream(res, jsonMode);
+    }
+    async extractResultFromStream(stream, jsonMode, streaming) {
+        const result = new ReadableStream({
+            start: async (controller) => {
+                try {
+                    let text = "";
+                    let refusal = "";
+                    const toolCalls = [];
+                    let model;
+                    for await (const chunk of stream) {
+                        const choice = chunk.choices?.[0];
+                        if (!model) {
+                            model = chunk.model;
+                            controller.enqueue({
+                                delta: {
+                                    json: {
+                                        model,
+                                    },
+                                },
+                            });
+                        }
+                        if (choice?.delta.tool_calls?.length) {
+                            for (const call of choice.delta.tool_calls) {
+                                if (this.supportsToolStreaming && call.index !== undefined) {
+                                    handleToolCallDelta(toolCalls, call);
+                                }
+                                else {
+                                    handleCompleteToolCall(toolCalls, call);
+                                }
+                            }
+                        }
+                        if (choice?.delta.content) {
+                            text += choice.delta.content;
+                            if (!jsonMode) {
+                                controller.enqueue({
+                                    delta: {
+                                        text: {
+                                            text: choice.delta.content,
+                                        },
+                                    },
+                                });
+                            }
+                        }
+                        if (choice?.delta.refusal) {
+                            refusal += choice.delta.refusal;
+                            if (!jsonMode) {
+                                controller.enqueue({
+                                    delta: {
+                                        text: { text: choice.delta.refusal },
+                                    },
+                                });
+                            }
+                        }
+                        if (chunk.usage) {
+                            controller.enqueue({
+                                delta: {
+                                    json: {
+                                        usage: {
+                                            inputTokens: chunk.usage.prompt_tokens,
+                                            outputTokens: chunk.usage.completion_tokens,
+                                        },
+                                    },
+                                },
+                            });
+                        }
+                    }
+                    text = text || refusal;
+                    if (jsonMode && text) {
+                        controller.enqueue({
+                            delta: {
+                                json: {
+                                    json: parseJSON(text),
+                                },
+                            },
+                        });
+                    }
+                    if (toolCalls.length) {
+                        controller.enqueue({
+                            delta: {
+                                json: {
+                                    toolCalls: toolCalls.map(({ args, ...c }) => ({
+                                        ...c,
+                                        function: { ...c.function, arguments: parseJSON(args) },
+                                    })),
+                                },
+                            },
+                        });
+                    }
+                    controller.close();
+                }
+                catch (error) {
+                    controller.error(error);
+                }
+            },
+        });
+        return streaming ? result : await agentResponseStreamToObject(result);
     }
 }
 export const ROLE_MAP = {
@@ -235,103 +332,6 @@ export function jsonSchemaToOpenAIJsonSchema(schema) {
     }
     return schema;
 }
-async function extractResultFromStream(stream, jsonMode, streaming) {
-    const result = new ReadableStream({
-        async start(controller) {
-            try {
-                let text = "";
-                let refusal = "";
-                const toolCalls = [];
-                let model;
-                for await (const chunk of stream) {
-                    const choice = chunk.choices?.[0];
-                    if (!model) {
-                        model = chunk.model;
-                        controller.enqueue({
-                            delta: {
-                                json: {
-                                    model,
-                                },
-                            },
-                        });
-                    }
-                    if (choice?.delta.tool_calls?.length) {
-                        for (const call of choice.delta.tool_calls) {
-                            // Gemini not support tool call delta
-                            if (call.index !== undefined) {
-                                handleToolCallDelta(toolCalls, call);
-                            }
-                            else {
-                                handleCompleteToolCall(toolCalls, call);
-                            }
-                        }
-                    }
-                    if (choice?.delta.content) {
-                        text += choice.delta.content;
-                        if (!jsonMode) {
-                            controller.enqueue({
-                                delta: {
-                                    text: {
-                                        text: choice.delta.content,
-                                    },
-                                },
-                            });
-                        }
-                    }
-                    if (choice?.delta.refusal) {
-                        refusal += choice.delta.refusal;
-                        if (!jsonMode) {
-                            controller.enqueue({
-                                delta: {
-                                    text: { text: choice.delta.refusal },
-                                },
-                            });
-                        }
-                    }
-                    if (chunk.usage) {
-                        controller.enqueue({
-                            delta: {
-                                json: {
-                                    usage: {
-                                        inputTokens: chunk.usage.prompt_tokens,
-                                        outputTokens: chunk.usage.completion_tokens,
-                                    },
-                                },
-                            },
-                        });
-                    }
-                }
-                text = text || refusal;
-                if (jsonMode && text) {
-                    controller.enqueue({
-                        delta: {
-                            json: {
-                                json: parseJSON(text),
-                            },
-                        },
-                    });
-                }
-                if (toolCalls.length) {
-                    controller.enqueue({
-                        delta: {
-                            json: {
-                                toolCalls: toolCalls.map(({ args, ...c }) => ({
-                                    ...c,
-                                    function: { ...c.function, arguments: parseJSON(args) },
-                                })),
-                            },
-                        },
-                    });
-                }
-                controller.close();
-            }
-            catch (error) {
-                controller.error(error);
-            }
-        },
-    });
-    return streaming ? result : await agentResponseStreamToObject(result);
-}
 function handleToolCallDelta(toolCalls, call) {
     toolCalls[call.index] ??= {
         id: call.id || nanoid(),

package/lib/esm/prompt/prompt-builder.d.ts

@@ -2,7 +2,7 @@ import type { GetPromptResult } from "@modelcontextprotocol/sdk/types.js";
 import { Agent, type Message } from "../agents/agent.js";
 import type { AIAgent } from "../agents/ai-agent.js";
 import type { AgentMemory } from "../agents/memory.js";
-import type { Context } from "../execution-engine/context.js";
+import type { Context } from "../aigne/context.js";
 import type { ChatModel, ChatModelInput } from "../models/chat-model.js";
 import { ChatMessagesTemplate } from "./template.js";
 export declare const MESSAGE_KEY = "$message";