plugin-custom-llm 1.2.3 → 1.3.1

package/dist/server/llm-providers/custom-llm.js

@@ -58,6 +58,95 @@ function getChatOpenAI() {
   }
   return _ChatOpenAI;
 }
+let _ChatOpenAICompletions = null;
+function getChatOpenAICompletions() {
+  if (!_ChatOpenAICompletions) {
+    const mod = requireFromApp("@langchain/openai");
+    _ChatOpenAICompletions = mod.ChatOpenAICompletions;
+  }
+  return _ChatOpenAICompletions;
+}
+function sanitizeToolCallId(id) {
+  if (!id || typeof id !== "string") return id;
+  const idx = id.indexOf("__thought__");
+  return idx !== -1 ? id.substring(0, idx) : id;
+}
+function getToolCallsKey(toolCalls = []) {
+  return toolCalls.map((tc) => {
+    var _a;
+    const id = (tc == null ? void 0 : tc.id) ?? "";
+    const name = (tc == null ? void 0 : tc.name) ?? ((_a = tc == null ? void 0 : tc.function) == null ? void 0 : _a.name) ?? "";
+    return `${id}:${name}`;
+  }).join("|");
+}
+function collectReasoningMap(messages) {
+  var _a, _b, _c, _d;
+  const reasoningMap = /* @__PURE__ */ new Map();
+  for (const message of messages ?? []) {
+    if (((_a = message == null ? void 0 : message.getType) == null ? void 0 : _a.call(message)) !== "ai" && ((_b = message == null ? void 0 : message._getType) == null ? void 0 : _b.call(message)) !== "ai") continue;
+    if (!((_c = message == null ? void 0 : message.tool_calls) == null ? void 0 : _c.length)) continue;
+    const reasoningContent = (_d = message == null ? void 0 : message.additional_kwargs) == null ? void 0 : _d.reasoning_content;
+    if (typeof reasoningContent !== "string" || !reasoningContent) continue;
+    const key = getToolCallsKey(message.tool_calls);
+    if (key) reasoningMap.set(key, reasoningContent);
+  }
+  return reasoningMap;
+}
+function patchRequestMessagesReasoning(request, reasoningMap) {
+  if (!(reasoningMap == null ? void 0 : reasoningMap.size) || !Array.isArray(request == null ? void 0 : request.messages)) return;
+  const lastMsg = request.messages.at(-1);
+  if ((lastMsg == null ? void 0 : lastMsg.role) !== "tool") return;
+  for (const msg of request.messages) {
+    if ((msg == null ? void 0 : msg.role) !== "assistant") continue;
+    if (!Array.isArray(msg.tool_calls) || msg.tool_calls.length === 0) continue;
+    if (msg.reasoning_content) continue;
+    const key = getToolCallsKey(msg.tool_calls);
+    const rc = key ? reasoningMap.get(key) : void 0;
+    if (rc) msg.reasoning_content = rc;
+  }
+}
+const REASONING_MAP_KEY = "__nb_reasoning_map";
+function createReasoningChatClass() {
+  const ChatOpenAICompletions = getChatOpenAICompletions();
+  if (!ChatOpenAICompletions) {
+    return getChatOpenAI();
+  }
+  return class ReasoningChatOpenAI extends ChatOpenAICompletions {
+    async _generate(messages, options, runManager) {
+      const reasoningMap = collectReasoningMap(messages);
+      return super._generate(messages, { ...options || {}, [REASONING_MAP_KEY]: reasoningMap }, runManager);
+    }
+    async *_streamResponseChunks(messages, options, runManager) {
+      const reasoningMap = (options == null ? void 0 : options[REASONING_MAP_KEY]) instanceof Map ? options[REASONING_MAP_KEY] : collectReasoningMap(messages);
+      yield* super._streamResponseChunks(messages, { ...options || {}, [REASONING_MAP_KEY]: reasoningMap }, runManager);
+    }
+    _convertCompletionsDeltaToBaseMessageChunk(delta, rawResponse, defaultRole) {
+      const messageChunk = super._convertCompletionsDeltaToBaseMessageChunk(delta, rawResponse, defaultRole);
+      if (delta == null ? void 0 : delta.reasoning_content) {
+        messageChunk.additional_kwargs = {
+          ...messageChunk.additional_kwargs || {},
+          reasoning_content: delta.reasoning_content
+        };
+      }
+      return messageChunk;
+    }
+    _convertCompletionsMessageToBaseMessage(message, rawResponse) {
+      const langChainMessage = super._convertCompletionsMessageToBaseMessage(message, rawResponse);
+      if (message == null ? void 0 : message.reasoning_content) {
+        langChainMessage.additional_kwargs = {
+          ...langChainMessage.additional_kwargs || {},
+          reasoning_content: message.reasoning_content
+        };
+      }
+      return langChainMessage;
+    }
+    async completionWithRetry(request, requestOptions) {
+      const reasoningMap = requestOptions == null ? void 0 : requestOptions[REASONING_MAP_KEY];
+      patchRequestMessagesReasoning(request, reasoningMap);
+      return super.completionWithRetry(request, requestOptions);
+    }
+  };
+}
 let _ChatGenerationChunk = null;
 function getChatGenerationChunk() {
   if (!_ChatGenerationChunk) {
@@ -150,12 +239,25 @@ function getByPath(obj, dotPath) {
   }
   return current;
 }
-function createMappingFetch(responseMapping) {
+function createMappingFetch(responseMapping, timeoutMs) {
   const contentPath = responseMapping.content;
   if (!contentPath) return void 0;
+  const toolCallsPath = responseMapping.tool_calls;
+  const finishReasonPath = responseMapping.finish_reason;
   return async (url, init) => {
     var _a, _b;
-    const response = await fetch(url, init);
+    let response;
+    if (timeoutMs && timeoutMs > 0) {
+      const controller = new AbortController();
+      const timer = setTimeout(() => controller.abort(), timeoutMs);
+      try {
+        response = await fetch(url, { ...init, signal: controller.signal });
+      } finally {
+        clearTimeout(timer);
+      }
+    } else {
+      response = await fetch(url, init);
+    }
     if (!response.ok) return response;
     const contentType = response.headers.get("content-type") || "";
     if (contentType.includes("text/event-stream") || ((_a = init == null ? void 0 : init.headers) == null ? void 0 : _a["Accept"]) === "text/event-stream") {
@@ -186,17 +288,28 @@ function createMappingFetch(responseMapping) {
                   try {
                     const parsed = JSON.parse(data);
                     const mappedContent = getByPath(parsed, contentPath);
-                    if (mappedContent !== void 0) {
+                    const mappedToolCalls = toolCallsPath ? getByPath(parsed, toolCallsPath) : getByPath(parsed, "choices.0.delta.tool_calls") ?? getByPath(parsed, "delta.tool_calls");
+                    const mappedFinishReason = finishReasonPath ? getByPath(parsed, finishReasonPath) : getByPath(parsed, "choices.0.finish_reason") ?? getByPath(parsed, "finish_reason");
+                    if (mappedContent !== void 0 || mappedToolCalls) {
+                      const delta = { role: "assistant" };
+                      if (mappedContent !== void 0) {
+                        delta.content = String(mappedContent);
+                      }
+                      if (mappedToolCalls) {
+                        delta.tool_calls = mappedToolCalls;
+                      }
                       const mapped = {
                         id: getByPath(parsed, responseMapping.id || "id") || "chatcmpl-custom",
                         object: "chat.completion.chunk",
                         created: Math.floor(Date.now() / 1e3),
                         model: "custom",
-                        choices: [{
-                          index: 0,
-                          delta: { content: String(mappedContent), role: "assistant" },
-                          finish_reason: null
-                        }]
+                        choices: [
+                          {
+                            index: 0,
+                            delta,
+                            finish_reason: mappedFinishReason ?? null
+                          }
+                        ]
                       };
                       controller.enqueue(encoder.encode(`data: ${JSON.stringify(mapped)}
 
@@ -228,21 +341,33 @@ function createMappingFetch(responseMapping) {
     if (contentType.includes("application/json")) {
       const body = await response.json();
       const mappedContent = getByPath(body, contentPath);
-      if (mappedContent !== void 0) {
+      const mappedToolCalls = toolCallsPath ? getByPath(body, toolCallsPath) : getByPath(body, "choices.0.message.tool_calls") ?? getByPath(body, "message.tool_calls");
+      const mappedFinishReason = finishReasonPath ? getByPath(body, finishReasonPath) : getByPath(body, "choices.0.finish_reason") ?? getByPath(body, "finish_reason");
+      if (mappedContent !== void 0 || mappedToolCalls) {
+        const message = {
+          role: getByPath(body, responseMapping.role || "") || "assistant"
+        };
+        if (mappedContent !== void 0) {
+          message.content = String(mappedContent);
+        } else {
+          message.content = null;
+        }
+        if (mappedToolCalls) {
+          message.tool_calls = mappedToolCalls;
+        }
         const mapped = {
           id: getByPath(body, responseMapping.id || "id") || "chatcmpl-custom",
           object: "chat.completion",
           created: Math.floor(Date.now() / 1e3),
           model: "custom",
-          choices: [{
-            index: 0,
-            message: {
-              role: getByPath(body, responseMapping.role || "") || "assistant",
-              content: String(mappedContent)
-            },
-            finish_reason: "stop"
-          }],
-          usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
+          choices: [
+            {
+              index: 0,
+              message,
+              finish_reason: mappedFinishReason ?? (mappedToolCalls ? "tool_calls" : "stop")
+            }
+          ],
+          usage: body.usage ?? { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
         };
         return new Response(JSON.stringify(mapped), {
           status: response.status,
@@ -417,6 +542,45 @@ function fixEmptyToolProperties(model) {
   };
   return model;
 }
+function wrapWithToolCallIdSanitizer(model) {
+  var _a, _b;
+  const originalGenerate = (_a = model._generate) == null ? void 0 : _a.bind(model);
+  if (originalGenerate) {
+    model._generate = async function(...args) {
+      const result = await originalGenerate(...args);
+      for (const gen of (result == null ? void 0 : result.generations) ?? []) {
+        const msg = gen == null ? void 0 : gen.message;
+        if (msg == null ? void 0 : msg.tool_calls) {
+          for (const tc of msg.tool_calls) {
+            tc.id = sanitizeToolCallId(tc.id);
+          }
+        }
+      }
+      return result;
+    };
+  }
+  const streamMethod = typeof model._streamResponseChunks === "function" ? "_streamResponseChunks" : "_stream";
+  const originalStream = (_b = model[streamMethod]) == null ? void 0 : _b.bind(model);
+  if (originalStream) {
+    model[streamMethod] = async function* (...args) {
+      for await (const chunk of originalStream(...args)) {
+        const msg = chunk == null ? void 0 : chunk.message;
+        if (msg == null ? void 0 : msg.tool_call_chunks) {
+          for (const tc of msg.tool_call_chunks) {
+            tc.id = sanitizeToolCallId(tc.id);
+          }
+        }
+        if (msg == null ? void 0 : msg.tool_calls) {
+          for (const tc of msg.tool_calls) {
+            tc.id = sanitizeToolCallId(tc.id);
+          }
+        }
+        yield chunk;
+      }
+    };
+  }
+  return model;
+}
 class CustomLLMProvider extends import_plugin_ai.LLMProvider {
   get baseURL() {
     return null;
@@ -431,7 +595,15 @@ class CustomLLMProvider extends import_plugin_ai.LLMProvider {
   }
   createModel() {
     var _a;
-    const { apiKey, disableStream, timeout, streamKeepAlive, keepAliveIntervalMs, keepAliveContent } = this.serviceOptions || {};
+    const {
+      apiKey,
+      disableStream,
+      timeout,
+      streamKeepAlive,
+      keepAliveIntervalMs,
+      keepAliveContent,
+      enableReasoning
+    } = this.serviceOptions || {};
     const baseURL = (_a = this.serviceOptions) == null ? void 0 : _a.baseURL;
     const { responseFormat } = this.modelOptions || {};
     const reqConfig = this.requestConfig;
@@ -446,7 +618,7 @@ class CustomLLMProvider extends import_plugin_ai.LLMProvider {
     if (reqConfig.extraBody && typeof reqConfig.extraBody === "object") {
       Object.assign(modelKwargs, reqConfig.extraBody);
     }
-    const ChatOpenAI = getChatOpenAI();
+    const ChatClass = enableReasoning ? createReasoningChatClass() : getChatOpenAI();
     const config = {
       apiKey,
       ...this.modelOptions,
@@ -459,18 +631,20 @@ class CustomLLMProvider extends import_plugin_ai.LLMProvider {
     if (disableStream) {
       config.streaming = false;
     }
-    if (timeout && Number(timeout) > 0) {
-      config.timeout = Number(timeout);
-      config.configuration.timeout = Number(timeout);
+    const timeoutMs = timeout && Number(timeout) > 0 ? Number(timeout) : 0;
+    if (timeoutMs) {
+      config.timeout = timeoutMs;
+      config.configuration.timeout = timeoutMs;
     }
     if (reqConfig.extraHeaders && typeof reqConfig.extraHeaders === "object") {
       config.configuration.defaultHeaders = reqConfig.extraHeaders;
     }
     if (resConfig.responseMapping) {
-      config.configuration.fetch = createMappingFetch(resConfig.responseMapping);
+      config.configuration.fetch = createMappingFetch(resConfig.responseMapping, timeoutMs || 12e4);
     }
-    let model = new ChatOpenAI(config);
+    let model = new ChatClass(config);
     model = fixEmptyToolProperties(model);
+    model = wrapWithToolCallIdSanitizer(model);
     if (streamKeepAlive && !disableStream) {
       return wrapWithStreamKeepAlive(model, {
         intervalMs: Number(keepAliveIntervalMs) || 5e3,
@@ -498,15 +672,14 @@ class CustomLLMProvider extends import_plugin_ai.LLMProvider {
       workContext
     };
     if (toolCalls) {
-      content.tool_calls = toolCalls;
+      content.tool_calls = Array.isArray(toolCalls) ? toolCalls.map((tc) => ({ ...tc, id: sanitizeToolCallId(tc.id) })) : toolCalls;
     }
     if (Array.isArray(content.content)) {
       const textBlocks = content.content.filter((block) => block.type === "text");
       content.content = textBlocks.map((block) => block.text).join("") || "";
     }
     if (typeof content.content === "string") {
-      const escapedPrefix = KEEPALIVE_PREFIX.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-      content.content = content.content.replace(new RegExp(escapedPrefix + ".*?(?=" + escapedPrefix + "|$)", "g"), "");
+      content.content = content.content.replaceAll(KEEPALIVE_PREFIX, "");
       content.content = stripToolCallTags(content.content);
     }
     if (((_b = (_a = content.metadata) == null ? void 0 : _a.additional_kwargs) == null ? void 0 : _b.__keepalive) !== void 0) {
@@ -640,10 +813,10 @@ class CustomLLMProvider extends import_plugin_ai.LLMProvider {
    * from DB. Result is cached on `ctx.state._docPixieActive` for the request lifetime.
    */
   async hasDocPixieSkill(ctx) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     if (ctx.state._docPixieActive !== void 0) return ctx.state._docPixieActive;
     try {
-      const employeeUsername = (_c = (_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.values) == null ? void 0 : _c.aiEmployee;
+      const employeeUsername = ((_c = (_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.values) == null ? void 0 : _c.aiEmployee) ?? ((_e = (_d = ctx.action) == null ? void 0 : _d.params) == null ? void 0 : _e.aiEmployee) ?? ((_f = ctx.state) == null ? void 0 : _f.currentAiEmployee);
       if (!employeeUsername) {
         ctx.state._docPixieActive = false;
         return false;
@@ -652,7 +825,7 @@ class CustomLLMProvider extends import_plugin_ai.LLMProvider {
         filter: { username: String(employeeUsername) },
         fields: ["skillSettings"]
       });
-      const skills = ((_e = (_d = employee == null ? void 0 : employee.get) == null ? void 0 : _d.call(employee, "skillSettings")) == null ? void 0 : _e.skills) ?? [];
+      const skills = ((_h = (_g = employee == null ? void 0 : employee.get) == null ? void 0 : _g.call(employee, "skillSettings")) == null ? void 0 : _h.skills) ?? [];
       const has = skills.some((s) => s.name === "docpixie.query.document");
       ctx.state._docPixieActive = has;
       return has;

package/package.json

@@ -1,36 +1,36 @@
-{
-  "name": "plugin-custom-llm",
-  "displayName": "AI LLM: Custom (OpenAI Compatible)",
-  "displayName.zh-CN": "AI LLM：自定义（OpenAI 兼容）",
-  "description": "OpenAI-compatible LLM provider with auto response format detection for external LLM services.",
-  "version": "1.2.3",
-  "main": "dist/server/index.js",
-  "files": [
-    "dist",
-    "client.js",
-    "client.d.ts",
-    "server.js",
-    "server.d.ts",
-    "src"
-  ],
-  "nocobase": {
-    "supportedVersions": [
-      "2.x"
-    ],
-    "editionLevel": 0
-  },
-  "dependencies": {
-    "@langchain/openai": "^1.0.0",
-    "@langchain/core": "^1.0.0"
-  },
-  "peerDependencies": {
-    "@nocobase/client": "2.x",
-    "@nocobase/plugin-ai": "2.x",
-    "@nocobase/server": "2.x",
-    "@nocobase/test": "2.x"
-  },
-  "keywords": [
-    "AI"
-  ],
-  "license": "Apache-2.0"
-}
+{
+  "name": "plugin-custom-llm",
+  "displayName": "AI LLM: Custom (OpenAI Compatible)",
+  "displayName.zh-CN": "AI LLM：自定义（OpenAI 兼容）",
+  "description": "OpenAI-compatible LLM provider with auto response format detection for external LLM services.",
+  "version": "1.3.1",
+  "main": "dist/server/index.js",
+  "files": [
+    "dist",
+    "client.js",
+    "client.d.ts",
+    "server.js",
+    "server.d.ts",
+    "src"
+  ],
+  "nocobase": {
+    "supportedVersions": [
+      "2.x"
+    ],
+    "editionLevel": 0
+  },
+  "dependencies": {
+    "@langchain/openai": "^1.0.0",
+    "@langchain/core": "^1.0.0"
+  },
+  "peerDependencies": {
+    "@nocobase/client": "2.x",
+    "@nocobase/plugin-ai": "2.x",
+    "@nocobase/server": "2.x",
+    "@nocobase/test": "2.x"
+  },
+  "keywords": [
+    "AI"
+  ],
+  "license": "Apache-2.0"
+}

package/src/client/client.d.ts

@@ -7,6 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 // CSS modules
 type CSSModuleClasses = { readonly [key: string]: string };
 

package/src/client/index.tsx

@@ -1,19 +1,28 @@
-import { Plugin } from '@nocobase/client';
-import PluginAIClient from '@nocobase/plugin-ai/client';
-import { customLLMProviderOptions } from './llm-providers/custom-llm';
-
-export class PluginCustomLLMClient extends Plugin {
-  async afterAdd() {}
-
-  async beforeLoad() {}
-
-  async load() {
-    this.aiPlugin.aiManager.registerLLMProvider('custom-llm', customLLMProviderOptions);
-  }
-
-  private get aiPlugin(): PluginAIClient {
-    return this.app.pm.get('ai');
-  }
-}
-
-export default PluginCustomLLMClient;
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin } from '@nocobase/client';
+import PluginAIClient from '@nocobase/plugin-ai/client';
+import { customLLMProviderOptions } from './llm-providers/custom-llm';
+
+export class PluginCustomLLMClient extends Plugin {
+  async afterAdd() {}
+
+  async beforeLoad() {}
+
+  async load() {
+    this.aiPlugin.aiManager.registerLLMProvider('custom-llm', customLLMProviderOptions);
+  }
+
+  private get aiPlugin(): PluginAIClient {
+    return this.app.pm.get('ai');
+  }
+}
+
+export default PluginCustomLLMClient;