@chatluna/v1-shared-adapter 1.0.9 → 1.0.11

package/lib/index.cjs

@@ -111,8 +111,9 @@ var imageModelMatchers = [
   "gemini",
   "qwen-vl",
   "omni",
-  "qwen2.5-omni",
+  "qwen*-omni",
   "qwen-omni",
+  "qwen*-vl",
   "qvq",
   "o1",
   "o3",
@@ -148,7 +149,6 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
       name: role === "assistant" || role === "tool" ? rawMessage.name : void 0,
       role,
       //  function_call: rawMessage.additional_kwargs.function_call,
-      tool_calls: rawMessage.additional_kwargs.tool_calls,
       tool_call_id: rawMessage.tool_call_id
     };
     if (msg.tool_calls == null) {
@@ -157,13 +157,17 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
     if (msg.tool_call_id == null) {
       delete msg.tool_call_id;
     }
-    if (msg.tool_calls) {
-      for (const toolCall of msg.tool_calls) {
-        const tool = toolCall.function;
-        if (!tool.arguments) {
-          continue;
-        }
-        tool.arguments = JSON.stringify(JSON.parse(tool.arguments));
+    if (rawMessage.getType() === "ai") {
+      const toolCalls = rawMessage.tool_calls;
+      if (Array.isArray(toolCalls) && toolCalls.length > 0) {
+        msg.tool_calls = toolCalls.map((toolCall) => ({
+          id: toolCall.id,
+          type: "function",
+          function: {
+            name: toolCall.name,
+            arguments: JSON.stringify(toolCall.args)
+          }
+        }));
       }
     }
     const images = rawMessage.additional_kwargs.images;
@@ -336,14 +340,7 @@ function convertMessageToMessageChunk(message) {
   const content = message.content ?? "";
   const reasoningContent = message.reasoning_content ?? "";
   const role = ((message.role?.length ?? 0) > 0 ? message.role : "assistant").toLowerCase();
-  let additionalKwargs;
-  if (message.tool_calls) {
-    additionalKwargs = {
-      tool_calls: message.tool_calls
-    };
-  } else {
-    additionalKwargs = {};
-  }
+  const additionalKwargs = {};
   if (reasoningContent.length > 0) {
     additionalKwargs.reasoning_content = reasoningContent;
   }

package/lib/index.mjs

@@ -68,8 +68,9 @@ var imageModelMatchers = [
   "gemini",
   "qwen-vl",
   "omni",
-  "qwen2.5-omni",
+  "qwen*-omni",
   "qwen-omni",
+  "qwen*-vl",
   "qvq",
   "o1",
   "o3",
@@ -118,7 +119,6 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
       name: role === "assistant" || role === "tool" ? rawMessage.name : void 0,
       role,
       //  function_call: rawMessage.additional_kwargs.function_call,
-      tool_calls: rawMessage.additional_kwargs.tool_calls,
       tool_call_id: rawMessage.tool_call_id
     };
     if (msg.tool_calls == null) {
@@ -127,13 +127,17 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
     if (msg.tool_call_id == null) {
       delete msg.tool_call_id;
     }
-    if (msg.tool_calls) {
-      for (const toolCall of msg.tool_calls) {
-        const tool = toolCall.function;
-        if (!tool.arguments) {
-          continue;
-        }
-        tool.arguments = JSON.stringify(JSON.parse(tool.arguments));
+    if (rawMessage.getType() === "ai") {
+      const toolCalls = rawMessage.tool_calls;
+      if (Array.isArray(toolCalls) && toolCalls.length > 0) {
+        msg.tool_calls = toolCalls.map((toolCall) => ({
+          id: toolCall.id,
+          type: "function",
+          function: {
+            name: toolCall.name,
+            arguments: JSON.stringify(toolCall.args)
+          }
+        }));
       }
     }
     const images = rawMessage.additional_kwargs.images;
@@ -306,14 +310,7 @@ function convertMessageToMessageChunk(message) {
   const content = message.content ?? "";
   const reasoningContent = message.reasoning_content ?? "";
   const role = ((message.role?.length ?? 0) > 0 ? message.role : "assistant").toLowerCase();
-  let additionalKwargs;
-  if (message.tool_calls) {
-    additionalKwargs = {
-      tool_calls: message.tool_calls
-    };
-  } else {
-    additionalKwargs = {};
-  }
+  const additionalKwargs = {};
   if (reasoningContent.length > 0) {
     additionalKwargs.reasoning_content = reasoningContent;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -70,6 +70,6 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.42"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.45"
   }
 }