koishi-plugin-chatluna-google-gemini-adapter 1.3.8 → 1.3.10

package/lib/client.d.ts

@@ -8,11 +8,11 @@ import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
 import { RunnableConfig } from '@langchain/core/runnables';
 export declare class GeminiClient extends PlatformModelAndEmbeddingsClient<ClientConfig> {
     private _config;
-    plugin: ChatLunaPlugin;
+    plugin: ChatLunaPlugin<ClientConfig, Config>;
     platform: string;
     private _requester;
     get logger(): import("reggol");
-    constructor(ctx: Context, _config: Config, plugin: ChatLunaPlugin);
+    constructor(ctx: Context, _config: Config, plugin: ChatLunaPlugin<ClientConfig, Config>);
     refreshModels(config?: RunnableConfig): Promise<ModelInfo[]>;
     protected _createModel(model: string): ChatLunaChatModel | ChatLunaBaseEmbeddings;
 }

package/lib/index.cjs

@@ -23,14 +23,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/zh-CN.schema.yml
 var require_zh_CN_schema = __commonJS({
   "src/locales/zh-CN.schema.yml"(exports2, module2) {
-    module2.exports = { $inner: [{}, { $desc: "请求选项", platform: "适配器的平台名。（不懂请不要修改）", apiKeys: { $inner: ["Gemini API Key", "Gemini API 请求地址", "是否启用此配置"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxContextRatio: "最大上下文使用比例（0~1），控制可用的模型上下文窗口大小的最大百分比。例如 0.35 表示最多使用模型上下文的 35%。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。", thinkingBudget: "思考预算，范围：(-1~24576)，设置的数值越大，思考时花费的 Token 越多,-1 为动态思考。目前仅支持 gemini 2.5 系列模型。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-3.0-pro-image-preview` 和 `gemini-2.5-flash-image-preview` 模型。", searchThreshold: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContext: "为模型启用 URL 内容获取工具。", nonStreaming: "强制不启用流式返回。开启后，将总是以非流式发起请求，即便配置了 stream 参数。", useCamelCaseSystemInstruction: "使用大写的 systemInstruction 而不是小写的 system_instruction" }] };
+    module2.exports = { $inner: [{}, { $desc: "请求选项", platform: "适配器的平台名。（不懂请不要修改）", apiKeys: { $inner: ["Gemini API Key", "Gemini API 请求地址", "是否启用此配置"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxContextRatio: "最大上下文使用比例（0~1），控制可用的模型上下文窗口大小的最大百分比。例如 0.35 表示最多使用模型上下文的 35%。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。(开启后将无法使用工具调用）", thinkingBudget: "思考预算，范围：(-1~24576)，设置的数值越大，思考时花费的 Token 越多,-1 为动态思考。目前仅支持 gemini 2.5 系列模型。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-*-image-*` 和 `gemini-2.5-flash-image-preview` 模型。", searchThreshold: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContext: "为模型启用 URL 内容获取工具。", nonStreaming: "强制不启用流式返回。开启后，将总是以非流式发起请求，即便配置了 stream 参数。", useCamelCaseSystemInstruction: "使用大写的 systemInstruction 而不是小写的 system_instruction" }] };
   }
 });
 
 // src/locales/en-US.schema.yml
 var require_en_US_schema = __commonJS({
   "src/locales/en-US.schema.yml"(exports2, module2) {
-    module2.exports = { $inner: [{}, { $desc: "API Configuration", platform: "Adapter platform name. (Do not modify if you do not understand)", apiKeys: { $inner: ["Gemini API Key", "Gemini API Endpoint (optional)", "Enabled"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxContextRatio: "Maximum context usage ratio (0-1). Controls the maximum percentage of model context window available for use. For example, 0.35 means at most 35% of the model context can be used.", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", thinkingBudget: "Thinking budget (-1-24576). (0: dynamic thinking) Higher: more tokens spent on thinking. Currently only supports `gemini-2.5` series models.", groundingContentDisplay: "Enable display of search results", imageGeneration: "Enable image generation (only for `gemini-3.0-pro-image-preview` and `gemini-2.5-flash-image-preview` model)", searchThreshold: "Search confidence [threshold](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval) (0-1). Lower: more likely to use Google search", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContext: "Enable URL context retrieval tool", nonStreaming: "Force disable streaming response. When enabled, requests will always be made in non-streaming mode, even if the stream parameter is configured.", useCamelCaseSystemInstruction: "Use camelCase systemInstruction instead of snake_case system_instruction" }] };
+    module2.exports = { $inner: [{}, { $desc: "API Configuration", platform: "Adapter platform name. (Do not modify if you do not understand)", apiKeys: { $inner: ["Gemini API Key", "Gemini API Endpoint (optional)", "Enabled"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxContextRatio: "Maximum context usage ratio (0-1). Controls the maximum percentage of model context window available for use. For example, 0.35 means at most 35% of the model context can be used.", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", thinkingBudget: "Thinking budget (-1-24576). (0: dynamic thinking) Higher: more tokens spent on thinking. Currently only supports `gemini-2.5` series models.", groundingContentDisplay: "Enable display of search results", imageGeneration: "Enable image generation (only for `gemini-*-image-*` and `gemini-2.5-flash-image-preview` model)", searchThreshold: "Search confidence [threshold](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval) (0-1). Lower: more likely to use Google search", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContext: "Enable URL context retrieval tool", nonStreaming: "Force disable streaming response. When enabled, requests will always be made in non-streaming mode, even if the stream parameter is configured.", useCamelCaseSystemInstruction: "Use camelCase systemInstruction instead of snake_case system_instruction" }] };
   }
 });
 
@@ -46,7 +46,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_chat = require("koishi-plugin-chatluna/services/chat");
-var import_koishi2 = require("koishi");
+var import_koishi = require("koishi");
 
 // src/client.ts
 var import_client = require("koishi-plugin-chatluna/llm-core/platform/client");
@@ -67,14 +67,18 @@ 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_koishi = require("koishi");
+var import_object = require("koishi-plugin-chatluna/utils/object");
 async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
       const role = messageTypeToGeminiRole(message.getType());
       const hasFunctionCall = message.tool_calls != null && message.tool_calls.length > 0;
       if (role === "function" || hasFunctionCall) {
-        return processFunctionMessage(message);
+        return processFunctionMessage(
+          message,
+          // 如果使用 new api，我们应该去掉 id，，，
+          plugin.config.useCamelCaseSystemInstruction
+        );
       }
       const result = {
         role,
@@ -134,7 +138,7 @@ function parseJsonArgs(args) {
   }
 }
 __name(parseJsonArgs, "parseJsonArgs");
-function processFunctionMessage(message) {
+function processFunctionMessage(message, removeId) {
   const thoughtData = message.additional_kwargs["thought_data"] ?? {};
   if (message["tool_calls"]) {
     message = message;
@@ -142,27 +146,33 @@ function processFunctionMessage(message) {
     return {
       role: "model",
       parts: toolCalls.map((toolCall) => {
+        const functionCall = {
+          name: toolCall.name,
+          args: toolCall.args
+        };
+        if (!removeId) {
+          functionCall.id = toolCall.id;
+        }
         return {
-          functionCall: {
-            name: toolCall.name,
-            args: toolCall.args,
-            id: toolCall.id
-          },
+          functionCall,
           ...thoughtData
         };
       })
     };
   }
   const finalMessage = message;
+  const functionResponse = {
+    name: message.name,
+    response: parseJsonArgs(message.content)
+  };
+  if (!removeId) {
+    functionResponse.id = finalMessage.tool_call_id;
+  }
   return {
     role: "user",
     parts: [
       {
-        functionResponse: {
-          name: message.name,
-          id: finalMessage.tool_call_id,
-          response: parseJsonArgs(message.content)
-        }
+        functionResponse
       }
     ]
   };
@@ -324,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", "");
@@ -348,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");
@@ -357,7 +373,8 @@ function prepareModelConfig(params, pluginConfig) {
     enabledThinking,
     thinkingBudget,
     imageGeneration,
-    thinkingLevel
+    thinkingLevel,
+    imageSize
   };
 }
 __name(prepareModelConfig, "prepareModelConfig");
@@ -388,21 +405,25 @@ 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,
-    thinkingConfig: modelConfig.enabledThinking != null || pluginConfig.includeThoughts ? (0, import_koishi.filterKeys)(
+    imageConfig: modelConfig.imageSize ? {
+      imageSize: modelConfig.imageSize
+    } : void 0,
+    thinkingConfig: modelConfig.enabledThinking != null || pluginConfig.includeThoughts ? filterKeys(
       {
         thinkingBudget: modelConfig.thinkingBudget,
         thinkingLevel: modelConfig.thinkingLevel,
         includeThoughts: pluginConfig.includeThoughts
       },
-      (k, v) => v != null
+      notNullFn
     ) : void 0
   };
+  return (0, import_object.deepAssign)({}, base, params.overrideRequestParams ?? {});
 }
 __name(createGenerationConfig, "createGenerationConfig");
 async function createChatGenerationParams(params, plugin, modelConfig, pluginConfig) {
@@ -434,6 +455,16 @@ function isChatResponse(response) {
   return "candidates" in response;
 }
 __name(isChatResponse, "isChatResponse");
+function notNullFn(_, v) {
+  return v != null;
+}
+__name(notNullFn, "notNullFn");
+function filterKeys(obj, fn) {
+  return Object.fromEntries(
+    Object.entries(obj).filter(([k, v]) => fn(k, v))
+  );
+}
+__name(filterKeys, "filterKeys");
 
 // src/requester.ts
 var import_string2 = require("koishi-plugin-chatluna/utils/string");
@@ -442,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");
@@ -1009,6 +1041,7 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
         };
         const thinkingModel = ["gemini-2.5-pro", "gemini-2.5-flash"];
         const thinkingLevelModel = ["gemini-3.0-pro"];
+        const imageResolutionModel = ["gemini-3.0-pro-image"];
         if (thinkingModel.some(
           (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
         )) {
@@ -1028,6 +1061,14 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
             { ...info, name: model.name + "-low-thinking" },
             info
           );
+        } else if (imageResolutionModel.some(
+          (name2) => model.name.toLowerCase().includes(name2)
+        )) {
+          models.push(
+            { ...info, name: model.name + "-2K" },
+            { ...info, name: model.name + "-4K" },
+            info
+          );
         } else {
           models.push(info);
         }
@@ -1096,33 +1137,33 @@ function apply(ctx, config) {
   });
 }
 __name(apply, "apply");
-var Config4 = import_koishi2.Schema.intersect([
+var Config4 = import_koishi.Schema.intersect([
   import_chat.ChatLunaPlugin.Config,
-  import_koishi2.Schema.object({
-    platform: import_koishi2.Schema.string().default("gemini"),
-    apiKeys: import_koishi2.Schema.array(
-      import_koishi2.Schema.tuple([
-        import_koishi2.Schema.string().role("secret").default(""),
-        import_koishi2.Schema.string().default(
+  import_koishi.Schema.object({
+    platform: import_koishi.Schema.string().default("gemini"),
+    apiKeys: import_koishi.Schema.array(
+      import_koishi.Schema.tuple([
+        import_koishi.Schema.string().role("secret").default(""),
+        import_koishi.Schema.string().default(
           "https://generativelanguage.googleapis.com/v1beta"
         ),
-        import_koishi2.Schema.boolean().default(true)
+        import_koishi.Schema.boolean().default(true)
       ])
     ).default([[]]).role("table")
   }),
-  import_koishi2.Schema.object({
-    maxContextRatio: import_koishi2.Schema.number().min(0).max(1).step(1e-4).role("slider").default(0.35),
-    temperature: import_koishi2.Schema.percent().min(0).max(2).step(0.1).default(1),
-    googleSearch: import_koishi2.Schema.boolean().default(false),
-    codeExecution: import_koishi2.Schema.boolean().default(false),
-    urlContext: import_koishi2.Schema.boolean().default(false),
-    thinkingBudget: import_koishi2.Schema.number().min(-1).max(24576).default(-1),
-    includeThoughts: import_koishi2.Schema.boolean().default(false),
-    nonStreaming: import_koishi2.Schema.boolean().default(false),
-    imageGeneration: import_koishi2.Schema.boolean().default(false),
-    groundingContentDisplay: import_koishi2.Schema.boolean().default(false),
-    searchThreshold: import_koishi2.Schema.number().min(0).max(1).step(0.1).default(0.5),
-    useCamelCaseSystemInstruction: import_koishi2.Schema.boolean().default(false)
+  import_koishi.Schema.object({
+    maxContextRatio: import_koishi.Schema.number().min(0).max(1).step(1e-4).role("slider").default(0.35),
+    temperature: import_koishi.Schema.percent().min(0).max(2).step(0.1).default(1),
+    googleSearch: import_koishi.Schema.boolean().default(false),
+    codeExecution: import_koishi.Schema.boolean().default(false),
+    urlContext: import_koishi.Schema.boolean().default(false),
+    thinkingBudget: import_koishi.Schema.number().min(-1).max(24576).default(-1),
+    includeThoughts: import_koishi.Schema.boolean().default(false),
+    nonStreaming: import_koishi.Schema.boolean().default(false),
+    imageGeneration: import_koishi.Schema.boolean().default(false),
+    groundingContentDisplay: import_koishi.Schema.boolean().default(false),
+    searchThreshold: import_koishi.Schema.number().min(0).max(1).step(0.1).default(0.5),
+    useCamelCaseSystemInstruction: import_koishi.Schema.boolean().default(false)
   })
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),

package/lib/index.mjs

@@ -8,14 +8,14 @@ var __commonJS = (cb, mod) => function __require() {
 // src/locales/zh-CN.schema.yml
 var require_zh_CN_schema = __commonJS({
   "src/locales/zh-CN.schema.yml"(exports, module) {
-    module.exports = { $inner: [{}, { $desc: "请求选项", platform: "适配器的平台名。（不懂请不要修改）", apiKeys: { $inner: ["Gemini API Key", "Gemini API 请求地址", "是否启用此配置"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxContextRatio: "最大上下文使用比例（0~1），控制可用的模型上下文窗口大小的最大百分比。例如 0.35 表示最多使用模型上下文的 35%。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。", thinkingBudget: "思考预算，范围：(-1~24576)，设置的数值越大，思考时花费的 Token 越多,-1 为动态思考。目前仅支持 gemini 2.5 系列模型。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-3.0-pro-image-preview` 和 `gemini-2.5-flash-image-preview` 模型。", searchThreshold: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContext: "为模型启用 URL 内容获取工具。", nonStreaming: "强制不启用流式返回。开启后，将总是以非流式发起请求，即便配置了 stream 参数。", useCamelCaseSystemInstruction: "使用大写的 systemInstruction 而不是小写的 system_instruction" }] };
+    module.exports = { $inner: [{}, { $desc: "请求选项", platform: "适配器的平台名。（不懂请不要修改）", apiKeys: { $inner: ["Gemini API Key", "Gemini API 请求地址", "是否启用此配置"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxContextRatio: "最大上下文使用比例（0~1），控制可用的模型上下文窗口大小的最大百分比。例如 0.35 表示最多使用模型上下文的 35%。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。(开启后将无法使用工具调用）", thinkingBudget: "思考预算，范围：(-1~24576)，设置的数值越大，思考时花费的 Token 越多,-1 为动态思考。目前仅支持 gemini 2.5 系列模型。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-*-image-*` 和 `gemini-2.5-flash-image-preview` 模型。", searchThreshold: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContext: "为模型启用 URL 内容获取工具。", nonStreaming: "强制不启用流式返回。开启后，将总是以非流式发起请求，即便配置了 stream 参数。", useCamelCaseSystemInstruction: "使用大写的 systemInstruction 而不是小写的 system_instruction" }] };
   }
 });
 
 // src/locales/en-US.schema.yml
 var require_en_US_schema = __commonJS({
   "src/locales/en-US.schema.yml"(exports, module) {
-    module.exports = { $inner: [{}, { $desc: "API Configuration", platform: "Adapter platform name. (Do not modify if you do not understand)", apiKeys: { $inner: ["Gemini API Key", "Gemini API Endpoint (optional)", "Enabled"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxContextRatio: "Maximum context usage ratio (0-1). Controls the maximum percentage of model context window available for use. For example, 0.35 means at most 35% of the model context can be used.", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", thinkingBudget: "Thinking budget (-1-24576). (0: dynamic thinking) Higher: more tokens spent on thinking. Currently only supports `gemini-2.5` series models.", groundingContentDisplay: "Enable display of search results", imageGeneration: "Enable image generation (only for `gemini-3.0-pro-image-preview` and `gemini-2.5-flash-image-preview` model)", searchThreshold: "Search confidence [threshold](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval) (0-1). Lower: more likely to use Google search", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContext: "Enable URL context retrieval tool", nonStreaming: "Force disable streaming response. When enabled, requests will always be made in non-streaming mode, even if the stream parameter is configured.", useCamelCaseSystemInstruction: "Use camelCase systemInstruction instead of snake_case system_instruction" }] };
+    module.exports = { $inner: [{}, { $desc: "API Configuration", platform: "Adapter platform name. (Do not modify if you do not understand)", apiKeys: { $inner: ["Gemini API Key", "Gemini API Endpoint (optional)", "Enabled"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxContextRatio: "Maximum context usage ratio (0-1). Controls the maximum percentage of model context window available for use. For example, 0.35 means at most 35% of the model context can be used.", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", thinkingBudget: "Thinking budget (-1-24576). (0: dynamic thinking) Higher: more tokens spent on thinking. Currently only supports `gemini-2.5` series models.", groundingContentDisplay: "Enable display of search results", imageGeneration: "Enable image generation (only for `gemini-*-image-*` and `gemini-2.5-flash-image-preview` model)", searchThreshold: "Search confidence [threshold](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval) (0-1). Lower: more likely to use Google search", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContext: "Enable URL context retrieval tool", nonStreaming: "Force disable streaming response. When enabled, requests will always be made in non-streaming mode, even if the stream parameter is configured.", useCamelCaseSystemInstruction: "Use camelCase systemInstruction instead of snake_case system_instruction" }] };
   }
 });
 
@@ -64,14 +64,18 @@ import {
 } from "koishi-plugin-chatluna/utils/string";
 import { isZodSchemaV3 } from "@langchain/core/utils/types";
 import { generateSchema } from "@anatine/zod-openapi";
-import { filterKeys } from "koishi";
+import { deepAssign } from "koishi-plugin-chatluna/utils/object";
 async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
       const role = messageTypeToGeminiRole(message.getType());
       const hasFunctionCall = message.tool_calls != null && message.tool_calls.length > 0;
       if (role === "function" || hasFunctionCall) {
-        return processFunctionMessage(message);
+        return processFunctionMessage(
+          message,
+          // 如果使用 new api，我们应该去掉 id，，，
+          plugin.config.useCamelCaseSystemInstruction
+        );
       }
       const result = {
         role,
@@ -131,7 +135,7 @@ function parseJsonArgs(args) {
   }
 }
 __name(parseJsonArgs, "parseJsonArgs");
-function processFunctionMessage(message) {
+function processFunctionMessage(message, removeId) {
   const thoughtData = message.additional_kwargs["thought_data"] ?? {};
   if (message["tool_calls"]) {
     message = message;
@@ -139,27 +143,33 @@ function processFunctionMessage(message) {
     return {
       role: "model",
       parts: toolCalls.map((toolCall) => {
+        const functionCall = {
+          name: toolCall.name,
+          args: toolCall.args
+        };
+        if (!removeId) {
+          functionCall.id = toolCall.id;
+        }
         return {
-          functionCall: {
-            name: toolCall.name,
-            args: toolCall.args,
-            id: toolCall.id
-          },
+          functionCall,
           ...thoughtData
         };
       })
     };
   }
   const finalMessage = message;
+  const functionResponse = {
+    name: message.name,
+    response: parseJsonArgs(message.content)
+  };
+  if (!removeId) {
+    functionResponse.id = finalMessage.tool_call_id;
+  }
   return {
     role: "user",
     parts: [
       {
-        functionResponse: {
-          name: message.name,
-          id: finalMessage.tool_call_id,
-          response: parseJsonArgs(message.content)
-        }
+        functionResponse
       }
     ]
   };
@@ -321,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", "");
@@ -345,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");
@@ -354,7 +370,8 @@ function prepareModelConfig(params, pluginConfig) {
     enabledThinking,
     thinkingBudget,
     imageGeneration,
-    thinkingLevel
+    thinkingLevel,
+    imageSize
   };
 }
 __name(prepareModelConfig, "prepareModelConfig");
@@ -385,21 +402,25 @@ 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,
         thinkingLevel: modelConfig.thinkingLevel,
         includeThoughts: pluginConfig.includeThoughts
       },
-      (k, v) => v != null
+      notNullFn
     ) : void 0
   };
+  return deepAssign({}, base, params.overrideRequestParams ?? {});
 }
 __name(createGenerationConfig, "createGenerationConfig");
 async function createChatGenerationParams(params, plugin, modelConfig, pluginConfig) {
@@ -431,6 +452,16 @@ function isChatResponse(response) {
   return "candidates" in response;
 }
 __name(isChatResponse, "isChatResponse");
+function notNullFn(_, v) {
+  return v != null;
+}
+__name(notNullFn, "notNullFn");
+function filterKeys(obj, fn) {
+  return Object.fromEntries(
+    Object.entries(obj).filter(([k, v]) => fn(k, v))
+  );
+}
+__name(filterKeys, "filterKeys");
 
 // src/requester.ts
 import { getMessageContent } from "koishi-plugin-chatluna/utils/string";
@@ -439,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");
@@ -1006,6 +1038,7 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
         };
         const thinkingModel = ["gemini-2.5-pro", "gemini-2.5-flash"];
         const thinkingLevelModel = ["gemini-3.0-pro"];
+        const imageResolutionModel = ["gemini-3.0-pro-image"];
         if (thinkingModel.some(
           (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
         )) {
@@ -1025,6 +1058,14 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
             { ...info, name: model.name + "-low-thinking" },
             info
           );
+        } else if (imageResolutionModel.some(
+          (name2) => model.name.toLowerCase().includes(name2)
+        )) {
+          models.push(
+            { ...info, name: model.name + "-2K" },
+            { ...info, name: model.name + "-4K" },
+            info
+          );
         } else {
           models.push(info);
         }

package/lib/requester.d.ts

@@ -6,9 +6,10 @@ import { GeminiModelInfo } from './types';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
 import { Context } from 'koishi';
 import { RunnableConfig } from '@langchain/core/runnables';
-export declare class GeminiRequester extends ModelRequester implements EmbeddingsRequester {
+export declare class GeminiRequester extends ModelRequester<ClientConfig, Config> implements EmbeddingsRequester {
     _pluginConfig: Config;
-    constructor(ctx: Context, _configPool: ClientConfigPool<ClientConfig>, _pluginConfig: Config, _plugin: ChatLunaPlugin);
+    _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>;
     completionInternal(params: ModelRequestParams): Promise<ChatGeneration>;

package/lib/utils.d.ts

@@ -4,7 +4,8 @@ import { ChatCompletionFunction, ChatCompletionResponseMessage, ChatCompletionRe
 import { Config } from '.';
 import { ModelRequestParams } from 'koishi-plugin-chatluna/llm-core/platform/api';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
-export declare function langchainMessageToGeminiMessage(messages: BaseMessage[], plugin: ChatLunaPlugin, model?: string): Promise<ChatCompletionResponseMessage[]>;
+import { ClientConfig } from 'koishi-plugin-chatluna/llm-core/platform/config';
+export declare function langchainMessageToGeminiMessage(messages: BaseMessage[], plugin: ChatLunaPlugin<ClientConfig, Config>, model?: string): Promise<ChatCompletionResponseMessage[]>;
 export declare function extractSystemMessages(messages: ChatCompletionResponseMessage[]): [ChatCompletionResponseMessage, ChatCompletionResponseMessage[]];
 export declare function partAsType<T extends ChatPart>(part: ChatPart): T;
 export declare function partAsTypeCheck<T extends ChatPart>(part: ChatPart, check: (part: ChatPart & unknown) => boolean): T | undefined;
@@ -17,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;
@@ -28,20 +30,16 @@ export declare function createGenerationConfig(params: ModelRequestParams, model
     maxOutputTokens: number;
     topP: number;
     responseModalities: string[];
-    thinkingConfig: import("cosmokit").Dict<string | number | boolean, "thinkingBudget" | "thinkingLevel" | "includeThoughts">;
-};
-export declare function createChatGenerationParams(params: ModelRequestParams, plugin: ChatLunaPlugin, modelConfig: ReturnType<typeof prepareModelConfig>, pluginConfig: Config): Promise<{
-    [x: string]: {
-        stopSequences: string | string[];
-        temperature: number;
-        maxOutputTokens: number;
-        topP: number;
-        responseModalities: string[];
-        thinkingConfig: import("cosmokit").Dict<string | number | boolean, "thinkingBudget" | "thinkingLevel" | "includeThoughts">;
-    } | ChatCompletionResponseMessage | ChatCompletionResponseMessage[] | {
+    imageConfig: {
+        imageSize: string;
+    };
+    thinkingConfig: Record<"thinkingBudget" | "thinkingLevel" | "includeThoughts", 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;
-    }[] | Record<string, any>;
+    }[];
     contents: ChatCompletionResponseMessage[];
     safetySettings: {
         category: string;
@@ -53,8 +51,11 @@ export declare function createChatGenerationParams(params: ModelRequestParams, p
         maxOutputTokens: number;
         topP: number;
         responseModalities: string[];
-        thinkingConfig: import("cosmokit").Dict<string | number | boolean, "thinkingBudget" | "thinkingLevel" | "includeThoughts">;
-    };
+        imageConfig: {
+            imageSize: string;
+        };
+        thinkingConfig: Record<"thinkingBudget" | "thinkingLevel" | "includeThoughts", 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.8",
+  "version": "1.3.10",
   "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.17",
     "@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.1",
     "koishi-plugin-chatluna-storage-service": "^0.0.11"
   },
   "peerDependenciesMeta": {