koishi-plugin-chatluna-google-gemini-adapter 1.3.4 → 1.3.5

package/lib/index.cjs

@@ -46,7 +46,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_chat = require("koishi-plugin-chatluna/services/chat");
-var import_koishi = require("koishi");
+var import_koishi2 = require("koishi");
 
 // src/client.ts
 var import_client = require("koishi-plugin-chatluna/llm-core/platform/client");
@@ -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_koishi = require("koishi");
 async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
@@ -264,11 +265,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
     urlContext = false;
   }
   if (googleSearch) {
-    if (model.includes("gemini-2")) {
-      result.push({
-        google_search: {}
-      });
-    } else {
+    if (model.includes("gemini-1")) {
       result.push({
         google_search_retrieval: {
           dynamic_retrieval_config: {
@@ -277,6 +274,10 @@ function formatToolsToGeminiAITools(tools, config, model) {
           }
         }
       });
+    } else {
+      result.push({
+        google_search: {}
+      });
     }
   }
   if (codeExecution) {
@@ -322,6 +323,7 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 function prepareModelConfig(params, pluginConfig) {
   let model = params.model;
   let enabledThinking = null;
+  let thinkingLevel = "high";
   if (model.includes("-thinking") && model.includes("gemini-2.5")) {
     enabledThinking = !model.includes("-non-thinking");
     model = model.replace("-non-thinking", "").replace("-thinking", "");
@@ -332,35 +334,53 @@ function prepareModelConfig(params, pluginConfig) {
   } else if (thinkingBudget >= 0 && thinkingBudget < 128) {
     thinkingBudget = 128;
   }
+  if (model.includes("-thinking") && model.includes("gemini-3.0")) {
+    enabledThinking = true;
+    const match = model.match(/-(low|medium|high)-thinking/);
+    if (match) {
+      thinkingLevel = match[1];
+      model = model.replace(`-${match[1]}-thinking`, "");
+    } else {
+      thinkingLevel = "low";
+      model = model.replace("-thinking", "");
+    }
+    thinkingBudget = void 0;
+  }
   let imageGeneration = pluginConfig.imageGeneration ?? false;
   if (imageGeneration) {
     imageGeneration = params.model.includes("gemini-2.0-flash-exp") || params.model.includes("gemini-2.5-flash-image");
   }
-  return { model, enabledThinking, thinkingBudget, imageGeneration };
+  return {
+    model,
+    enabledThinking,
+    thinkingBudget,
+    imageGeneration,
+    thinkingLevel
+  };
 }
 __name(prepareModelConfig, "prepareModelConfig");
 function createSafetySettings(model) {
-  const isGemini2 = model.includes("gemini-2");
+  const isNonGemini1 = !model.includes("gemini-1");
   return [
     {
       category: "HARM_CATEGORY_HARASSMENT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_HATE_SPEECH",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_CIVIC_INTEGRITY",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     }
   ];
 }
@@ -372,10 +392,14 @@ function createGenerationConfig(params, modelConfig, pluginConfig) {
     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 ? {
-      thinkingBudget: modelConfig.thinkingBudget,
-      includeThoughts: pluginConfig.includeThoughts
-    } : void 0
+    thinkingConfig: modelConfig.enabledThinking != null || pluginConfig.includeThoughts ? (0, import_koishi.filterKeys)(
+      {
+        thinkingBudget: modelConfig.thinkingBudget,
+        thinkingLevel: modelConfig.thinkingLevel,
+        includeThoughts: pluginConfig.includeThoughts
+      },
+      (k, v) => v != null
+    ) : void 0
   };
 }
 __name(createGenerationConfig, "createGenerationConfig");
@@ -980,11 +1004,8 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
             import_types2.ModelCapabilities.ToolCall
           ]
         };
-        const thinkingModel = [
-          "gemini-2.5-pro",
-          "gemini-2.5-flash",
-          "gemini-3.0-pro"
-        ];
+        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")
         )) {
@@ -997,6 +1018,13 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
           } else {
             models.push(info);
           }
+        } else if (thinkingLevelModel.some(
+          (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
+        )) {
+          models.push(
+            { ...info, name: model.name + "-low-thinking" },
+            info
+          );
         } else {
           models.push(info);
         }
@@ -1065,32 +1093,32 @@ function apply(ctx, config) {
   });
 }
 __name(apply, "apply");
-var Config4 = import_koishi.Schema.intersect([
+var Config4 = import_koishi2.Schema.intersect([
   import_chat.ChatLunaPlugin.Config,
-  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(
+  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(
           "https://generativelanguage.googleapis.com/v1beta"
         ),
-        import_koishi.Schema.boolean().default(true)
+        import_koishi2.Schema.boolean().default(true)
       ])
     ).default([[]]).role("table")
   }),
-  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)
+  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)
   })
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),

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 { filterKeys } from "koishi";
 async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
