@chatluna/v1-shared-adapter 1.0.8 → 1.0.10

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",
@@ -138,7 +139,7 @@ var import_sse = require("koishi-plugin-chatluna/utils/sse");
 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_zod = require("zod");
+var import_types = require("@langchain/core/utils/types");
 async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInput2, removeSystemMessage) {
   const result = [];
   for (const rawMessage of messages) {
@@ -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;
@@ -294,7 +298,7 @@ function formatToolsToOpenAITools(tools, includeGoogleSearch) {
 __name(formatToolsToOpenAITools, "formatToolsToOpenAITools");
 function formatToolToOpenAITool(tool) {
   const parameters = removeAdditionalProperties(
-    tool.schema instanceof import_zod.ZodSchema ? (0, import_zod_to_json_schema.zodToJsonSchema)(tool.schema, {
+    (0, import_types.isZodSchemaV3)(tool.schema) ? (0, import_zod_to_json_schema.zodToJsonSchema)(tool.schema, {
       allowedAdditionalProperties: void 0
     }) : tool.schema
   );
@@ -337,13 +341,6 @@ function convertMessageToMessageChunk(message) {
   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 = {};
-  }
   if (reasoningContent.length > 0) {
     additionalKwargs.reasoning_content = reasoningContent;
   }
@@ -673,21 +670,29 @@ async function createEmbeddings(requestContext, params, embeddingUrl = "embeddin
     }
     throw new Error(`Call Embedding Error: ${JSON.stringify(data)}`);
   } catch (e) {
-    requestContext.modelRequester.logger.debug(e);
+    if (e instanceof import_error.ChatLunaError) {
+      throw e;
+    }
     throw new import_error.ChatLunaError(import_error.ChatLunaErrorCode.API_REQUEST_FAILED, e);
   }
 }
 __name(createEmbeddings, "createEmbeddings");
-async function getModels(requestContext) {
+async function getModels(requestContext, config) {
   const { modelRequester } = requestContext;
   let data;
   try {
-    const response = await modelRequester.get("models");
+    const response = await modelRequester.get(
+      "models",
+      {},
+      { signal: config?.signal }
+    );
     data = await response.text();
     data = JSON.parse(data);
     return data.data.map((model) => model.id);
   } catch (e) {
-    requestContext.modelRequester.logger.error(e);
+    if (e instanceof import_error.ChatLunaError) {
+      throw e;
+    }
     throw new Error(
       "error when listing openai models, Result: " + JSON.stringify(data)
     );

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",
@@ -108,7 +109,7 @@ import {
   getImageMimeType,
   isMessageContentImageUrl
 } from "koishi-plugin-chatluna/utils/string";
-import { ZodSchema } from "zod";
+import { isZodSchemaV3 } from "@langchain/core/utils/types";
 async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInput2, removeSystemMessage) {
   const result = [];
   for (const rawMessage of messages) {
@@ -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;
@@ -264,7 +268,7 @@ function formatToolsToOpenAITools(tools, includeGoogleSearch) {
 __name(formatToolsToOpenAITools, "formatToolsToOpenAITools");
 function formatToolToOpenAITool(tool) {
   const parameters = removeAdditionalProperties(
-    tool.schema instanceof ZodSchema ? zodToJsonSchema(tool.schema, {
+    isZodSchemaV3(tool.schema) ? zodToJsonSchema(tool.schema, {
       allowedAdditionalProperties: void 0
     }) : tool.schema
   );
@@ -307,13 +311,6 @@ function convertMessageToMessageChunk(message) {
   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 = {};
-  }
   if (reasoningContent.length > 0) {
     additionalKwargs.reasoning_content = reasoningContent;
   }
@@ -643,21 +640,29 @@ async function createEmbeddings(requestContext, params, embeddingUrl = "embeddin
     }
     throw new Error(`Call Embedding Error: ${JSON.stringify(data)}`);
   } catch (e) {
-    requestContext.modelRequester.logger.debug(e);
+    if (e instanceof ChatLunaError) {
+      throw e;
+    }
     throw new ChatLunaError(ChatLunaErrorCode.API_REQUEST_FAILED, e);
   }
 }
 __name(createEmbeddings, "createEmbeddings");
-async function getModels(requestContext) {
+async function getModels(requestContext, config) {
   const { modelRequester } = requestContext;
   let data;
   try {
-    const response = await modelRequester.get("models");
+    const response = await modelRequester.get(
+      "models",
+      {},
+      { signal: config?.signal }
+    );
     data = await response.text();
     data = JSON.parse(data);
     return data.data.map((model) => model.id);
   } catch (e) {
-    requestContext.modelRequester.logger.error(e);
+    if (e instanceof ChatLunaError) {
+      throw e;
+    }
     throw new Error(
       "error when listing openai models, Result: " + JSON.stringify(data)
     );

package/lib/requester.d.ts

@@ -5,6 +5,7 @@ import { SSEEvent } from 'koishi-plugin-chatluna/utils/sse';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
 import { Context } from 'koishi';
 import { Response } from 'undici/types/fetch';
+import { RunnableConfig } from '@langchain/core/runnables';
 interface RequestContext<T extends ClientConfig = ClientConfig, R extends ChatLunaPlugin.Config = ChatLunaPlugin.Config> {
     ctx: Context;
     config: T;
@@ -43,6 +44,6 @@ export declare function processResponse<T extends ClientConfig, R extends ChatLu
 export declare function completionStream<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, params: ModelRequestParams, completionUrl?: string, enableGoogleSearch?: boolean, supportImageInput?: boolean): AsyncGenerator<ChatGenerationChunk>;
 export declare function completion<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, params: ModelRequestParams, completionUrl?: string, enableGoogleSearch?: boolean, supportImageInput?: boolean): Promise<ChatGenerationChunk>;
 export declare function createEmbeddings<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, params: EmbeddingsRequestParams, embeddingUrl?: string): Promise<number[] | number[][]>;
-export declare function getModels<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>): Promise<string[]>;
+export declare function getModels<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, config?: RunnableConfig): Promise<string[]>;
 export declare function createRequestContext<T extends ClientConfig, R extends ChatLunaPlugin.Config>(ctx: Context, config: T, pluginConfig: R, plugin: ChatLunaPlugin, modelRequester: ModelRequester<T, R>): RequestContext<T, R>;
 export {};

package/lib/utils.d.ts

@@ -9,5 +9,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.8",
+  "version": "1.0.10",
   "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.40"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.44"
   }
 }