koishi-plugin-chatluna-google-gemini-adapter 1.2.0-alpha.4 → 1.2.0-alpha.6

package/lib/index.cjs

@@ -33,14 +33,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: "模型配置", maxTokens: "输入的最大上下文 Token（16~2097000，必须是 16 的倍数）。注意：仅当您使用的模型最大 Token 为 8000 及以上时，才建议设置超过 2000 token。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-2.0-flash-exp` 模型。", searchThreshold: "搜索的置信度阈值，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。" }] };
+    module2.exports = { $inner: [{}, { $desc: "请求选项", platform: "适配器的平台名。（不懂请不要修改）", apiKeys: { $inner: ["Gemini 的 API Key", "Gemini API 的请求地址"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxTokens: "输入的最大上下文 Token（16~2097000，必须是 16 的倍数）。注意：仅当您使用的模型最大 Token 为 8000 及以上时，才建议设置超过 2000 token。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。", thinkingBudget: "思考预算，范围：0~24576，设置的数值越大，思考时花费的 Token 越多。目前仅支持 gemini 2.5 系列模型。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-2.0-flash-exp` 模型。", searchThreshold: "搜索的置信度阈值，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。" }] };
   }
 });
 
 // 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)"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxTokens: "Max output tokens (16-2097000, multiple of 16). >2000 for 8k+ models", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", groundingContentDisplay: "Enable display of search results", imageGeneration: "Enable image generation (only for `gemini-2.0-flash-exp` 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" }] };
+    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)"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxTokens: "Max output tokens (16-2097000, multiple of 16). >2000 for 8k+ models", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", thinkingBudget: "Thinking budget (0-24576). 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-2.0-flash-exp` 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" }] };
   }
 });
 
@@ -142,7 +142,7 @@ async function langchainMessageToGeminiMessage(messages, model) {
           }
         ]
       };
-      if ((model.includes("vision") || model.includes("gemini")) && images != null && !model.includes("gemini-1.0")) {
+      if ((model.includes("vision") || model.includes("gemini") || model.includes("gemma")) && 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,/, "");
@@ -230,7 +230,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
     "gemini-1.5-flash",
     "gemini-2.0-flash-exp"
   ];
