@chatluna/v1-shared-adapter 1.0.25 → 1.0.27

package/lib/index.cjs

@@ -197,11 +197,11 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
   for (const rawMessage of messages) {
     const role = messageTypeToOpenAIRole(rawMessage.getType());
     const msg = {
-      content: rawMessage.content,
+      content: rawMessage.content === "" ? null : rawMessage.content,
       name: role === "assistant" || role === "tool" ? rawMessage.name : void 0,
       role,
       //  function_call: rawMessage.additional_kwargs.function_call,
-      tool_call_id: rawMessage.tool_call_id
+      tool_call_id: rawMessage.tool_call_id || void 0
     };
     if (msg.tool_calls == null) {
       delete msg.tool_calls;
@@ -224,7 +224,7 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
     }
     const images = rawMessage.additional_kwargs.images;
     const lowerModel = normalizedModel?.toLowerCase() ?? "";
-    if ((lowerModel?.includes("vision") || lowerModel?.includes("gpt-4o") || lowerModel?.includes("claude") || lowerModel?.includes("gemini") || lowerModel?.includes("qwen-vl") || lowerModel?.includes("omni") || lowerModel?.includes("qwen2.5-vl") || lowerModel?.includes("qwen2.5-omni") || lowerModel?.includes("qwen-omni") || lowerModel?.includes("qwen2-vl") || lowerModel?.includes("qvq") || normalizedModel?.includes("o1") || normalizedModel?.includes("o4") || normalizedModel?.includes("o3") || normalizedModel?.includes("gpt-4.1") || normalizedModel?.includes("gpt-5") || supportImageInput2) && images != null) {
+    if ((lowerModel?.includes("vision") || lowerModel?.includes("gpt-4o") || lowerModel?.includes("claude") || lowerModel?.includes("gemini") || lowerModel?.includes("qwen-vl") || lowerModel?.includes("omni") || lowerModel?.includes("qwen2.5-vl") || lowerModel?.includes("qwen2.5-omni") || lowerModel?.includes("qwen-omni") || lowerModel?.includes("qwen2-vl") || lowerModel?.includes("qwen3.5") || lowerModel?.includes("qvq") || normalizedModel?.includes("o1") || normalizedModel?.includes("o4") || normalizedModel?.includes("o3") || normalizedModel?.includes("gpt-4.1") || normalizedModel?.includes("gpt-5") || supportImageInput2) && images != null) {
       msg.content = [
         {
           type: "text",
@@ -275,6 +275,36 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
     }
     result.push(msg);
   }
+  for (let i = 0; i < result.length; i++) {
+    if (result[i].role !== "assistant") continue;
+    const assistantMsg = result[i];
+    const toolMessages = [];
+    for (let j = i + 1; j < result.length && result[j].role === "tool"; j++) {
+      toolMessages.push(result[j]);
+    }
+    if (toolMessages.length === 0) continue;
+    if (!assistantMsg.tool_calls) {
+      assistantMsg.tool_calls = [];
+    }
+    for (let k = 0; k < toolMessages.length; k++) {
+      if (!assistantMsg.tool_calls[k]) {
+        assistantMsg.tool_calls[k] = {
+          id: `call_${k}`,
+          type: "function",
+          function: {
+            name: toolMessages[k].name || "unknown",
+            arguments: "{}"
+          }
+        };
+      }
+      if (!assistantMsg.tool_calls[k].id) {
+        assistantMsg.tool_calls[k].id = `call_${k}`;
+      }
+      if (!toolMessages[k].tool_call_id) {
+        toolMessages[k].tool_call_id = assistantMsg.tool_calls[k].id;
+      }
+    }
+  }
   if (removeSystemMessage) {
     return transformSystemMessages(result);
   }

package/lib/index.mjs

@@ -161,11 +161,11 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
   for (const rawMessage of messages) {
     const role = messageTypeToOpenAIRole(rawMessage.getType());
     const msg = {
-      content: rawMessage.content,
+      content: rawMessage.content === "" ? null : rawMessage.content,
       name: role === "assistant" || role === "tool" ? rawMessage.name : void 0,
       role,
       //  function_call: rawMessage.additional_kwargs.function_call,
-      tool_call_id: rawMessage.tool_call_id
+      tool_call_id: rawMessage.tool_call_id || void 0
     };
     if (msg.tool_calls == null) {
       delete msg.tool_calls;
@@ -188,7 +188,7 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
     }
     const images = rawMessage.additional_kwargs.images;
     const lowerModel = normalizedModel?.toLowerCase() ?? "";
-    if ((lowerModel?.includes("vision") || lowerModel?.includes("gpt-4o") || lowerModel?.includes("claude") || lowerModel?.includes("gemini") || lowerModel?.includes("qwen-vl") || lowerModel?.includes("omni") || lowerModel?.includes("qwen2.5-vl") || lowerModel?.includes("qwen2.5-omni") || lowerModel?.includes("qwen-omni") || lowerModel?.includes("qwen2-vl") || lowerModel?.includes("qvq") || normalizedModel?.includes("o1") || normalizedModel?.includes("o4") || normalizedModel?.includes("o3") || normalizedModel?.includes("gpt-4.1") || normalizedModel?.includes("gpt-5") || supportImageInput2) && images != null) {
+    if ((lowerModel?.includes("vision") || lowerModel?.includes("gpt-4o") || lowerModel?.includes("claude") || lowerModel?.includes("gemini") || lowerModel?.includes("qwen-vl") || lowerModel?.includes("omni") || lowerModel?.includes("qwen2.5-vl") || lowerModel?.includes("qwen2.5-omni") || lowerModel?.includes("qwen-omni") || lowerModel?.includes("qwen2-vl") || lowerModel?.includes("qwen3.5") || lowerModel?.includes("qvq") || normalizedModel?.includes("o1") || normalizedModel?.includes("o4") || normalizedModel?.includes("o3") || normalizedModel?.includes("gpt-4.1") || normalizedModel?.includes("gpt-5") || supportImageInput2) && images != null) {
       msg.content = [
         {
           type: "text",
@@ -239,6 +239,36 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
     }
     result.push(msg);
   }
+  for (let i = 0; i < result.length; i++) {
+    if (result[i].role !== "assistant") continue;
+    const assistantMsg = result[i];
+    const toolMessages = [];
+    for (let j = i + 1; j < result.length && result[j].role === "tool"; j++) {
+      toolMessages.push(result[j]);
+    }
+    if (toolMessages.length === 0) continue;
+    if (!assistantMsg.tool_calls) {
+      assistantMsg.tool_calls = [];
+    }
+    for (let k = 0; k < toolMessages.length; k++) {
+      if (!assistantMsg.tool_calls[k]) {
+        assistantMsg.tool_calls[k] = {
+          id: `call_${k}`,
+          type: "function",
+          function: {
+            name: toolMessages[k].name || "unknown",
+            arguments: "{}"
+          }
+        };
+      }
+      if (!assistantMsg.tool_calls[k].id) {
+        assistantMsg.tool_calls[k].id = `call_${k}`;
+      }
+      if (!toolMessages[k].tool_call_id) {
+        toolMessages[k].tool_call_id = assistantMsg.tool_calls[k].id;
+      }
+    }
+  }
   if (removeSystemMessage) {
     return transformSystemMessages(result);
   }

package/lib/utils.d.ts

@@ -11,5 +11,5 @@ export declare function messageTypeToOpenAIRole(type: MessageType): ChatCompleti
 export declare function formatToolsToOpenAITools(tools: StructuredTool[], includeGoogleSearch: boolean): ChatCompletionTool[];
 export declare function formatToolToOpenAITool(tool: StructuredTool): ChatCompletionTool;
 export declare function removeAdditionalProperties(schema: JsonSchema7Type): JsonSchema7Type;
-export declare function convertMessageToMessageChunk(message: ChatCompletionResponseMessage): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
-export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
+export declare function convertMessageToMessageChunk(message: ChatCompletionResponseMessage): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
+export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -70,6 +70,6 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.9",
-    "koishi-plugin-chatluna": "^1.3.21"
+    "koishi-plugin-chatluna": "^1.3.22"
   }
 }