@chatluna/v1-shared-adapter 1.0.26 → 1.0.28

package/lib/index.cjs

@@ -28,6 +28,7 @@ __export(index_exports, {
   createEmbeddings: () => createEmbeddings,
   createRequestContext: () => createRequestContext,
   expandReasoningEffortModelVariants: () => expandReasoningEffortModelVariants,
+  fetchFileLikeUrl: () => fetchFileLikeUrl,
   fetchImageUrl: () => fetchImageUrl,
   formatToolToOpenAITool: () => formatToolToOpenAITool,
   formatToolsToOpenAITools: () => formatToolsToOpenAITools,
@@ -190,11 +191,10 @@ var import_messages = require("@langchain/core/messages");
 var import_zod_to_json_schema = require("zod-to-json-schema");
 var import_string = require("koishi-plugin-chatluna/utils/string");
 var import_types = require("@langchain/core/utils/types");
-async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInput2, removeSystemMessage) {
+async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInputType, removeSystemMessage) {
   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 = {
@@ -225,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("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) {
+    if (images != null && (supportImageInput(lowerModel) || supportImageInputType)) {
       msg.content = [
         {
           type: "text",
@@ -377,15 +377,73 @@ 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) => {
-    if (!res.ok) {
-      throw new Error(`Failed to fetch image: ${res.status}`);
-    }
-    return res.arrayBuffer();
-  }).then(Buffer.from);
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 6e4);
+  const response = await plugin.fetch(url, {
+    signal: controller.signal
+  }).finally(() => {
+    clearTimeout(timeout);
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to fetch image: ${response.status}`);
+  }
+  const buffer = Buffer.from(await response.arrayBuffer());
   return `data:${imageType};base64,${buffer.toString("base64")}`;
 }
 __name(fetchImageUrl, "fetchImageUrl");
+function getFileLikeUrlInfo(content) {
+  switch (content.type) {
+    case "file_url": {
+      const raw = content.file_url;
+      return {
+        url: typeof raw === "string" ? raw : raw.url,
+        mimeType: typeof raw === "string" ? void 0 : raw.mimeType
+      };
+    }
+    case "audio_url": {
+      const raw = content.audio_url;
+      return {
+        url: typeof raw === "string" ? raw : raw.url,
+        mimeType: typeof raw === "string" ? void 0 : raw.mimeType
+      };
+    }
+    case "video_url": {
+      const raw = content.video_url;
+      return {
+        url: typeof raw === "string" ? raw : raw.url,
+        mimeType: typeof raw === "string" ? void 0 : raw.mimeType
+      };
+    }
+  }
+}
+__name(getFileLikeUrlInfo, "getFileLikeUrlInfo");
+async function fetchFileLikeUrl(plugin, content) {
+  const { url, mimeType } = getFileLikeUrlInfo(content);
+  const dataUrlMatch = url.match(/^data:([^;,]+);base64,(.+)$/i);
+  if (dataUrlMatch) {
+    return {
+      buffer: Buffer.from(dataUrlMatch[2], "base64"),
+      mimeType: dataUrlMatch[1] || mimeType || "application/octet-stream"
+    };
+  }
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 6e4);
+  const response = await plugin.fetch(url, {
+    signal: controller.signal
+  }).finally(() => {
+    clearTimeout(timeout);
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to fetch file: ${response.status}`);
+  }
+  const buffer = Buffer.from(await response.arrayBuffer());
+  const fetchedMimeType = response.headers.get("content-type")?.split(";")[0]?.trim();
+  return {
+    buffer,
+    mimeType: mimeType ?? fetchedMimeType ?? (0, import_string.getMimeTypeFromSource)(url) ?? "application/octet-stream"
+  };
+}
+__name(fetchFileLikeUrl, "fetchFileLikeUrl");
 function messageTypeToOpenAIRole(type) {
   switch (type) {
     case "system":
@@ -900,6 +958,7 @@ __name(createRequestContext, "createRequestContext");
   createEmbeddings,
   createRequestContext,
   expandReasoningEffortModelVariants,
+  fetchFileLikeUrl,
   fetchImageUrl,
   formatToolToOpenAITool,
   formatToolsToOpenAITools,

package/lib/index.mjs

@@ -151,14 +151,14 @@ import {
 import { zodToJsonSchema } from "zod-to-json-schema";
 import {
   getImageMimeType,
+  getMimeTypeFromSource,
   isMessageContentImageUrl
 } from "koishi-plugin-chatluna/utils/string";
 import { isZodSchemaV3 } from "@langchain/core/utils/types";
-async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInput2, removeSystemMessage) {
+async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInputType, removeSystemMessage) {
   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 = {
@@ -189,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("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) {
+    if (images != null && (supportImageInput(lowerModel) || supportImageInputType)) {
       msg.content = [
         {
           type: "text",
@@ -341,15 +341,73 @@ async function fetchImageUrl(plugin, content) {
   }
   const ext = url.match(/\.([^.?#]+)(?:[?#]|$)/)?.[1]?.toLowerCase();
   const imageType = getImageMimeType(ext);
-  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);
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 6e4);
+  const response = await plugin.fetch(url, {
+    signal: controller.signal
+  }).finally(() => {
+    clearTimeout(timeout);
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to fetch image: ${response.status}`);
+  }
+  const buffer = Buffer.from(await response.arrayBuffer());
   return `data:${imageType};base64,${buffer.toString("base64")}`;
 }
 __name(fetchImageUrl, "fetchImageUrl");
+function getFileLikeUrlInfo(content) {
+  switch (content.type) {
+    case "file_url": {
+      const raw = content.file_url;
+      return {
+        url: typeof raw === "string" ? raw : raw.url,
+        mimeType: typeof raw === "string" ? void 0 : raw.mimeType
+      };
+    }
+    case "audio_url": {
+      const raw = content.audio_url;
+      return {
+        url: typeof raw === "string" ? raw : raw.url,
+        mimeType: typeof raw === "string" ? void 0 : raw.mimeType
+      };
+    }
+    case "video_url": {
+      const raw = content.video_url;
+      return {
+        url: typeof raw === "string" ? raw : raw.url,
+        mimeType: typeof raw === "string" ? void 0 : raw.mimeType
+      };
+    }
+  }
+}
+__name(getFileLikeUrlInfo, "getFileLikeUrlInfo");
+async function fetchFileLikeUrl(plugin, content) {
+  const { url, mimeType } = getFileLikeUrlInfo(content);
+  const dataUrlMatch = url.match(/^data:([^;,]+);base64,(.+)$/i);
+  if (dataUrlMatch) {
+    return {
+      buffer: Buffer.from(dataUrlMatch[2], "base64"),
+      mimeType: dataUrlMatch[1] || mimeType || "application/octet-stream"
+    };
+  }
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 6e4);
+  const response = await plugin.fetch(url, {
+    signal: controller.signal
+  }).finally(() => {
+    clearTimeout(timeout);
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to fetch file: ${response.status}`);
+  }
+  const buffer = Buffer.from(await response.arrayBuffer());
+  const fetchedMimeType = response.headers.get("content-type")?.split(";")[0]?.trim();
+  return {
+    buffer,
+    mimeType: mimeType ?? fetchedMimeType ?? getMimeTypeFromSource(url) ?? "application/octet-stream"
+  };
+}
+__name(fetchFileLikeUrl, "fetchFileLikeUrl");
 function messageTypeToOpenAIRole(type) {
   switch (type) {
     case "system":
@@ -863,6 +921,7 @@ export {
   createEmbeddings,
   createRequestContext,
   expandReasoningEffortModelVariants,
+  fetchFileLikeUrl,
   fetchImageUrl,
   formatToolToOpenAITool,
   formatToolsToOpenAITools,

package/lib/utils.d.ts

@@ -1,15 +1,43 @@
-import { AIMessageChunk, BaseMessage, ChatMessageChunk, FunctionMessageChunk, HumanMessageChunk, MessageContentImageUrl, MessageType, SystemMessageChunk, ToolMessageChunk } from '@langchain/core/messages';
+import { AIMessageChunk, BaseMessage, ChatMessageChunk, FunctionMessageChunk, HumanMessageChunk, MessageContentComplex, MessageContentImageUrl, MessageType, SystemMessageChunk, ToolMessageChunk } from '@langchain/core/messages';
 import { StructuredTool } from '@langchain/core/tools';
 import { JsonSchema7Type } from 'zod-to-json-schema';
 import { ChatCompletionResponseMessage, ChatCompletionResponseMessageRoleEnum, ChatCompletionTool } from './types';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
-export declare function langchainMessageToOpenAIMessage(messages: BaseMessage[], plugin: ChatLunaPlugin, model?: string, supportImageInput?: boolean, removeSystemMessage?: boolean): Promise<ChatCompletionResponseMessage[]>;
+export declare function langchainMessageToOpenAIMessage(messages: BaseMessage[], plugin: ChatLunaPlugin, model?: string, supportImageInputType?: boolean, removeSystemMessage?: boolean): Promise<ChatCompletionResponseMessage[]>;
 export declare function processDeepSeekThinkMessages(convertedMessages: ChatCompletionResponseMessage[], originalMessages: BaseMessage[]): ChatCompletionResponseMessage[];
 export declare function transformSystemMessages(messages: ChatCompletionResponseMessage[]): ChatCompletionResponseMessage[];
 export declare function fetchImageUrl(plugin: ChatLunaPlugin, content: MessageContentImageUrl): Promise<string>;
+type MessageContentFileLike = MessageContentComplex & ({
+    type: 'file_url';
+    file_url: string | {
+        url: string;
+        mimeType?: string;
+    };
+} | {
+    type: 'audio_url';
+    audio_url: string | {
+        url: string;
+        mimeType?: string;
+    };
+} | {
+    type: 'video_url';
+    video_url: string | {
+        url: string;
+        mimeType?: string;
+    };
+});
+/**
+ * Fetch file/audio/video content and return decoded bytes.
+ * If the source is a base64 data URL, it is decoded directly.
+ */
+export declare function fetchFileLikeUrl(plugin: ChatLunaPlugin, content: MessageContentFileLike): Promise<{
+    buffer: Buffer<ArrayBuffer>;
+    mimeType: string;
+}>;
 export declare function messageTypeToOpenAIRole(type: MessageType): ChatCompletionResponseMessageRoleEnum;
 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): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
 export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "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.23"
   }
 }