-  const imageInputModels = [
+  const imageGenerationModels = [
     "gemini-2.0-flash-exp",
     "gemini-2.0-flash-exp-image-generation"
   ];
@@ -243,7 +243,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
     logger.warn("Google search is enabled, tool calling will be disable.");
   } else if ((unsupportedModels.some(
     (unsupportedModel) => model.includes(unsupportedModel)
-  ) || imageInputModels.some(
+  ) || imageGenerationModels.some(
     (unsupportedModels2) => model.includes(unsupportedModels2)
   ) && config.imageGeneration) && googleSearch) {
     logger.warn(
@@ -337,29 +337,35 @@ var GeminiRequester = class extends import_api.ModelRequester {
   }
   async *completionStream(params) {
     try {
+      let model = params.model;
+      let enabledThinking = null;
+      if (model.includes("-thinking") && model.includes("gemini-2.5")) {
+        enabledThinking = !model.includes("-no-thinking");
+        model = model.replace("-no-thinking", "").replace("-thinking", "");
+      }
       const response = await this._post(
-        `models/${params.model}:streamGenerateContent?alt=sse`,
+        `models/${model}:streamGenerateContent?alt=sse`,
         {
           contents: await langchainMessageToGeminiMessage(
             params.input,
-            params.model
+            model
           ),
           safetySettings: [
             {
               category: "HARM_CATEGORY_HARASSMENT",
-              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_HATE_SPEECH",
-              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_CIVIC_INTEGRITY",
@@ -374,8 +380,11 @@ var GeminiRequester = class extends import_api.ModelRequester {
             responseModalities: params.model.includes(
               // TODO: Wait for google release to all models
               "gemini-2.0-flash-exp"
-            ) && this._pluginConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0
-            // thinkingConfig: { includeThoughts: true }
+            ) && this._pluginConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0,
+            thinkingConfig: enabledThinking != null ? {
+              thinkingBudget: enabledThinking ? this._pluginConfig.thinkingBudget ?? 4096 : 0
+              // includeThoughts: true
+            } : void 0
           },
           tools: params.tools != null || this._pluginConfig.googleSearch ? formatToolsToGeminiAITools(
             params.tools ?? [],
@@ -581,7 +590,7 @@ ${groundingContent}`
         );
       }
       return data.models.map((model) => model.name).filter(
-        (model) => model.includes("gemini") || model.includes("embedding")
+        (model) => model.includes("gemini") || model.includes("gemma") || model.includes("embedding")
       );
     } catch (e) {
       const error = new Error(
@@ -663,15 +672,17 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
   }
   async refreshModels() {
     try {
-      const rawModels = await this._requester.getModels();
+      let rawModels = await this._requester.getModels();
       if (!rawModels.length) {
         throw new import_error2.ChatLunaError(
           import_error2.ChatLunaErrorCode.MODEL_INIT_ERROR,
           new Error("No model found")
         );
       }
-      return rawModels.map((model) => model.replace("models/", "")).map((model) => {
-        return {
+      rawModels = rawModels.map((model) => model.replace("models/", ""));
+      const models = [];
+      for (const model of rawModels) {
+        const info = {
           name: model,
           maxTokens: ((model2) => {
             if (model2.includes("gemini-1.5-pro")) {
@@ -689,7 +700,21 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
           functionCall: !model.includes("vision"),
           supportMode: ["all"]
         };
-      });
+        if (model.includes("gemini-2.5")) {
+          if (!model.includes("-thinking")) {
+            models.push(
+              { ...info, name: model + "-no-thinking" },
+              { ...info, name: model + "-thinking" },
+              info
+            );
+          } else {
+            models.push(info);
+          }
+        } else {
+          models.push(info);
+        }
+      }
+      return models;
     } catch (e) {
       throw new import_error2.ChatLunaError(import_error2.ChatLunaErrorCode.MODEL_INIT_ERROR, e);
     }
@@ -776,6 +801,7 @@ var Config3 = import_koishi.Schema.intersect([
     maxTokens: import_koishi.Schema.number().min(16).max(2097e3).step(16).default(8064),
     temperature: import_koishi.Schema.percent().min(0).max(2).step(0.1).default(0.8),
     googleSearch: import_koishi.Schema.boolean().default(false),
+    thinkingBudget: import_koishi.Schema.number().min(0).max(24576).step(16).default(4096),
     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)

package/lib/index.d.ts

@@ -12,6 +12,7 @@ export interface Config extends ChatLunaPlugin.Config {
     searchThreshold: number;
     groundingContentDisplay: boolean;
     imageGeneration: boolean;
+    thinkingBudget: number;
 }
 export declare const Config: Schema<Config>;
 export declare const inject: string[];

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: "模型配置", maxTokens: "输入的最大上下文 Token（16~2097000，必须是 16 的倍数）。注意：仅当您使用的模型最大 Token 为 8000 及以上时，才建议设置超过 2000 token。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-2.0-flash-exp` 模型。", searchThreshold: "搜索的置信度阈值，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。" }] };
+    module.exports = { $inner: [{}, { $desc: "请求选项", platform: "适配器的平台名。（不懂请不要修改）", apiKeys: { $inner: ["Gemini 的 API Key", "Gemini API 的请求地址"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxTokens: "输入的最大上下文 Token（16~2097000，必须是 16 的倍数）。注意：仅当您使用的模型最大 Token 为 8000 及以上时，才建议设置超过 2000 token。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。", thinkingBudget: "思考预算，范围：0~24576，设置的数值越大，思考时花费的 Token 越多。目前仅支持 gemini 2.5 系列模型。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-2.0-flash-exp` 模型。", searchThreshold: "搜索的置信度阈值，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。" }] };
   }
 });
 
 // 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)"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxTokens: "Max output tokens (16-2097000, multiple of 16). >2000 for 8k+ models", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", groundingContentDisplay: "Enable display of search results", imageGeneration: "Enable image generation (only for `gemini-2.0-flash-exp` 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" }] };
+    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)"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxTokens: "Max output tokens (16-2097000, multiple of 16). >2000 for 8k+ models", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", thinkingBudget: "Thinking budget (0-24576). 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-2.0-flash-exp` 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" }] };
   }
 });
 
@@ -125,7 +125,7 @@ async function langchainMessageToGeminiMessage(messages, model) {
           }
         ]
       };
-      if ((model.includes("vision") || model.includes("gemini")) && images != null && !model.includes("gemini-1.0")) {
+      if ((model.includes("vision") || model.includes("gemini") || model.includes("gemma")) && 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,/, "");
@@ -213,7 +213,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
     "gemini-1.5-flash",
     "gemini-2.0-flash-exp"
   ];
