koishi-plugin-chatluna-google-gemini-adapter 1.2.1 → 1.2.2

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: "为模型启用谷歌搜索。", thinkingBudget: "思考预算，范围：0~24576，设置的数值越大，思考时花费的 Token 越多。目前仅支持 gemini 2.5 系列模型。", 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: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContent: "为模型启用 URL 内容获取工具。" }] };
   }
 });
 
 // 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", 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" }] };
+    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", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContent: "Enable URL content retrieval tool" }] };
   }
 });
 
@@ -235,21 +235,26 @@ function formatToolsToGeminiAITools(tools, config, model) {
     "gemini-2.0-flash-exp-image-generation"
   ];
   let googleSearch = config.googleSearch;
-  if (functions.length > 0 && !googleSearch) {
+  let codeExecution = config.codeExecution;
+  let urlContent = config.urlContent;
+  const useCustomTools = config.googleSearch || config.codeExecution || config.urlContent;
+  if (functions.length > 0 && !useCustomTools) {
     result.push({
       functionDeclarations: functions
     });
-  } else if (functions.length > 0 && googleSearch) {
-    logger.warn("Google search is enabled, tool calling will be disable.");
+  } else if (functions.length > 0 && useCustomTools) {
+    logger.warn("Use custom tools instead of tool calls.");
   } else if ((unsupportedModels.some(
     (unsupportedModel) => model.includes(unsupportedModel)
   ) || imageGenerationModels.some(
     (unsupportedModels2) => model.includes(unsupportedModels2)
-  ) && config.imageGeneration) && googleSearch) {
+  ) && config.imageGeneration) && useCustomTools) {
     logger.warn(
       `The model ${model} does not support google search. google search will be disable.`
     );
     googleSearch = false;
+    codeExecution = false;
+    urlContent = false;
   }
   if (googleSearch) {
     if (model.includes("gemini-2")) {
@@ -267,6 +272,16 @@ function formatToolsToGeminiAITools(tools, config, model) {
       });
     }
   }
+  if (codeExecution) {
+    result.push({
+      code_execution: {}
+    });
+  }
+  if (urlContent) {
+    result.push({
+      url_content: {}
+    });
+  }
   return result;
 }
 __name(formatToolsToGeminiAITools, "formatToolsToGeminiAITools");
@@ -381,12 +396,12 @@ var GeminiRequester = class extends import_api.ModelRequester {
               // TODO: Wait for google release to all models
               "gemini-2.0-flash-exp"
             ) && this._pluginConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0,
-            thinkingConfig: enabledThinking != null ? {
-              thinkingBudget: enabledThinking ? this._pluginConfig.thinkingBudget ?? 4096 : 0
-              // includeThoughts: true
+            thinkingConfig: enabledThinking != null || this._pluginConfig.includeThoughts ? {
+              thinkingBudget: enabledThinking ? this._pluginConfig.thinkingBudget ?? -1 : 0,
+              includeThoughts: this._pluginConfig.includeThoughts
             } : void 0
           },
-          tools: params.tools != null || this._pluginConfig.googleSearch ? formatToolsToGeminiAITools(
+          tools: params.tools != null || this._pluginConfig.googleSearch || this._pluginConfig.codeExecution || this._pluginConfig.urlContent ? formatToolsToGeminiAITools(
             params.tools ?? [],
             this._pluginConfig,
             params.model
@@ -696,8 +711,8 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
         if (model.name.includes("gemini-2.5")) {
           if (!model.name.includes("-thinking")) {
             models.push(
-              { ...info, name: model + "-no-thinking" },
-              { ...info, name: model + "-thinking" },
+              { ...info, name: model.name + "-no-thinking" },
+              { ...info, name: model.name + "-thinking" },
               info
             );
           } else {
@@ -794,7 +809,10 @@ 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),
+    codeExecution: import_koishi.Schema.boolean().default(false),
+    urlContent: import_koishi.Schema.boolean().default(false),
+    thinkingBudget: import_koishi.Schema.number().min(-1).max(24576).step(16).default(-1),
+    includeThoughts: 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)

package/lib/index.d.ts

@@ -9,10 +9,13 @@ export interface Config extends ChatLunaPlugin.Config {
     platform: string;
     temperature: number;
     googleSearch: boolean;
+    codeExecution: boolean;
+    urlContent: boolean;
     searchThreshold: number;
     groundingContentDisplay: boolean;
     imageGeneration: boolean;
     thinkingBudget: number;
+    includeThoughts: boolean;
 }
 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: "为模型启用谷歌搜索。", thinkingBudget: "思考预算，范围：0~24576，设置的数值越大，思考时花费的 Token 越多。目前仅支持 gemini 2.5 系列模型。", 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: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContent: "为模型启用 URL 内容获取工具。" }] };
   }
 });
 
 // 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", 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" }] };