@@ -261,11 +262,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
     urlContext = false;
   }
   if (googleSearch) {
-    if (model.includes("gemini-2")) {
-      result.push({
-        google_search: {}
-      });
-    } else {
+    if (model.includes("gemini-1")) {
       result.push({
         google_search_retrieval: {
           dynamic_retrieval_config: {
@@ -274,6 +271,10 @@ function formatToolsToGeminiAITools(tools, config, model) {
           }
         }
       });
+    } else {
+      result.push({
+        google_search: {}
+      });
     }
   }
   if (codeExecution) {
@@ -319,6 +320,7 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 function prepareModelConfig(params, pluginConfig) {
   let model = params.model;
   let enabledThinking = null;
+  let thinkingLevel = "high";
   if (model.includes("-thinking") && model.includes("gemini-2.5")) {
     enabledThinking = !model.includes("-non-thinking");
     model = model.replace("-non-thinking", "").replace("-thinking", "");
@@ -329,35 +331,53 @@ function prepareModelConfig(params, pluginConfig) {
   } else if (thinkingBudget >= 0 && thinkingBudget < 128) {
     thinkingBudget = 128;
   }
+  if (model.includes("-thinking") && model.includes("gemini-3.0")) {
+    enabledThinking = true;
+    const match = model.match(/-(low|medium|high)-thinking/);
+    if (match) {
+      thinkingLevel = match[1];
+      model = model.replace(`-${match[1]}-thinking`, "");
+    } else {
+      thinkingLevel = "low";
+      model = model.replace("-thinking", "");
+    }
+    thinkingBudget = void 0;
+  }
   let imageGeneration = pluginConfig.imageGeneration ?? false;
   if (imageGeneration) {
     imageGeneration = params.model.includes("gemini-2.0-flash-exp") || params.model.includes("gemini-2.5-flash-image");
   }
-  return { model, enabledThinking, thinkingBudget, imageGeneration };
+  return {
+    model,
+    enabledThinking,
+    thinkingBudget,
+    imageGeneration,
+    thinkingLevel
+  };
 }
 __name(prepareModelConfig, "prepareModelConfig");
 function createSafetySettings(model) {
-  const isGemini2 = model.includes("gemini-2");
+  const isNonGemini1 = !model.includes("gemini-1");
   return [
     {
       category: "HARM_CATEGORY_HARASSMENT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_HATE_SPEECH",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_CIVIC_INTEGRITY",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     }
   ];
 }
@@ -369,10 +389,14 @@ function createGenerationConfig(params, modelConfig, pluginConfig) {
     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 ? {
-      thinkingBudget: modelConfig.thinkingBudget,
-      includeThoughts: pluginConfig.includeThoughts
-    } : void 0
+    thinkingConfig: modelConfig.enabledThinking != null || pluginConfig.includeThoughts ? filterKeys(
+      {
+        thinkingBudget: modelConfig.thinkingBudget,
+        thinkingLevel: modelConfig.thinkingLevel,
+        includeThoughts: pluginConfig.includeThoughts
+      },
+      (k, v) => v != null
+    ) : void 0
   };
 }
 __name(createGenerationConfig, "createGenerationConfig");
@@ -977,11 +1001,8 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
             ModelCapabilities.ToolCall
           ]
         };
-        const thinkingModel = [
-          "gemini-2.5-pro",
-          "gemini-2.5-flash",
-          "gemini-3.0-pro"
-        ];
+        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")
         )) {
@@ -994,6 +1015,13 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
           } else {
             models.push(info);
           }
+        } else if (thinkingLevelModel.some(
+          (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
+        )) {
+          models.push(
+            { ...info, name: model.name + "-low-thinking" },
+            info
+          );
         } else {
           models.push(info);
         }

package/lib/utils.d.ts

@@ -16,6 +16,7 @@ export declare function prepareModelConfig(params: ModelRequestParams, pluginCon
     enabledThinking: boolean;
     thinkingBudget: number;
     imageGeneration: boolean;
+    thinkingLevel: string;
 };
 export declare function createSafetySettings(model: string): {
     category: string;
@@ -27,10 +28,7 @@ export declare function createGenerationConfig(params: ModelRequestParams, model
     maxOutputTokens: number;
     topP: number;
     responseModalities: string[];
-    thinkingConfig: {
-        thinkingBudget: number;
-        includeThoughts: boolean;
-    };
+    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<{
     contents: ChatCompletionResponseMessage[];
@@ -44,10 +42,7 @@ export declare function createChatGenerationParams(params: ModelRequestParams, p
         maxOutputTokens: number;
         topP: number;
         responseModalities: string[];
-        thinkingConfig: {
-            thinkingBudget: number;
-            includeThoughts: boolean;
-        };
+        thinkingConfig: import("cosmokit").Dict<string | number | boolean, "thinkingBudget" | "thinkingLevel" | "includeThoughts">;
     };
     system_instruction: ChatCompletionResponseMessage;
     tools: Record<string, any>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",