@chatluna/v1-shared-adapter 1.0.24 → 1.0.26

package/lib/client.d.ts

@@ -1,7 +1,7 @@
 import { ModelInfo } from 'koishi-plugin-chatluna/llm-core/platform/types';
 export type OpenAIReasoningEffort = 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh';
 export declare const reasoningEffortModelSuffixes: readonly ["non-thinking", "minimal-thinking", "low-thinking", "medium-thinking", "high-thinking", "xhigh-thinking", "thinking"];
-export declare function expandReasoningEffortModelVariants(model: string): string[];
+export declare function expandReasoningEffortModelVariants(model: string, suffixes?: readonly string[]): string[];
 export declare function parseOpenAIModelNameWithReasoningEffort(modelName: string): {
     model: string;
     reasoningEffort?: OpenAIReasoningEffort;

package/lib/index.cjs

@@ -61,8 +61,8 @@ var reasoningEffortModelSuffixes = [
   "xhigh-thinking",
   "thinking"
 ];
-function expandReasoningEffortModelVariants(model) {
-  return reasoningEffortModelSuffixes.map((suffix) => `${model}-${suffix}`);
+function expandReasoningEffortModelVariants(model, suffixes = reasoningEffortModelSuffixes) {
+  return suffixes.map((suffix) => `${model}-${suffix}`);
 }
 __name(expandReasoningEffortModelVariants, "expandReasoningEffortModelVariants");
 function parseOpenAIModelNameWithReasoningEffort(modelName) {
@@ -194,14 +194,15 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
   const result = [];
   const normalizedModel = model ? normalizeOpenAIModelName(model) : model;
   const isDeepseekThinkModel = normalizedModel?.includes("deepseek-reasoner");
+  console.log(messages);
   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 +225,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 +276,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);
   }
@@ -346,7 +377,12 @@ async function fetchImageUrl(plugin, content) {
   }
   const ext = url.match(/\.([^.?#]+)(?:[?#]|$)/)?.[1]?.toLowerCase();
   const imageType = (0, import_string.getImageMimeType)(ext);
-  const buffer = await plugin.fetch(url).then((res) => res.arrayBuffer()).then(Buffer.from);
+  const buffer = await plugin.fetch(url).then((res) => {
+    if (!res.ok) {
+      throw new Error(`Failed to fetch image: ${res.status}`);
+    }
+    return res.arrayBuffer();
+  }).then(Buffer.from);
   return `data:${imageType};base64,${buffer.toString("base64")}`;
 }
 __name(fetchImageUrl, "fetchImageUrl");

package/lib/index.mjs

@@ -12,8 +12,8 @@ var reasoningEffortModelSuffixes = [
   "xhigh-thinking",
   "thinking"
 ];
-function expandReasoningEffortModelVariants(model) {
-  return reasoningEffortModelSuffixes.map((suffix) => `${model}-${suffix}`);
+function expandReasoningEffortModelVariants(model, suffixes = reasoningEffortModelSuffixes) {
+  return suffixes.map((suffix) => `${model}-${suffix}`);
 }
 __name(expandReasoningEffortModelVariants, "expandReasoningEffortModelVariants");
 function parseOpenAIModelNameWithReasoningEffort(modelName) {
@@ -158,14 +158,15 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
   const result = [];
   const normalizedModel = model ? normalizeOpenAIModelName(model) : model;
   const isDeepseekThinkModel = normalizedModel?.includes("deepseek-reasoner");
+  console.log(messages);
   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 +189,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 +240,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);
   }
@@ -310,7 +341,12 @@ async function fetchImageUrl(plugin, content) {
   }
   const ext = url.match(/\.([^.?#]+)(?:[?#]|$)/)?.[1]?.toLowerCase();
   const imageType = getImageMimeType(ext);
-  const buffer = await plugin.fetch(url).then((res) => res.arrayBuffer()).then(Buffer.from);
+  const buffer = await plugin.fetch(url).then((res) => {
+    if (!res.ok) {
+      throw new Error(`Failed to fetch image: ${res.status}`);
+    }
+    return res.arrayBuffer();
+  }).then(Buffer.from);
   return `data:${imageType};base64,${buffer.toString("base64")}`;
 }
 __name(fetchImageUrl, "fetchImageUrl");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "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.20"
+    "koishi-plugin-chatluna": "^1.3.21"
   }
 }