koishi-plugin-chatluna-google-gemini-adapter 1.3.9 → 1.3.11

package/lib/index.cjs

@@ -67,6 +67,7 @@ var import_v1_shared_adapter = require("@chatluna/v1-shared-adapter");
 var import_string = require("koishi-plugin-chatluna/utils/string");
 var import_types = require("@langchain/core/utils/types");
 var import_zod_openapi = require("@anatine/zod-openapi");
+var import_object = require("koishi-plugin-chatluna/utils/object");
 async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
@@ -75,6 +76,7 @@ async function langchainMessageToGeminiMessage(messages, plugin, model) {
       if (role === "function" || hasFunctionCall) {
         return processFunctionMessage(
           message,
+          // 如果使用 new api，我们应该去掉 id，，，
           plugin.config.useCamelCaseSystemInstruction
         );
       }
@@ -332,6 +334,7 @@ function prepareModelConfig(params, pluginConfig) {
   let model = params.model;
   let enabledThinking = null;
   let thinkingLevel = "THINKING_LEVEL_UNSPECIFIED";
+  let imageSize;
   if (model.includes("-thinking") && model.includes("gemini-2.5")) {
     enabledThinking = !model.includes("-non-thinking");
     model = model.replace("-non-thinking", "").replace("-thinking", "");
@@ -356,6 +359,11 @@ function prepareModelConfig(params, pluginConfig) {
   } else {
     thinkingLevel = void 0;
   }
+  const imageSizeMatch = model.match(/-(2K|4K)$/);
+  if (imageSizeMatch) {
+    imageSize = imageSizeMatch[1];
+    model = model.replace(`-${imageSize}`, "");
+  }
   let imageGeneration = pluginConfig.imageGeneration ?? false;
   if (imageGeneration) {
     imageGeneration = params.model.includes("gemini-2.0-flash-exp") || params.model.includes("image");
@@ -365,7 +373,8 @@ function prepareModelConfig(params, pluginConfig) {
     enabledThinking,
     thinkingBudget,
     imageGeneration,
-    thinkingLevel
+    thinkingLevel,
+    imageSize
   };
 }
 __name(prepareModelConfig, "prepareModelConfig");
@@ -396,12 +405,15 @@ function createSafetySettings(model) {
 }
 __name(createSafetySettings, "createSafetySettings");
 function createGenerationConfig(params, modelConfig, pluginConfig) {
-  return {
+  const base = {
     stopSequences: params.stop,
     temperature: params.temperature,
     maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
     topP: params.topP,
     responseModalities: modelConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0,
+    imageConfig: modelConfig.imageSize ? {
+      imageSize: modelConfig.imageSize
+    } : void 0,
     thinkingConfig: modelConfig.enabledThinking != null || pluginConfig.includeThoughts ? filterKeys(
       {
         thinkingBudget: modelConfig.thinkingBudget,
@@ -411,6 +423,7 @@ function createGenerationConfig(params, modelConfig, pluginConfig) {
       notNullFn
     ) : void 0
   };
+  return (0, import_object.deepAssign)({}, base, params.overrideRequestParams ?? {});
 }
 __name(createGenerationConfig, "createGenerationConfig");
 async function createChatGenerationParams(params, plugin, modelConfig, pluginConfig) {
@@ -460,6 +473,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
   constructor(ctx, _configPool, _pluginConfig, _plugin) {
     super(ctx, _configPool, _pluginConfig, _plugin);
     this._pluginConfig = _pluginConfig;
+    this._plugin = _plugin;
   }
   static {
     __name(this, "GeminiRequester");
@@ -1016,6 +1030,7 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
       }
       const models = [];
       for (const model of rawModels) {
+        const modelNameLower = model.name.toLowerCase();
         const info = {
           name: model.name,
           maxTokens: model.inputTokenLimit,
@@ -1027,8 +1042,17 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
         };
         const thinkingModel = ["gemini-2.5-pro", "gemini-2.5-flash"];
         const thinkingLevelModel = ["gemini-3.0-pro"];
-        if (thinkingModel.some(
-          (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
+        const imageResolutionModel = ["gemini-3.0-pro-image"];
+        if (imageResolutionModel.some(
+          (name2) => modelNameLower.includes(name2)
+        )) {
+          models.push(
+            { ...info, name: model.name + "-2K" },
+            { ...info, name: model.name + "-4K" },
+            info
+          );
+        } else if (thinkingModel.some(
+          (name2) => modelNameLower.includes(name2) && !modelNameLower.includes("image")
         )) {
           if (!model.name.includes("-thinking")) {
             models.push(
@@ -1040,7 +1064,7 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
             models.push(info);
           }
         } else if (thinkingLevelModel.some(
-          (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
+          (name2) => modelNameLower.includes(name2) && !modelNameLower.includes("image")
         )) {
           models.push(
             { ...info, name: model.name + "-low-thinking" },

package/lib/index.mjs

@@ -64,6 +64,7 @@ import {
 } from "koishi-plugin-chatluna/utils/string";
 import { isZodSchemaV3 } from "@langchain/core/utils/types";
 import { generateSchema } from "@anatine/zod-openapi";
+import { deepAssign } from "koishi-plugin-chatluna/utils/object";
 async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
@@ -72,6 +73,7 @@ async function langchainMessageToGeminiMessage(messages, plugin, model) {
       if (role === "function" || hasFunctionCall) {
         return processFunctionMessage(
           message,
+          // 如果使用 new api，我们应该去掉 id，，，
           plugin.config.useCamelCaseSystemInstruction
         );
       }
@@ -329,6 +331,7 @@ function prepareModelConfig(params, pluginConfig) {
   let model = params.model;
   let enabledThinking = null;
   let thinkingLevel = "THINKING_LEVEL_UNSPECIFIED";
+  let imageSize;
   if (model.includes("-thinking") && model.includes("gemini-2.5")) {
     enabledThinking = !model.includes("-non-thinking");
     model = model.replace("-non-thinking", "").replace("-thinking", "");
@@ -353,6 +356,11 @@ function prepareModelConfig(params, pluginConfig) {
   } else {
     thinkingLevel = void 0;
   }
+  const imageSizeMatch = model.match(/-(2K|4K)$/);
+  if (imageSizeMatch) {
+    imageSize = imageSizeMatch[1];
+    model = model.replace(`-${imageSize}`, "");
+  }
   let imageGeneration = pluginConfig.imageGeneration ?? false;
   if (imageGeneration) {
     imageGeneration = params.model.includes("gemini-2.0-flash-exp") || params.model.includes("image");
@@ -362,7 +370,8 @@ function prepareModelConfig(params, pluginConfig) {
     enabledThinking,
     thinkingBudget,
     imageGeneration,
-    thinkingLevel
+    thinkingLevel,
+    imageSize
   };
 }
 __name(prepareModelConfig, "prepareModelConfig");
@@ -393,12 +402,15 @@ function createSafetySettings(model) {
 }
 __name(createSafetySettings, "createSafetySettings");
 function createGenerationConfig(params, modelConfig, pluginConfig) {
-  return {
+  const base = {
     stopSequences: params.stop,
     temperature: params.temperature,
     maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
     topP: params.topP,
     responseModalities: modelConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0,
+    imageConfig: modelConfig.imageSize ? {
+      imageSize: modelConfig.imageSize
+    } : void 0,
     thinkingConfig: modelConfig.enabledThinking != null || pluginConfig.includeThoughts ? filterKeys(
       {
         thinkingBudget: modelConfig.thinkingBudget,
@@ -408,6 +420,7 @@ function createGenerationConfig(params, modelConfig, pluginConfig) {
       notNullFn
     ) : void 0
   };
+  return deepAssign({}, base, params.overrideRequestParams ?? {});
 }
 __name(createGenerationConfig, "createGenerationConfig");
 async function createChatGenerationParams(params, plugin, modelConfig, pluginConfig) {
@@ -457,6 +470,7 @@ var GeminiRequester = class extends ModelRequester {
   constructor(ctx, _configPool, _pluginConfig, _plugin) {
     super(ctx, _configPool, _pluginConfig, _plugin);
     this._pluginConfig = _pluginConfig;
+    this._plugin = _plugin;
   }
   static {
     __name(this, "GeminiRequester");
@@ -1013,6 +1027,7 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
       }
       const models = [];
       for (const model of rawModels) {
+        const modelNameLower = model.name.toLowerCase();
         const info = {
           name: model.name,
           maxTokens: model.inputTokenLimit,
@@ -1024,8 +1039,17 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
         };
         const thinkingModel = ["gemini-2.5-pro", "gemini-2.5-flash"];
         const thinkingLevelModel = ["gemini-3.0-pro"];
-        if (thinkingModel.some(
-          (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
+        const imageResolutionModel = ["gemini-3.0-pro-image"];
+        if (imageResolutionModel.some(
+          (name2) => modelNameLower.includes(name2)
+        )) {
+          models.push(
+            { ...info, name: model.name + "-2K" },
+            { ...info, name: model.name + "-4K" },
+            info
+          );
+        } else if (thinkingModel.some(
+          (name2) => modelNameLower.includes(name2) && !modelNameLower.includes("image")
         )) {
           if (!model.name.includes("-thinking")) {
             models.push(
@@ -1037,7 +1061,7 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
             models.push(info);
           }
         } else if (thinkingLevelModel.some(
-          (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
+          (name2) => modelNameLower.includes(name2) && !modelNameLower.includes("image")
         )) {
           models.push(
             { ...info, name: model.name + "-low-thinking" },

package/lib/requester.d.ts

@@ -8,6 +8,7 @@ import { Context } from 'koishi';
 import { RunnableConfig } from '@langchain/core/runnables';
 export declare class GeminiRequester extends ModelRequester<ClientConfig, Config> implements EmbeddingsRequester {
     _pluginConfig: Config;
+    _plugin: ChatLunaPlugin<ClientConfig, Config>;
     constructor(ctx: Context, _configPool: ClientConfigPool<ClientConfig>, _pluginConfig: Config, _plugin: ChatLunaPlugin<ClientConfig, Config>);
     completion(params: ModelRequestParams): Promise<ChatGeneration>;
     completionStreamInternal(params: ModelRequestParams): AsyncGenerator<ChatGenerationChunk>;

package/lib/utils.d.ts

@@ -18,6 +18,7 @@ export declare function prepareModelConfig(params: ModelRequestParams, pluginCon
     thinkingBudget: number;
     imageGeneration: boolean;
     thinkingLevel: string;
+    imageSize: string;
 };
 export declare function createSafetySettings(model: string): {
     category: string;
@@ -29,20 +30,16 @@ export declare function createGenerationConfig(params: ModelRequestParams, model
     maxOutputTokens: number;
     topP: number;
     responseModalities: string[];
+    imageConfig: {
+        imageSize: string;
+    };
     thinkingConfig: Record<"thinkingBudget" | "includeThoughts" | "thinkingLevel", string | number | boolean>;
-};
+} & Record<string, any>;
 export declare function createChatGenerationParams(params: ModelRequestParams, plugin: ChatLunaPlugin<ClientConfig, Config>, modelConfig: ReturnType<typeof prepareModelConfig>, pluginConfig: Config): Promise<{
     [x: string]: Record<string, any> | ChatCompletionResponseMessage | ChatCompletionResponseMessage[] | {
         category: string;
         threshold: string;
-    }[] | {
-        stopSequences: string | string[];
-        temperature: number;
-        maxOutputTokens: number;
-        topP: number;
-        responseModalities: string[];
-        thinkingConfig: Record<"thinkingBudget" | "includeThoughts" | "thinkingLevel", string | number | boolean>;
-    };
+    }[];
     contents: ChatCompletionResponseMessage[];
     safetySettings: {
         category: string;
@@ -54,8 +51,11 @@ export declare function createChatGenerationParams(params: ModelRequestParams, p
         maxOutputTokens: number;
         topP: number;
         responseModalities: string[];
+        imageConfig: {
+            imageSize: string;
+        };
         thinkingConfig: Record<"thinkingBudget" | "includeThoughts" | "thinkingLevel", string | number | boolean>;
-    };
+    } & Record<string, any>;
     tools: Record<string, any>;
 }>;
 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.3.9",
+  "version": "1.3.11",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -63,7 +63,7 @@
   ],
   "dependencies": {
     "@anatine/zod-openapi": "^2.2.8",
-    "@chatluna/v1-shared-adapter": "^1.0.16",
+    "@chatluna/v1-shared-adapter": "^1.0.20",
     "@langchain/core": "0.3.62",
     "openapi3-ts": "^4.5.0",
     "zod": "3.25.76",
@@ -75,7 +75,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.9",
-    "koishi-plugin-chatluna": "^1.3.0",
+    "koishi-plugin-chatluna": "^1.3.4",
     "koishi-plugin-chatluna-storage-service": "^0.0.11"
   },
   "peerDependenciesMeta": {