koishi-plugin-chatluna-google-gemini-adapter 1.1.2 → 1.1.4

package/lib/index.cjs

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __commonJS = (cb, mod) => function __require() {
@@ -18,6 +20,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/locales/zh-CN.schema.yml
@@ -67,7 +77,7 @@ var import_zod_to_json_schema = require("zod-to-json-schema");
 async function langchainMessageToGeminiMessage(messages, model) {
   const mappedMessage = await Promise.all(
     messages.map(async (rawMessage) => {
-      const role = messageTypeToGeminiRole(rawMessage._getType());
+      const role = messageTypeToGeminiRole(rawMessage.getType());
       if (role === "function" || rawMessage.additional_kwargs?.function_call != null) {
         return {
           role: "function",
@@ -133,14 +143,23 @@ async function langchainMessageToGeminiMessage(messages, model) {
       };
       if ((model.includes("vision") || model.includes("gemini")) && images != null && !model.includes("gemini-1.0")) {
         for (const image of images) {
+          const mineType = image.split(";")?.[0]?.split(":")?.[1];
+          const data = image.replace(/^data:image\/\w+;base64,/, "");
           result2.parts.push({
             inline_data: {
               // base64 image match type
-              data: image.replace(/^data:image\/\w+;base64,/, ""),
-              mime_type: "image/jpeg"
+              data,
+              mime_type: mineType ?? "image/jpeg"
             }
           });
         }
+        result2.parts = result2.parts.filter((uncheckedPart) => {
+          const part = partAsTypeCheck(
+            uncheckedPart,
+            (part2) => part2["text"] != null
+          );
+          return part == null || part.text.length > 0;
+        });
       }
       return result2;
     })
@@ -297,6 +316,7 @@ function messageTypeToGeminiRole(type) {
 __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 
 // src/requester.ts
+var import_promises = __toESM(require("fs/promises"), 1);
 var GeminiRequester = class extends import_api.ModelRequester {
   constructor(_config, _plugin, _pluginConfig) {
     super();
@@ -419,7 +439,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
           }
           content = messagePart.text;
         } else if (imagePart) {
-          messagePart.text = `![image](data:${imagePart.inlineData.mime_type};base64,${imagePart.inlineData.data})`;
+          messagePart.text = `![image](data:${imagePart.inlineData.mimeType ?? "image/png"};base64,${imagePart.inlineData.data})`;
           content = messagePart.text;
         }
         const deltaFunctionCall = chatFunctionCallingPart?.functionCall;
@@ -449,7 +469,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
               args: functionCall.arguments
             } : void 0,
             images: imagePart ? [
-              `data:${imagePart.inlineData.mime_type};base64,${imagePart.inlineData.data})`
+              `data:${imagePart.inlineData.mimeType ?? "image/png"};base64,${imagePart.inlineData.data}`
             ] : void 0
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
           };
@@ -573,6 +593,7 @@ ${groundingContent}`
       }
     }
     const body = JSON.stringify(data);
+    import_promises.default.writeFile("./request.json", body);
     return this._plugin.fetch(requestUrl, {
       body,
       headers: this._buildHeaders(),
@@ -647,7 +668,7 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
             if (model2.includes("gemini-1.5-pro")) {
               return 1048576;
             }
-            if (model2.includes("gemini-1.5-flash") || model2.includes("gemini-2.0-pro")) {
+            if (model2.includes("gemini-1.5-flash") || model2.includes("gemini-2.0-pro") || model2.includes("gemini-2.5-pro")) {
               return 2097152;
             }
             if (model2.includes("gemini-1.0-pro")) {

package/lib/index.mjs

@@ -61,7 +61,7 @@ import { zodToJsonSchema } from "zod-to-json-schema";
 async function langchainMessageToGeminiMessage(messages, model) {
   const mappedMessage = await Promise.all(
     messages.map(async (rawMessage) => {
-      const role = messageTypeToGeminiRole(rawMessage._getType());
+      const role = messageTypeToGeminiRole(rawMessage.getType());
       if (role === "function" || rawMessage.additional_kwargs?.function_call != null) {
         return {
           role: "function",
@@ -127,14 +127,23 @@ async function langchainMessageToGeminiMessage(messages, model) {
       };
       if ((model.includes("vision") || model.includes("gemini")) && images != null && !model.includes("gemini-1.0")) {
         for (const image of images) {
+          const mineType = image.split(";")?.[0]?.split(":")?.[1];
+          const data = image.replace(/^data:image\/\w+;base64,/, "");
           result2.parts.push({
             inline_data: {
               // base64 image match type
-              data: image.replace(/^data:image\/\w+;base64,/, ""),
-              mime_type: "image/jpeg"
+              data,
+              mime_type: mineType ?? "image/jpeg"
             }
           });
         }
+        result2.parts = result2.parts.filter((uncheckedPart) => {
+          const part = partAsTypeCheck(
+            uncheckedPart,
+            (part2) => part2["text"] != null
+          );
+          return part == null || part.text.length > 0;
+        });
       }
       return result2;
     })
@@ -291,6 +300,7 @@ function messageTypeToGeminiRole(type) {
 __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 
 // src/requester.ts
+import fs from "fs/promises";
 var GeminiRequester = class extends ModelRequester {
   constructor(_config, _plugin, _pluginConfig) {
     super();
@@ -413,7 +423,7 @@ var GeminiRequester = class extends ModelRequester {
           }
           content = messagePart.text;
         } else if (imagePart) {
-          messagePart.text = `![image](data:${imagePart.inlineData.mime_type};base64,${imagePart.inlineData.data})`;
+          messagePart.text = `![image](data:${imagePart.inlineData.mimeType ?? "image/png"};base64,${imagePart.inlineData.data})`;
           content = messagePart.text;
         }
         const deltaFunctionCall = chatFunctionCallingPart?.functionCall;
@@ -443,7 +453,7 @@ var GeminiRequester = class extends ModelRequester {
               args: functionCall.arguments
             } : void 0,
             images: imagePart ? [
-              `data:${imagePart.inlineData.mime_type};base64,${imagePart.inlineData.data})`
+              `data:${imagePart.inlineData.mimeType ?? "image/png"};base64,${imagePart.inlineData.data}`
             ] : void 0
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
           };
@@ -567,6 +577,7 @@ ${groundingContent}`
       }
     }
     const body = JSON.stringify(data);
+    fs.writeFile("./request.json", body);
     return this._plugin.fetch(requestUrl, {
       body,
       headers: this._buildHeaders(),
@@ -641,7 +652,7 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
             if (model2.includes("gemini-1.5-pro")) {
               return 1048576;
             }
-            if (model2.includes("gemini-1.5-flash") || model2.includes("gemini-2.0-pro")) {
+            if (model2.includes("gemini-1.5-flash") || model2.includes("gemini-2.0-pro") || model2.includes("gemini-2.5-pro")) {
               return 2097152;
             }
             if (model2.includes("gemini-1.0-pro")) {

package/lib/types.d.ts

@@ -9,7 +9,7 @@ export type ChatMessagePart = {
 };
 export type ChatInlineDataPart = {
     inlineData: {
-        mime_type: string;
+        mimeType: string;
         data?: string;
     };
 };

package/lib/utils.d.ts

@@ -8,4 +8,4 @@ export declare function partAsTypeCheck<T extends ChatPart>(part: ChatPart, chec
 export declare function formatToolsToGeminiAITools(tools: StructuredTool[], config: Config, model: string): Record<string, any>;
 export declare function formatToolToGeminiAITool(tool: StructuredTool): ChatCompletionFunction;
 export declare function messageTypeToGeminiRole(type: MessageType): ChatCompletionResponseMessageRoleEnum;
-export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | ChatMessageChunk;
+export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | ChatMessageChunk;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -72,7 +72,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.4",
-    "koishi-plugin-chatluna": "^1.1.2"
+    "koishi-plugin-chatluna": "^1.1.4"
   },
   "koishi": {
     "description": {