-  const imageInputModels = [
+  const imageGenerationModels = [
     "gemini-2.0-flash-exp",
     "gemini-2.0-flash-exp-image-generation"
   ];
@@ -226,7 +226,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
     logger.warn("Google search is enabled, tool calling will be disable.");
   } else if ((unsupportedModels.some(
     (unsupportedModel) => model.includes(unsupportedModel)
-  ) || imageInputModels.some(
+  ) || imageGenerationModels.some(
     (unsupportedModels2) => model.includes(unsupportedModels2)
   ) && config.imageGeneration) && googleSearch) {
     logger.warn(
@@ -320,29 +320,35 @@ var GeminiRequester = class extends ModelRequester {
   }
   async *completionStream(params) {
     try {
+      let model = params.model;
+      let enabledThinking = null;
+      if (model.includes("-thinking") && model.includes("gemini-2.5")) {
+        enabledThinking = !model.includes("-no-thinking");
+        model = model.replace("-no-thinking", "").replace("-thinking", "");
+      }
       const response = await this._post(
-        `models/${params.model}:streamGenerateContent?alt=sse`,
+        `models/${model}:streamGenerateContent?alt=sse`,
         {
           contents: await langchainMessageToGeminiMessage(
             params.input,
-            params.model
+            model
           ),
           safetySettings: [
             {
               category: "HARM_CATEGORY_HARASSMENT",
-              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_HATE_SPEECH",
-              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_CIVIC_INTEGRITY",
@@ -357,8 +363,11 @@ var GeminiRequester = class extends ModelRequester {
             responseModalities: params.model.includes(
               // TODO: Wait for google release to all models
               "gemini-2.0-flash-exp"
-            ) && this._pluginConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0
-            // thinkingConfig: { includeThoughts: true }
+            ) && this._pluginConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0,
+            thinkingConfig: enabledThinking != null ? {
+              thinkingBudget: enabledThinking ? this._pluginConfig.thinkingBudget ?? 4096 : 0
+              // includeThoughts: true
+            } : void 0
           },
           tools: params.tools != null || this._pluginConfig.googleSearch ? formatToolsToGeminiAITools(
             params.tools ?? [],
@@ -564,7 +573,7 @@ ${groundingContent}`
         );
       }
       return data.models.map((model) => model.name).filter(
-        (model) => model.includes("gemini") || model.includes("embedding")
+        (model) => model.includes("gemini") || model.includes("gemma") || model.includes("embedding")
       );
     } catch (e) {
       const error = new Error(
@@ -646,15 +655,17 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
   }
   async refreshModels() {
     try {
-      const rawModels = await this._requester.getModels();
+      let rawModels = await this._requester.getModels();
       if (!rawModels.length) {
         throw new ChatLunaError2(
           ChatLunaErrorCode2.MODEL_INIT_ERROR,
           new Error("No model found")
         );
       }
-      return rawModels.map((model) => model.replace("models/", "")).map((model) => {
-        return {
+      rawModels = rawModels.map((model) => model.replace("models/", ""));
+      const models = [];
+      for (const model of rawModels) {
+        const info = {
           name: model,
           maxTokens: ((model2) => {
             if (model2.includes("gemini-1.5-pro")) {
@@ -672,7 +683,21 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
           functionCall: !model.includes("vision"),
           supportMode: ["all"]
         };
-      });
+        if (model.includes("gemini-2.5")) {
+          if (!model.includes("-thinking")) {
+            models.push(
+              { ...info, name: model + "-no-thinking" },
+              { ...info, name: model + "-thinking" },
+              info
+            );
+          } else {
+            models.push(info);
+          }
+        } else {
+          models.push(info);
+        }
+      }
+      return models;
     } catch (e) {
       throw new ChatLunaError2(ChatLunaErrorCode2.MODEL_INIT_ERROR, e);
     }
@@ -759,6 +784,7 @@ var Config3 = Schema.intersect([
     maxTokens: Schema.number().min(16).max(2097e3).step(16).default(8064),
     temperature: Schema.percent().min(0).max(2).step(0.1).default(0.8),
     googleSearch: Schema.boolean().default(false),
+    thinkingBudget: Schema.number().min(0).max(24576).step(16).default(4096),
     imageGeneration: Schema.boolean().default(false),
     groundingContentDisplay: Schema.boolean().default(false),
     searchThreshold: Schema.number().min(0).max(1).step(0.1).default(0.5)

package/package.json

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