@nickyzj2023/ai 1.4.4 → 1.6.0

package/dist/index.d.mts

@@ -1,206 +1,21 @@
-import { Client } from "@modelcontextprotocol/sdk/client";
-//#region src/types.d.ts
-type Model = {
-  baseUrl: string;
-  /** 如果不传，会尝试使用GET {baseUrl}/models获取到的第一个模型 */
-  model?: string;
-  /** 使用本地llama.cpp等服务时可以不填 */
-  apiKey?: string;
-  /**
-   * 模型支持的消息输入类型
-   * @default ["text"]
-   * @remarks 会在每轮对话前校验消息类型，存在不支持的输入时报错
-   */
-  modalities?: Modality[];
-  /**
-   * 模型的最大上下文
-   * @default 131072
-   * @remarks 会在每轮对话结束后检查上下文阈值，自动压缩消息
-   */
-  context?: number;
-  /**
-   * 自定义请求体，会在每轮请求时带上
-   * @example chat_template_kwargs: { enable_thinking: false }
-   */
-  [key: string]: unknown;
-};
-/** 文/图/音/视频，暂未实现文件输入 */
-type Modality = "text" | "image" | "audio" | "video";
-type Message = {
-  role: "system" | "user" | "assistant" | "tool";
-  reasoning?: string | null;
-  content: string | ContentPart[];
-  tool_calls?: ToolCall[];
-  tool_call_id?: string;
-  [key: string]: unknown;
-};
-type ContentPart = TextContent | ImageContent | AudioContent | VideoContent;
-type TextContent = {
-  type: "text";
-  text: string;
-};
-type ImageContent = {
-  type: "image_url";
-  image_url: {
-    url: string;
-  };
-};
-type AudioContent = {
-  type: "input_audio";
-  input_audio: {
-    /** 使用公网可访问的音频链接 */
-    url?: string;
-    /** 使用base64 */
-    data?: string;
-    format: string;
-  };
-};
-type VideoContent = {
-  type: "video_url";
-  video_url: {
-    url: string;
-  };
-};
-type ToolDefinition = {
-  type: "function";
-  function: {
-    name: string;
-    description: string;
-    parameters: {
-      type: "object";
-      properties: Record<string, {
-        type: string;
-        description?: string;
-        /** defineTool()提供的语法糖，等价于在parameters.required.push(当前property key) */
-        required?: boolean;
-      }>;
-      required?: string[];
-    };
-  };
-  /** 工具的实际执行函数 */
-  execute: (...args: any) => any;
-};
-type ToolCall = {
-  id: string;
-  type: "function";
-  function: {
-    name: string;
-    arguments: string;
-  };
-};
-/** stream()对外输出的事件 */
-type LLMEvent = {
-  type: "reasoning_delta";
-  delta: string;
-} | {
-  type: "content_delta";
-  delta: string;
-} | {
-  type: "tool_call";
-  id: string;
-  name: string;
-  args: any;
-} | {
-  type: "done";
-  finishReason: FinishReason;
-  usage?: Usage;
-} | {
-  type: "error";
-  message: string;
-};
-/** stream()内部要处理的事件流 */
-type ChatCompletionsChunk = {
-  id: string;
-  object: "chat.completion.chunk";
-  created: number;
-  model: string;
-  choices: {
-    index: number;
-    delta: Pick<Message, "reasoning" | "content"> & {
-      tool_calls?: ({
-        index: number;
-      } & Partial<ToolCall>)[];
-    };
-    finish_reason: FinishReason;
-  }[];
-  usage?: Usage;
-} | "[DONE]";
-/** 模型可能返回的finish_reason值：停止/工具调用/上下文超限 */
-type FinishReason = "stop" | "tool_calls" | "length" | null;
-type Usage = {
-  prompt_tokens: number;
-  completion_tokens: number;
-  total_tokens: number;
-  [key: string]: any;
-};
-type AgentEvent = LLMEvent | {
-  type: "tool_result";
-  id: string;
-  name: string;
-  result: string;
-};
-//#endregion
+import { a as FinishReason, c as Message, d as TextContent, f as ToolCall, h as VideoContent, i as ContentPart, l as Modality, m as Usage, n as AudioContent, o as ImageContent, p as ToolDefinition, r as ChatCompletionsChunk, s as LLMEvent, t as AgentEvent, u as Model } from "./types--dXFoUow.mjs";
 //#region src/agent.d.ts
 declare function runAgent(model: Model, messages: Message[], tools: ToolDefinition[]): AsyncGenerator<AgentEvent>;
 //#endregion
