@chatluna/v1-shared-adapter 1.0.0 → 1.0.3

package/lib/index.cjs

@@ -21,8 +21,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   buildChatCompletionParams: () => buildChatCompletionParams,
+  completion: () => completion,
   completionStream: () => completionStream,
   convertDeltaToMessageChunk: () => convertDeltaToMessageChunk,
+  convertMessageToMessageChunk: () => convertMessageToMessageChunk,
   createEmbeddings: () => createEmbeddings,
   createRequestContext: () => createRequestContext,
   formatToolToOpenAITool: () => formatToolToOpenAITool,
@@ -34,6 +36,7 @@ __export(index_exports, {
   langchainMessageToOpenAIMessage: () => langchainMessageToOpenAIMessage,
   messageTypeToOpenAIRole: () => messageTypeToOpenAIRole,
   processReasoningContent: () => processReasoningContent,
+  processResponse: () => processResponse,
   processStreamResponse: () => processStreamResponse
 });
 module.exports = __toCommonJS(index_exports);
@@ -45,6 +48,9 @@ function isEmbeddingModel(modelName) {
 }
 __name(isEmbeddingModel, "isEmbeddingModel");
 function isNonLLMModel(modelName) {
+  if (modelName.includes("gemini") && modelName.includes("image")) {
+    return false;
+  }
   return ["whisper", "tts", "dall-e", "image", "rerank"].some(
     (keyword) => modelName.includes(keyword)
   );
@@ -124,7 +130,7 @@ function langchainMessageToOpenAIMessage(messages, model, supportImageInput, rem
     }
     const images = rawMessage.additional_kwargs.images;
     const lowerModel = model?.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") || supportImageInput) && 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("qvq") || model?.includes("o1") || model?.includes("o4") || model?.includes("o3") || model?.includes("gpt-4.1") || model?.includes("gpt-5") || supportImageInput) && images != null) {
       msg.content = [
         {
           type: "text",
@@ -260,6 +266,58 @@ function removeAdditionalProperties(schema) {
   return schema;
 }
 __name(removeAdditionalProperties, "removeAdditionalProperties");
+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 = {};
+  }
+  if (reasoningContent.length > 0) {
+    additionalKwargs.reasoning_content = reasoningContent;
+  }
+  if (role === "user") {
+    return new import_messages.HumanMessageChunk({ content });
+  } else if (role === "assistant") {
+    const toolCallChunks = [];
+    if (Array.isArray(message.tool_calls)) {
+      for (const rawToolCall of message.tool_calls) {
+        toolCallChunks.push({
+          name: rawToolCall.function?.name,
+          args: rawToolCall.function?.arguments,
+          id: rawToolCall.id
+        });
+      }
+    }
+    return new import_messages.AIMessageChunk({
+      content,
+      tool_call_chunks: toolCallChunks,
+      additional_kwargs: additionalKwargs
+    });
+  } else if (role === "system") {
+    return new import_messages.SystemMessageChunk({ content });
+  } else if (role === "function") {
+    return new import_messages.FunctionMessageChunk({
+      content,
+      additional_kwargs: additionalKwargs,
+      name: message.name
+    });
+  } else if (role === "tool") {
+    return new import_messages.ToolMessageChunk({
+      content,
+      additional_kwargs: additionalKwargs,
+      tool_call_id: message.tool_call_id
+    });
+  } else {
+    return new import_messages.ChatMessageChunk({ content, role });
+  }
+}
+__name(convertMessageToMessageChunk, "convertMessageToMessageChunk");
 function convertDeltaToMessageChunk(delta, defaultRole) {
   const role = ((delta.role?.length ?? 0) > 0 ? delta.role : defaultRole).toLowerCase();
   const content = delta.content ?? "";
@@ -320,6 +378,7 @@ __name(convertDeltaToMessageChunk, "convertDeltaToMessageChunk");
 
 // src/requester.ts
 var import_messages2 = require("@langchain/core/messages");
+var import_string = require("koishi-plugin-chatluna/utils/string");
 function buildChatCompletionParams(params, enableGoogleSearch, supportImageInput) {
   const base = {
     model: params.model,
@@ -428,6 +487,57 @@ async function* processStreamResponse(requestContext, iterator) {
   }
 }
 __name(processStreamResponse, "processStreamResponse");
+async function processResponse(requestContext, response) {
+  if (response.status !== 200) {
+    throw new import_error.ChatLunaError(
+      import_error.ChatLunaErrorCode.API_REQUEST_FAILED,
+      new Error(
+        "Error when calling completion, Status: " + response.status + " " + response.statusText + ", Response: " + await response.text()
+      )
+    );
+  }
+  const responseText = await response.text();
+  try {
+    const data = JSON.parse(responseText);
+    if (data.error) {
+      throw new import_error.ChatLunaError(
+        import_error.ChatLunaErrorCode.API_REQUEST_FAILED,
+        new Error(
+          "Error when calling completion, Result: " + responseText
+        )
+      );
+    }
+    const choice = data.choices?.[0];
+    if (!choice) {
+      throw new import_error.ChatLunaError(
+        import_error.ChatLunaErrorCode.API_REQUEST_FAILED,
+        new Error(
+          "Error when calling completion, Result: " + responseText
+        )
+      );
+    }
+    const messageChunk = convertMessageToMessageChunk(choice.message);
+    return new import_outputs.ChatGenerationChunk({
+      message: messageChunk,
+      text: (0, import_string.getMessageContent)(messageChunk.content),
+      generationInfo: {
+        tokenUsage: data.usage
+      }
+    });
+  } catch (e) {
+    if (e instanceof import_error.ChatLunaError) {
+      throw e;
+    } else {
+      throw new import_error.ChatLunaError(
+        import_error.ChatLunaErrorCode.API_REQUEST_FAILED,
+        new Error(
+          "Error when calling completion, Error: " + e + ", Response: " + responseText
+        )
+      );
+    }
+  }
+}
+__name(processResponse, "processResponse");
 async function* completionStream(requestContext, params, completionUrl = "chat/completions", enableGoogleSearch, supportImageInput) {
   const { modelRequester } = requestContext;
   try {
@@ -453,6 +563,32 @@ async function* completionStream(requestContext, params, completionUrl = "chat/c
   }
 }
 __name(completionStream, "completionStream");
+async function completion(requestContext, params, completionUrl = "chat/completions", enableGoogleSearch, supportImageInput) {
+  const { modelRequester } = requestContext;
+  const chatCompletionParams = buildChatCompletionParams(
+    params,
+    enableGoogleSearch ?? false,
+    supportImageInput ?? true
+  );
+  delete chatCompletionParams.stream;
+  try {
+    const response = await modelRequester.post(
+      completionUrl,
+      chatCompletionParams,
+      {
+        signal: params.signal
+      }
+    );
+    return await processResponse(requestContext, response);
+  } catch (e) {
+    if (e instanceof import_error.ChatLunaError) {
+      throw e;
+    } else {
+      throw new import_error.ChatLunaError(import_error.ChatLunaErrorCode.API_REQUEST_FAILED, e);
+    }
+  }
+}
+__name(completion, "completion");
 async function createEmbeddings(requestContext, params, embeddingUrl = "embeddings") {
   const { modelRequester } = requestContext;
   let data;
@@ -496,8 +632,10 @@ __name(createRequestContext, "createRequestContext");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildChatCompletionParams,
+  completion,
   completionStream,
   convertDeltaToMessageChunk,
+  convertMessageToMessageChunk,
   createEmbeddings,
   createRequestContext,
   formatToolToOpenAITool,
@@ -509,5 +647,6 @@ __name(createRequestContext, "createRequestContext");
   langchainMessageToOpenAIMessage,
   messageTypeToOpenAIRole,
   processReasoningContent,
+  processResponse,
   processStreamResponse
 });

package/lib/index.mjs

@@ -8,6 +8,9 @@ function isEmbeddingModel(modelName) {
 }
 __name(isEmbeddingModel, "isEmbeddingModel");
 function isNonLLMModel(modelName) {
+  if (modelName.includes("gemini") && modelName.includes("image")) {
+    return false;
+  }
   return ["whisper", "tts", "dall-e", "image", "rerank"].some(
     (keyword) => modelName.includes(keyword)
   );
@@ -97,7 +100,7 @@ function langchainMessageToOpenAIMessage(messages, model, supportImageInput, rem
     }
     const images = rawMessage.additional_kwargs.images;
     const lowerModel = model?.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") || supportImageInput) && 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("qvq") || model?.includes("o1") || model?.includes("o4") || model?.includes("o3") || model?.includes("gpt-4.1") || model?.includes("gpt-5") || supportImageInput) && images != null) {
       msg.content = [
         {
           type: "text",
@@ -233,6 +236,58 @@ function removeAdditionalProperties(schema) {
   return schema;
 }
 __name(removeAdditionalProperties, "removeAdditionalProperties");
+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 = {};
+  }
+  if (reasoningContent.length > 0) {
+    additionalKwargs.reasoning_content = reasoningContent;
+  }
+  if (role === "user") {
+    return new HumanMessageChunk({ content });
+  } else if (role === "assistant") {
+    const toolCallChunks = [];
+    if (Array.isArray(message.tool_calls)) {
+      for (const rawToolCall of message.tool_calls) {
+        toolCallChunks.push({
+          name: rawToolCall.function?.name,
+          args: rawToolCall.function?.arguments,
+          id: rawToolCall.id
+        });
+      }
+    }
+    return new AIMessageChunk({
+      content,
+      tool_call_chunks: toolCallChunks,
+      additional_kwargs: additionalKwargs
+    });
+  } else if (role === "system") {
+    return new SystemMessageChunk({ content });
+  } else if (role === "function") {
+    return new FunctionMessageChunk({
+      content,
+      additional_kwargs: additionalKwargs,
+      name: message.name
+    });
+  } else if (role === "tool") {
+    return new ToolMessageChunk({
+      content,
+      additional_kwargs: additionalKwargs,
+      tool_call_id: message.tool_call_id
+    });
+  } else {
+    return new ChatMessageChunk({ content, role });
+  }
+}
+__name(convertMessageToMessageChunk, "convertMessageToMessageChunk");
 function convertDeltaToMessageChunk(delta, defaultRole) {
   const role = ((delta.role?.length ?? 0) > 0 ? delta.role : defaultRole).toLowerCase();
   const content = delta.content ?? "";
@@ -293,6 +348,7 @@ __name(convertDeltaToMessageChunk, "convertDeltaToMessageChunk");
 
 // src/requester.ts
 import { AIMessageChunk as AIMessageChunk2 } from "@langchain/core/messages";
+import { getMessageContent } from "koishi-plugin-chatluna/utils/string";
 function buildChatCompletionParams(params, enableGoogleSearch, supportImageInput) {
   const base = {
     model: params.model,
@@ -401,6 +457,57 @@ async function* processStreamResponse(requestContext, iterator) {
   }
 }
 __name(processStreamResponse, "processStreamResponse");
+async function processResponse(requestContext, response) {
+  if (response.status !== 200) {
+    throw new ChatLunaError(
+      ChatLunaErrorCode.API_REQUEST_FAILED,
+      new Error(
+        "Error when calling completion, Status: " + response.status + " " + response.statusText + ", Response: " + await response.text()
+      )
+    );
+  }
+  const responseText = await response.text();
+  try {
+    const data = JSON.parse(responseText);
+    if (data.error) {
+      throw new ChatLunaError(
+        ChatLunaErrorCode.API_REQUEST_FAILED,
+        new Error(
+          "Error when calling completion, Result: " + responseText
+        )
+      );
+    }
+    const choice = data.choices?.[0];
+    if (!choice) {
+      throw new ChatLunaError(
+        ChatLunaErrorCode.API_REQUEST_FAILED,
+        new Error(
+          "Error when calling completion, Result: " + responseText
+        )
+      );
+    }
+    const messageChunk = convertMessageToMessageChunk(choice.message);
+    return new ChatGenerationChunk({
+      message: messageChunk,
+      text: getMessageContent(messageChunk.content),
+      generationInfo: {
+        tokenUsage: data.usage
+      }
+    });
+  } catch (e) {
+    if (e instanceof ChatLunaError) {
+      throw e;
+    } else {
+      throw new ChatLunaError(
+        ChatLunaErrorCode.API_REQUEST_FAILED,
+        new Error(
+          "Error when calling completion, Error: " + e + ", Response: " + responseText
+        )
+      );
+    }
+  }
+}
+__name(processResponse, "processResponse");
 async function* completionStream(requestContext, params, completionUrl = "chat/completions", enableGoogleSearch, supportImageInput) {
   const { modelRequester } = requestContext;
   try {
@@ -426,6 +533,32 @@ async function* completionStream(requestContext, params, completionUrl = "chat/c
   }
 }
 __name(completionStream, "completionStream");
+async function completion(requestContext, params, completionUrl = "chat/completions", enableGoogleSearch, supportImageInput) {
+  const { modelRequester } = requestContext;
+  const chatCompletionParams = buildChatCompletionParams(
+    params,
+    enableGoogleSearch ?? false,
+    supportImageInput ?? true
+  );
+  delete chatCompletionParams.stream;
+  try {
+    const response = await modelRequester.post(
+      completionUrl,
+      chatCompletionParams,
+      {
+        signal: params.signal
+      }
+    );
+    return await processResponse(requestContext, response);
+  } catch (e) {
+    if (e instanceof ChatLunaError) {
+      throw e;
+    } else {
+      throw new ChatLunaError(ChatLunaErrorCode.API_REQUEST_FAILED, e);
+    }
+  }
+}
+__name(completion, "completion");
 async function createEmbeddings(requestContext, params, embeddingUrl = "embeddings") {
   const { modelRequester } = requestContext;
   let data;
@@ -468,8 +601,10 @@ function createRequestContext(ctx, config, pluginConfig, plugin, modelRequester)
 __name(createRequestContext, "createRequestContext");
 export {
   buildChatCompletionParams,
+  completion,
   completionStream,
   convertDeltaToMessageChunk,
+  convertMessageToMessageChunk,
   createEmbeddings,
   createRequestContext,
   formatToolToOpenAITool,
@@ -481,5 +616,6 @@ export {
   langchainMessageToOpenAIMessage,
   messageTypeToOpenAIRole,
   processReasoningContent,
+  processResponse,
   processStreamResponse
 };

package/lib/requester.d.ts

@@ -4,6 +4,7 @@ import { ClientConfig } from 'koishi-plugin-chatluna/llm-core/platform/config';
 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';
 interface RequestContext<T extends ClientConfig = ClientConfig, R extends ChatLunaPlugin.Config = ChatLunaPlugin.Config> {
     ctx: Context;
     config: T;
@@ -38,7 +39,9 @@ export declare function processReasoningContent(delta: {
     isSet: boolean;
 }): number;
 export declare function processStreamResponse<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, iterator: AsyncGenerator<SSEEvent, string, unknown>): AsyncGenerator<ChatGenerationChunk, void, unknown>;
+export declare function processResponse<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, response: Response): Promise<ChatGenerationChunk>;
 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 createRequestContext<T extends ClientConfig, R extends ChatLunaPlugin.Config>(ctx: Context, config: T, pluginConfig: R, plugin: ChatLunaPlugin, modelRequester: ModelRequester<T, R>): RequestContext<T, R>;

package/lib/types.d.ts

@@ -32,6 +32,7 @@ export interface ChatCompletionResponseMessage {
             detail?: 'low' | 'high';
         };
     })[];
+    reasoning_content?: string;
     name?: string;
     tool_calls?: ChatCompletionRequestMessageToolCall[];
     tool_call_id?: string;
@@ -50,6 +51,7 @@ export interface ChatCompletionTool {
 export interface ChatCompletionRequestMessageToolCall {
     id: string;
     type: 'function';
+    index?: number;
     function: {
         name: string;
         arguments: string;

package/lib/utils.d.ts

@@ -5,4 +5,5 @@ export declare function langchainMessageToOpenAIMessage(messages: BaseMessage[],
 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 convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
+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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "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.10"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.15"
   }
 }