koishi-plugin-chatluna-google-gemini-adapter 1.2.23 → 1.2.25

package/lib/index.cjs

@@ -55,7 +55,7 @@ var import_types = require("koishi-plugin-chatluna/llm-core/platform/types");
 var import_error2 = require("koishi-plugin-chatluna/utils/error");
 
 // src/requester.ts
-var import_messages2 = require("@langchain/core/messages");
+var import_messages = require("@langchain/core/messages");
 var import_outputs = require("@langchain/core/outputs");
 var import_api = require("koishi-plugin-chatluna/llm-core/platform/api");
 var import_error = require("koishi-plugin-chatluna/utils/error");
@@ -63,7 +63,6 @@ var import_sse = require("koishi-plugin-chatluna/utils/sse");
 var import_stream = require("koishi-plugin-chatluna/utils/stream");
 
 // src/utils.ts
-var import_messages = require("@langchain/core/messages");
 var import_zod_to_json_schema = require("zod-to-json-schema");
 var import_v1_shared_adapter = require("@chatluna/v1-shared-adapter");
 var import_string = require("koishi-plugin-chatluna/utils/string");
@@ -90,23 +89,21 @@ async function langchainMessageToGeminiMessage(messages, plugin, model) {
 }
 __name(langchainMessageToGeminiMessage, "langchainMessageToGeminiMessage");
 function extractSystemMessages(messages) {
-  let lastSystemMessage;
+  let lastSystemMessageIndex = -1;
   for (let i = messages.length - 1; i >= 0; i--) {
     if (messages[i].role === "system") {
-      lastSystemMessage = messages[i];
+      lastSystemMessageIndex = i;
       break;
     }
   }
-  if (lastSystemMessage == null) {
+  if (lastSystemMessageIndex === -1) {
     return [void 0, messages];
   }
   const systemMessages = messages.slice(
     0,
-    messages.indexOf(lastSystemMessage) + 1
-  );
-  const modelMessages = messages.slice(
-    messages.indexOf(lastSystemMessage) + 1
+    Math.max(1, lastSystemMessageIndex)
   );
+  const modelMessages = messages.slice(lastSystemMessageIndex + 1);
   return [
     {
       role: "user",
@@ -441,15 +438,16 @@ var GeminiRequester = class extends import_api.ModelRequester {
       return;
     }
     const modelConfig = prepareModelConfig(params, this._pluginConfig);
+    const chatGenerationParams = await createChatGenerationParams(
+      params,
+      this._plugin,
+      modelConfig,
+      this._pluginConfig
+    );
     try {
       const response = await this._post(
         `models/${modelConfig.model}:streamGenerateContent?alt=sse`,
-        await createChatGenerationParams(
-          params,
-          this._plugin,
-          modelConfig,
-          this._pluginConfig
-        ),
+        chatGenerationParams,
         {
           signal: params.signal
         }
@@ -716,7 +714,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
     };
     for await (const chunk of iterable) {
       try {
-        const { updatedContent, updatedReasoning } = this._processChunk(
+        const { updatedContent, updatedReasoning } = await this._processChunk(
           chunk,
           reasoningContent,
           functionCall
@@ -730,7 +728,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
           const messageChunk = this._createMessageChunk(
             updatedContent,
             functionCall,
-            partAsTypeCheck(
+            this.ctx.chatluna_storage != null ? void 0 : partAsTypeCheck(
               chunk,
               (part) => part["inlineData"] != null
             )
@@ -755,7 +753,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
       }
     }
   }
-  _processChunk(chunk, reasoningContent, functionCall) {
+  async _processChunk(chunk, reasoningContent, functionCall) {
     const messagePart = partAsType(chunk);
     const chatFunctionCallingPart = partAsType(chunk);
     const imagePart = partAsTypeCheck(
@@ -772,8 +770,24 @@ var GeminiRequester = class extends import_api.ModelRequester {
       }
       messageContent = messagePart.text;
     } else if (imagePart) {
-      messagePart.text = `![image](data:${imagePart.inlineData.mimeType ?? "image/png"};base64,${imagePart.inlineData.data})`;
-      messageContent = messagePart.text;
+      const storageService = this.ctx.chatluna_storage;
+      if (!storageService) {
+        messagePart.text = `![image](data:${imagePart.inlineData.mimeType ?? "image/png"};base64,${imagePart.inlineData.data})`;
+        messageContent = messagePart.text;
+      } else {
+        const buffer = Buffer.from(imagePart.inlineData.data, "base64");
+        const file = await storageService.createTempFile(
+          buffer,
+          "image_random"
+        );
+        messagePart.text = "[image]";
+        messageContent = [
+          {
+            type: "image_url",
+            image_url: file.url
+          }
+        ];
+      }
     }
     const deltaFunctionCall = chatFunctionCallingPart?.functionCall;
     if (deltaFunctionCall) {
@@ -808,7 +822,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
     if (groundingContent.length > 0) {
       logger.debug(`grounding content: ${groundingContent}`);
       if (this._pluginConfig.groundingContentDisplay) {
-        const groundingMessage = new import_messages2.AIMessageChunk(
+        const groundingMessage = new import_messages.AIMessageChunk(
           `
 ${groundingContent}`
         );
@@ -821,8 +835,8 @@ ${groundingContent}`
     }
   }
   _createMessageChunk(content, functionCall, imagePart) {
-    const messageChunk = new import_messages2.AIMessageChunk({
-      content
+    const messageChunk = new import_messages.AIMessageChunk({
+      content: content ?? ""
     });
     messageChunk.additional_kwargs = {
       function_call: functionCall.name.length > 0 ? {
@@ -1028,7 +1042,10 @@ var Config4 = import_koishi.Schema.intersect([
   "en-US": require_en_US_schema()
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 });
-var inject = ["chatluna"];
+var inject = {
+  required: ["chatluna"],
+  optional: ["chatluna_storage"]
+};
 var name = "chatluna-google-gemini-adapter";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/index.d.ts

@@ -19,5 +19,8 @@ export interface Config extends ChatLunaPlugin.Config {
     includeThoughts: boolean;
 }
 export declare const Config: Schema<Config>;
-export declare const inject: string[];
+export declare const inject: {
+    required: string[];
+    optional: string[];
+};
 export declare const name = "chatluna-google-gemini-adapter";

package/lib/index.mjs

@@ -40,7 +40,7 @@ import {
 
 // src/requester.ts
 import {
-  AIMessageChunk as AIMessageChunk2
+  AIMessageChunk
 } from "@langchain/core/messages";
 import { ChatGenerationChunk } from "@langchain/core/outputs";
 import {
@@ -54,12 +54,6 @@ import { checkResponse, sseIterable } from "koishi-plugin-chatluna/utils/sse";
 import { readableStreamToAsyncIterable } from "koishi-plugin-chatluna/utils/stream";
 
 // src/utils.ts
-import {
-  AIMessageChunk,
-  ChatMessageChunk,
-  HumanMessageChunk,
-  SystemMessageChunk
-} from "@langchain/core/messages";
 import { zodToJsonSchema } from "zod-to-json-schema";
 import {
   fetchImageUrl,
@@ -92,23 +86,21 @@ async function langchainMessageToGeminiMessage(messages, plugin, model) {
 }
 __name(langchainMessageToGeminiMessage, "langchainMessageToGeminiMessage");
 function extractSystemMessages(messages) {
-  let lastSystemMessage;
+  let lastSystemMessageIndex = -1;
   for (let i = messages.length - 1; i >= 0; i--) {
     if (messages[i].role === "system") {
-      lastSystemMessage = messages[i];
+      lastSystemMessageIndex = i;
       break;
     }
   }
-  if (lastSystemMessage == null) {
+  if (lastSystemMessageIndex === -1) {
     return [void 0, messages];
   }
   const systemMessages = messages.slice(
     0,
-    messages.indexOf(lastSystemMessage) + 1
-  );
-  const modelMessages = messages.slice(
-    messages.indexOf(lastSystemMessage) + 1
+    Math.max(1, lastSystemMessageIndex)
   );
+  const modelMessages = messages.slice(lastSystemMessageIndex + 1);
   return [
     {
       role: "user",
@@ -443,15 +435,16 @@ var GeminiRequester = class extends ModelRequester {
       return;
     }
     const modelConfig = prepareModelConfig(params, this._pluginConfig);
+    const chatGenerationParams = await createChatGenerationParams(
+      params,
+      this._plugin,
+      modelConfig,
+      this._pluginConfig
+    );
     try {
       const response = await this._post(
         `models/${modelConfig.model}:streamGenerateContent?alt=sse`,
-        await createChatGenerationParams(
-          params,
-          this._plugin,
-          modelConfig,
-          this._pluginConfig
-        ),
+        chatGenerationParams,
         {
           signal: params.signal
         }
@@ -718,7 +711,7 @@ var GeminiRequester = class extends ModelRequester {
     };
     for await (const chunk of iterable) {
       try {
-        const { updatedContent, updatedReasoning } = this._processChunk(
+        const { updatedContent, updatedReasoning } = await this._processChunk(
           chunk,
           reasoningContent,
           functionCall
@@ -732,7 +725,7 @@ var GeminiRequester = class extends ModelRequester {
           const messageChunk = this._createMessageChunk(
             updatedContent,
             functionCall,
-            partAsTypeCheck(
+            this.ctx.chatluna_storage != null ? void 0 : partAsTypeCheck(
               chunk,
               (part) => part["inlineData"] != null
             )
@@ -757,7 +750,7 @@ var GeminiRequester = class extends ModelRequester {
       }
     }
   }
-  _processChunk(chunk, reasoningContent, functionCall) {
+  async _processChunk(chunk, reasoningContent, functionCall) {
     const messagePart = partAsType(chunk);
     const chatFunctionCallingPart = partAsType(chunk);
     const imagePart = partAsTypeCheck(
@@ -774,8 +767,24 @@ var GeminiRequester = class extends ModelRequester {
       }
       messageContent = messagePart.text;
     } else if (imagePart) {
-      messagePart.text = `![image](data:${imagePart.inlineData.mimeType ?? "image/png"};base64,${imagePart.inlineData.data})`;
-      messageContent = messagePart.text;
+      const storageService = this.ctx.chatluna_storage;
+      if (!storageService) {
+        messagePart.text = `![image](data:${imagePart.inlineData.mimeType ?? "image/png"};base64,${imagePart.inlineData.data})`;
+        messageContent = messagePart.text;
+      } else {
+        const buffer = Buffer.from(imagePart.inlineData.data, "base64");
+        const file = await storageService.createTempFile(
+          buffer,
+          "image_random"
+        );
+        messagePart.text = "[image]";
+        messageContent = [
+          {
+            type: "image_url",
+            image_url: file.url
+          }
+        ];
+      }
     }
     const deltaFunctionCall = chatFunctionCallingPart?.functionCall;
     if (deltaFunctionCall) {
@@ -810,7 +819,7 @@ var GeminiRequester = class extends ModelRequester {
     if (groundingContent.length > 0) {
       logger.debug(`grounding content: ${groundingContent}`);
       if (this._pluginConfig.groundingContentDisplay) {
-        const groundingMessage = new AIMessageChunk2(
+        const groundingMessage = new AIMessageChunk(
           `
 ${groundingContent}`
         );
@@ -823,8 +832,8 @@ ${groundingContent}`
     }
   }
   _createMessageChunk(content, functionCall, imagePart) {
-    const messageChunk = new AIMessageChunk2({
-      content
+    const messageChunk = new AIMessageChunk({
+      content: content ?? ""
     });
     messageChunk.additional_kwargs = {
       function_call: functionCall.name.length > 0 ? {
@@ -1030,7 +1039,10 @@ var Config4 = Schema.intersect([
   "en-US": require_en_US_schema()
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 });
-var inject = ["chatluna"];
+var inject = {
+  required: ["chatluna"],
+  optional: ["chatluna_storage"]
+};
 var name = "chatluna-google-gemini-adapter";
 export {
   Config4 as Config,

package/lib/utils.d.ts

@@ -1,4 +1,4 @@
-import { AIMessageChunk, BaseMessage, ChatMessageChunk, HumanMessageChunk, MessageType, SystemMessageChunk } from '@langchain/core/messages';
+import { BaseMessage, MessageType } from '@langchain/core/messages';
 import { StructuredTool } from '@langchain/core/tools';
 import { ChatCompletionFunction, ChatCompletionResponseMessage, ChatCompletionResponseMessageRoleEnum, ChatPart, ChatResponse } from './types';
 import { Config } from '.';
@@ -52,5 +52,4 @@ export declare function createChatGenerationParams(params: ModelRequestParams, p
     system_instruction: ChatCompletionResponseMessage;
     tools: Record<string, any>;
 }>;
-export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | ChatMessageChunk;
 export declare function isChatResponse(response: any): response is ChatResponse;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.2.23",
+  "version": "1.2.25",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -73,9 +73,14 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.22",
+    "koishi-plugin-chatluna": "^1.3.0-alpha.24",
     "koishi-plugin-chatluna-storage-service": "^0.0.8"
   },
+  "peerDependenciesMeta": {
+    "koishi-plugin-chatluna-storage-service": {
+      "optional": true
+    }
+  },
   "koishi": {
     "description": {
       "zh": "ChatLuna 的 Google Gemini 适配器",