+//#region src/llm.d.ts
+/**
+ * 流式请求模型，转发
+ */
+declare function stream(model: Model, messages: Message[], tools?: ToolDefinition[], options?: Omit<RequestInit, "body"> & {
+  body?: Record<string, unknown>;
+}): AsyncGenerator<LLMEvent>;
+//#endregion
 //#region src/tools/get-time.d.ts
 declare const _default: ToolDefinition;
 //#endregion
 //#region src/tools/get-weather.d.ts
 declare const _default$1: ToolDefinition;
 //#endregion
-//#region src/tools/mcp.d.ts
-type McpServer = {
-  type: "streamable_http" | "sse";
-  url: string;
-  headers?: Record<string, any>;
-  ignoredToolNames?: string[];
-};
-declare class MCPRouter {
-  private entries;
-  /** 注册一个新的MCP客户端 */
-  addClient(name: string, url: string, options?: Omit<McpServer, "type" | "url">): Promise<Client<{
-    method: string;
-    params?: {
-      [x: string]: unknown;
-      _meta?: {
-        [x: string]: unknown;
-        progressToken?: string | number | undefined;
-        "io.modelcontextprotocol/related-task"?: {
-          taskId: string;
-        } | undefined;
-      } | undefined;
-    } | undefined;
-  }, {
-    method: string;
-    params?: {
-      [x: string]: unknown;
-      _meta?: {
-        [x: string]: unknown;
-        progressToken?: string | number | undefined;
-        "io.modelcontextprotocol/related-task"?: {
-          taskId: string;
-        } | undefined;
-      } | undefined;
-    } | undefined;
-  }, {
-    [x: string]: unknown;
-    _meta?: {
-      [x: string]: unknown;
-      progressToken?: string | number | undefined;
-      "io.modelcontextprotocol/related-task"?: {
-        taskId: string;
-      } | undefined;
-    } | undefined;
-  }> | undefined>;
-  /** 返回OpenAI API兼容的tools数组 */
-  getTools(): Promise<ToolDefinition[]>;
-}
-/**
- * 把传入的MCPServer列表转换成OpenAI API兼容的tools数组
- */
-declare const loadMCPTools: (mcpServers?: Record<string, McpServer>) => Promise<ToolDefinition[]>;
-//#endregion
 //#region src/utils/compact/types.d.ts
 declare namespace Compact {
   type Options = {
@@ -249,12 +64,21 @@ declare namespace Compact {
      */
     summarizeOptions?: Partial<Compact.SummarizeOptions>;
   };
-  type ReplacerOfToolResultContent = (content: Message["content"], options?: Record<string, any>) => Promise<string> | string;
-  type ReplacerOfMediaContent = (content: Message["content"], options?: Record<string, any>) => Promise<string> | string;
+  type ReplacerOfToolResultContent = (content: Message["content"], options?: {
+    model?: Model;
+    [key: string]: any;
+  }) => Promise<string> | string;
+  type ReplacerOfMediaContent = (content: Message["content"], options?: {
+    model?: Model;
+    modality?: Modality;
+    [key: string]: any;
+  }) => Promise<string> | string;
   type SummarizeOptions = {
     /** 指导大模型如何总结消息 */
     systemPrompt: string;
     model: Model;
+    /** 触发总结前的钩子 */
+    beforeSummarize?: (summarizable: Message[]) => void | Promise<void>;
   };
   type Result = {
     /** 是否压缩了工具调用结果 */
@@ -312,5 +136,13 @@ declare const defineModel: (config: Model) => Model;
  * @param execute 实际执行工具的函数
  */
 declare const defineTool: (name: ToolDefinition["function"]["name"], description: ToolDefinition["function"]["description"], properties: ToolDefinition["function"]["parameters"]["properties"], execute: ToolDefinition["execute"]) => ToolDefinition;
+declare const estimateTextTokens: (text: string) => number;
+/**
+ * 根据上下文里的中/英文/多模态消息，估算出可能消耗的token
+ * - 单词 ≈ 1.5token
+ * - 标点/空白等非词字符每4个 ≈ 1token
+ * - 图片/音频/视频/文件 ≈ 4096token（不好估算，取个较大的值）
+ */
+declare const estimateTokens: (messages?: Message[]) => number;
 //#endregion
-export { type AgentEvent, type AudioContent, type ChatCompletionsChunk, type ContentPart, type FinishReason, type ImageContent, type LLMEvent, MCPRouter, McpServer, type Message, type Modality, type Model, type TextContent, type ToolCall, type ToolDefinition, type Usage, type VideoContent, compact, defineModel, defineTool, _default as getTime, _default$1 as getWeather, loadMCPTools, runAgent };
+export { type AgentEvent, type AudioContent, type ChatCompletionsChunk, type ContentPart, type FinishReason, type ImageContent, type LLMEvent, type Message, type Modality, type Model, type TextContent, type ToolCall, type ToolDefinition, type Usage, type VideoContent, compact, defineModel, defineTool, estimateTextTokens, estimateTokens, _default as getTime, _default$1 as getWeather, runAgent, stream };

package/dist/index.mjs

@@ -1,2 +1,3 @@
-import { a as get_time_default, c as runAgent, i as get_weather_default, n as MCPRouter, o as defineModel, r as loadMCPTools, s as defineTool, t as compact } from "./src-CuZ-6Jye.mjs";
-export { MCPRouter, compact, defineModel, defineTool, get_time_default as getTime, get_weather_default as getWeather, loadMCPTools, runAgent };
+import { a as stream, i as runAgent, n as get_weather_default, r as get_time_default, t as compact } from "./src-CKKPKPMG.mjs";
+import { i as estimateTokens, n as defineTool, r as estimateTextTokens, t as defineModel } from "./helper-juLVGxlQ.mjs";
+export { compact, defineModel, defineTool, estimateTextTokens, estimateTokens, get_time_default as getTime, get_weather_default as getWeather, runAgent, stream };

package/dist/mcp-DcntQg-a.mjs

@@ -0,0 +1,58 @@
+import { n as defineTool } from "./helper-juLVGxlQ.mjs";
+import { extractErrorMessage, isObject, logger, omit } from "@nickyzj2023/utils";
+//#region src/tools/mcp.ts
+/** 全局单例MCP加载器 */
+let router = null;
+var MCPRouter = class {
+	entries = /* @__PURE__ */ new Map();
+	/** 注册一个新的MCP客户端 */
+	async addClient(name, url, options) {
+		if (this.entries.has(name)) return;
+		const [{ Client }, { StreamableHTTPClientTransport }] = await Promise.all([import("@modelcontextprotocol/sdk/client"), import("@modelcontextprotocol/sdk/client/streamableHttp.js")]);
+		const transport = new StreamableHTTPClientTransport(new URL(url), { requestInit: { headers: options?.headers } });
+		const client = new Client({
+			name,
+			version: "1.0.0"
+		});
+		await client.connect(transport);
+		const { tools } = await client.listTools();
+		const normalizedTools = tools.filter((tool) => !options?.ignoredToolNames?.includes(tool.name)).map((tool) => {
+			const _properties = { ...tool.inputSchema.properties ?? {} };
+			tool.inputSchema.required?.forEach((key) => {
+				if (isObject(_properties[key])) _properties[key] = {
+					..._properties[key],
+					required: true
+				};
+			});
+			return defineTool(tool.name, tool.description ?? "", _properties, (args) => client.callTool({
+				name: tool.name,
+				arguments: args
+			}));
+		});
+		this.entries.set(name, {
+			client,
+			tools: normalizedTools
+		});
+		return client;
+	}
+	/** 返回OpenAI API兼容的tools数组 */
+	async getTools() {
+		return [...this.entries.values()].flatMap((e) => e.tools);
+	}
+};
+/**
+* 把传入的MCPServer列表转换成OpenAI API兼容的tools数组
+*/
+const loadMCPTools = async (mcpServers = {}) => {
+	router ||= new MCPRouter();
+	await Promise.allSettled(Object.entries(mcpServers).map(async ([name, server]) => {
+		try {
+			await router?.addClient(name, server.url, omit(server, ["type", "url"]));
+		} catch (e) {
+			logger(`MCP服务器${name}加载失败：${extractErrorMessage(e)}`);
+		}
+	}));
+	return router.getTools();
+};
+//#endregion
+export { loadMCPTools as n, MCPRouter as t };