+    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", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContent: "Enable URL content retrieval tool" }] };
   }
 });
 
@@ -218,21 +218,26 @@ function formatToolsToGeminiAITools(tools, config, model) {
     "gemini-2.0-flash-exp-image-generation"
   ];
   let googleSearch = config.googleSearch;
-  if (functions.length > 0 && !googleSearch) {
+  let codeExecution = config.codeExecution;
+  let urlContent = config.urlContent;
+  const useCustomTools = config.googleSearch || config.codeExecution || config.urlContent;
+  if (functions.length > 0 && !useCustomTools) {
     result.push({
       functionDeclarations: functions
     });
-  } else if (functions.length > 0 && googleSearch) {
-    logger.warn("Google search is enabled, tool calling will be disable.");
+  } else if (functions.length > 0 && useCustomTools) {
+    logger.warn("Use custom tools instead of tool calls.");
   } else if ((unsupportedModels.some(
     (unsupportedModel) => model.includes(unsupportedModel)
   ) || imageGenerationModels.some(
     (unsupportedModels2) => model.includes(unsupportedModels2)
-  ) && config.imageGeneration) && googleSearch) {
+  ) && config.imageGeneration) && useCustomTools) {
     logger.warn(
       `The model ${model} does not support google search. google search will be disable.`
     );
     googleSearch = false;
+    codeExecution = false;
+    urlContent = false;
   }
   if (googleSearch) {
     if (model.includes("gemini-2")) {
@@ -250,6 +255,16 @@ function formatToolsToGeminiAITools(tools, config, model) {
       });
     }
   }
+  if (codeExecution) {
+    result.push({
+      code_execution: {}
+    });
+  }
+  if (urlContent) {
+    result.push({
+      url_content: {}
+    });
+  }
   return result;
 }
 __name(formatToolsToGeminiAITools, "formatToolsToGeminiAITools");
@@ -364,12 +379,12 @@ var GeminiRequester = class extends ModelRequester {
               // TODO: Wait for google release to all models
               "gemini-2.0-flash-exp"
             ) && this._pluginConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0,
-            thinkingConfig: enabledThinking != null ? {
-              thinkingBudget: enabledThinking ? this._pluginConfig.thinkingBudget ?? 4096 : 0
-              // includeThoughts: true
+            thinkingConfig: enabledThinking != null || this._pluginConfig.includeThoughts ? {
+              thinkingBudget: enabledThinking ? this._pluginConfig.thinkingBudget ?? -1 : 0,
+              includeThoughts: this._pluginConfig.includeThoughts
             } : void 0
           },
-          tools: params.tools != null || this._pluginConfig.googleSearch ? formatToolsToGeminiAITools(
+          tools: params.tools != null || this._pluginConfig.googleSearch || this._pluginConfig.codeExecution || this._pluginConfig.urlContent ? formatToolsToGeminiAITools(
             params.tools ?? [],
             this._pluginConfig,
             params.model
@@ -679,8 +694,8 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
         if (model.name.includes("gemini-2.5")) {
           if (!model.name.includes("-thinking")) {
             models.push(
-              { ...info, name: model + "-no-thinking" },
-              { ...info, name: model + "-thinking" },
+              { ...info, name: model.name + "-no-thinking" },
+              { ...info, name: model.name + "-thinking" },
               info
             );
           } else {
@@ -777,7 +792,10 @@ 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),
+    codeExecution: Schema.boolean().default(false),
+    urlContent: Schema.boolean().default(false),
+    thinkingBudget: Schema.number().min(-1).max(24576).step(16).default(-1),
+    includeThoughts: Schema.boolean().default(false),
     imageGeneration: Schema.boolean().default(false),
     groundingContentDisplay: Schema.boolean().default(false),
     searchThreshold: Schema.number().min(0).max(1).step(0.1).default(0.5)

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): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | ChatMessageChunk;
+export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | ChatMessageChunk;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -72,7 +72,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.1"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.2"
   },
   "koishi": {
     "description": {