my-ai-chat-framework 2.7.0 → 4.0.0

package/src/adapters/openai.js

@@ -5,32 +5,68 @@
 
 import { joinUrl } from "../utils/url.js";
 import { isString } from "../utils/typeCheck.js";
-import { APIError, NetworkError, ParsingError } from '../core/Errors.js';
+import { APIError, NetworkError, ParsingError, ConfigurationError } from '../core/Errors.js';
 import { MessageFormatter } from '../utils/MessageFormatter.js';
 
+// 属于"运输层"的配置键：工厂实例持有，请求时覆盖 config 中同名项
+const TRANSPORT_KEYS = ['apiKey', 'baseUrl', 'apiUrl', 'path', 'headers'];
+
 export const openaiAdapter = {
   name: 'openai',
 
-  install(chatService) {
+  /**
+   * 安装适配器。
+   * - 单例（openaiAdapter）：options 无意义，配置从 chat.config 读取（平铺兼容路径）
+   * - 工厂实例（createOpenAIAdapter）：options 并入实例自持的运输配置
+   */
+  install(chatService, options = {}) {
+    if (this._transport) this._transport = { ...this._transport, ...options };
     chatService.setAdapter(this);
   },
 
+  /**
+   * 实例自持配置（运输层）覆盖调用方传入的 config 同名项。
+   * modelParams 特殊处理：深度合并（config 优先，transport 兜底）——
+   * 避免工厂实例的默认参数覆盖掉会话/请求级覆盖。
+   */
+  _resolveConfig(config) {
+    const transport = this._transport || {};
+    const resolved = { ...config, ...transport };
+    if (transport.modelParams) {
+      resolved.modelParams = { ...transport.modelParams, ...(config.modelParams || {}) };
+    }
+    return resolved;
+  },
+
+  /** 工厂实例可提供给会话层的"请求默认参数"（非运输键的部分） */
+  getRequestDefaults() {
+    if (!this._transport) return {};
+    const defaults = {};
+    for (const [key, value] of Object.entries(this._transport)) {
+      if (!TRANSPORT_KEYS.includes(key) && value !== undefined) defaults[key] = value;
+    }
+    return defaults;
+  },
+
   /**
    * 构建 OpenAI 格式的请求体
    * @param {Array} messages - 内部消息列表
-   * @param {Object} config - 完整配置对象
+   * @param {Object} config - 合并后的请求参数（含 model/temperature 等）
    * @param {Array} [systemPrompts=[]] - 启用的 system prompt 列表
    * @returns {Object} 请求体
    */
   buildRequest(messages, config, systemPrompts = []) {
+    config = this._resolveConfig(config);
     const model = config.model || config.modelParams?.model;
     if (!model) {
-      throw new Error('Missing required config: model (either at top level or in modelParams)');
+      throw new ConfigurationError('Missing required config: model (either at top level or in modelParams)');
     }
 
-    const temperature = config.modelParams?.temperature ?? config.temperature ?? 0.7;
-    const maxTokens = config.modelParams?.maxTokens ?? config.maxTokens ?? 2000;
-    const reasoningEffort = config.modelParams?.reasoningEffort ?? config.reasoningEffort;
+    const mp = config.modelParams || {};
+    // v4.0：**不再提供默认值** —— 没传就不放进请求体，由 API 用自己的默认
+    const temperature = mp.temperature ?? config.temperature;
+    const maxTokens = mp.maxTokens ?? config.maxTokens;
+    const reasoningEffort = mp.reasoningEffort ?? config.reasoningEffort;
 
     // 用 MessageFormatter 统一处理：system 置顶、消息过滤、字段映射、图片解析
     // format 由 config.messageFormat 指定（默认 'openai'）
@@ -45,20 +81,42 @@ export const openaiAdapter = {
     const requestBody = {
       model,
       messages: apiMessages,
-      temperature,
-      max_tokens: maxTokens,
       stream: false
     };
 
+    // v4.0：可选参数只在"显式传了"时才放进请求体（不替使用者决定要什么默认值）
+    if (temperature !== undefined) requestBody.temperature = temperature;
+    if (maxTokens !== undefined) requestBody.max_tokens = maxTokens;
+
+    // 硬编码常用参数：驼峰命名，适配器负责转 API 格式
+    if (mp.topP !== undefined) requestBody.top_p = mp.topP;
+    if (mp.frequencyPenalty !== undefined) requestBody.frequency_penalty = mp.frequencyPenalty;
+    if (mp.presencePenalty !== undefined) requestBody.presence_penalty = mp.presencePenalty;
+    if (mp.stop !== undefined) requestBody.stop = mp.stop;
+    if (mp.responseFormat !== undefined) requestBody.response_format = mp.responseFormat;
+    if (mp.seed !== undefined) requestBody.seed = mp.seed;
+
     if (config.tools && Array.isArray(config.tools) && config.tools.length > 0) {
       requestBody.tools = config.tools;
       requestBody.tool_choice = 'auto';
     }
 
-    if (reasoningEffort && model === 'deepseek-reasoner') {
+    if (reasoningEffort !== undefined) {
       requestBody.reasoning_effort = reasoningEffort;
     }
 
+    // modelParams 中未被硬编码处理的字段，透传到请求体
+    const consumedKeys = new Set([
+      'model', 'temperature', 'maxTokens', 'reasoningEffort',
+      'topP', 'frequencyPenalty', 'presencePenalty',
+      'stop', 'responseFormat', 'seed'
+    ]);
+    for (const [key, value] of Object.entries(mp)) {
+      if (!consumedKeys.has(key) && value !== undefined) {
+        requestBody[key] = value;
+      }
+    }
+
     return requestBody;
   },
 
@@ -93,6 +151,7 @@ export const openaiAdapter = {
    */
   async send(requestBody, config, options = {}) {
     try {
+      config = this._resolveConfig(config);
       const url = this._getUrl(config);
 
       const headers = {
@@ -156,6 +215,7 @@ export const openaiAdapter = {
    * @param {Object} [options] — { signal, headers: {...} }
    */
   async stream(requestBody, config, onProgress, onDone, options = {}) {
+    config = this._resolveConfig(config);
     const streamBody = { ...requestBody, stream: true };
     const url = this._getUrl(config);
     let response;
@@ -205,20 +265,37 @@ export const openaiAdapter = {
       const { done, value } = await reader.read();
       if (done) break;
       buffer += decoder.decode(value, { stream: true });
-      const lines = buffer.split(/\n\n/);
-      buffer = lines.pop();
 
-      for (const line of lines) {
-        const dataLine = line.replace(/^data: /, '').trim();
-        if (!dataLine) continue;
-        if (dataLine === '[DONE]') { reachedDone = true; break; }
+      // ===== v4.0：稳健的 SSE 事件解析 =====
+      // 支持：\r\n 换行、`data:`（无空格）、多行 data（按 SSE 规范用 \n 连接）、注释行
+      let sepMatch;
+      const EVENT_SEP = /\r?\n\r?\n/;
+      while ((sepMatch = EVENT_SEP.exec(buffer)) !== null) {
+        const rawEvent = buffer.slice(0, sepMatch.index);
+        buffer = buffer.slice(sepMatch.index + sepMatch[0].length);
+
+        const dataPayload = rawEvent
+          .split(/\r?\n/)
+          .filter(l => l.startsWith('data:'))
+          .map(l => l.slice(5).replace(/^ /, ''))
+          .join('\n');
+        if (!dataPayload) continue;
+        if (dataPayload.trim() === '[DONE]') { reachedDone = true; break; }
+
         try {
-          const chunk = JSON.parse(dataLine);
+          const chunk = JSON.parse(dataPayload);
           const delta = chunk.choices?.[0]?.delta;
           if (!delta) continue;
 
-          if (delta.content) accumulated.content += delta.content;
+          // v4.0：本次 chunk 的"增量"（onProgress 第二个参数）
+          const deltaInfo = { content: '', reasoningContent: '', toolCalls: null };
+
+          if (delta.content) {
+            accumulated.content += delta.content;
+            deltaInfo.content = delta.content;
+          }
           if (delta.tool_calls) {
+            const newCalls = [];
             if (!accumulated.toolCalls) accumulated.toolCalls = [];
             for (const toolCallDelta of delta.tool_calls) {
               const index = toolCallDelta.index;
@@ -237,16 +314,22 @@ export const openaiAdapter = {
               if (toolCallDelta.function?.arguments) {
                 accumulated.toolCalls[index].function.arguments += toolCallDelta.function.arguments;
               }
+              newCalls.push({ index, delta: toolCallDelta });
             }
+            deltaInfo.toolCalls = newCalls;
+          }
+          if (delta.reasoning_content) {
+            accumulated.reasoningContent += delta.reasoning_content;
+            deltaInfo.reasoningContent = delta.reasoning_content;
           }
-          if (delta.reasoning_content) accumulated.reasoningContent += delta.reasoning_content;
 
-          // 传出累积快照，ChatService 自行处理占位消息更新
-          onProgress({ ...accumulated });
+          // onProgress(snap, delta)：snap = 全量累积快照；delta = 本次新增片段
+          onProgress({ ...accumulated }, deltaInfo);
         } catch (e) {
-          console.warn('stream parsing failed :', e, dataLine);
+          console.warn('stream parsing failed :', e, dataPayload);
         }
       }
+      if (reachedDone) break;
     }
 
     const finalMessage = {
@@ -277,4 +360,22 @@ export const openaiAdapter = {
     throw new APIError(errorMessage, response.status, null, errorText);
   }
 
-};
+};
+
+/**
+ * 创建 OpenAI 兼容适配器实例（工厂）。
+ *
+ * 与单例 openaiAdapter 的区别：每个实例自持一份运输配置（apiKey/baseUrl/apiUrl/path/headers），
+ * 互不干扰——解决"同一适配器装到多个 ChatService 互相覆盖"的单例陷阱。
+ *
+ * 用法：
+ *   const adapter = createOpenAIAdapter({ apiKey, baseUrl, modelParams: { temperature: 0.8 } });
+ *   const chat = new ChatService({ adapter, model: 'deepseek-chat' });
+ *   chat.use(adapter);  // 或直接 new ChatService({ adapter })
+ *
+ * 非运输键（model/modelParams/messageFormat/resolveImage/capabilities 等）会作为
+ * "请求默认参数"供会话层合并，单次请求仍可覆盖。
+ */
+export function createOpenAIAdapter(options = {}) {
+  return { ...openaiAdapter, _transport: { ...options } };
+}