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

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: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContent: "为模型启用 URL 内容获取工具。" }] };
+    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: "思考预算，范围：(-1~24576)，设置的数值越大，思考时花费的 Token 越多,-1 为动态思考，0 为不思考。目前仅支持 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: "为模型启用代码执行工具。", urlContext: "为模型启用 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", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContent: "Enable URL content retrieval tool" }] };
+    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 (-1-24576). (-1: dynamic thinking, 0: no 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-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", urlContext: "Enable URL context retrieval tool" }] };
   }
 });
 
@@ -236,8 +236,8 @@ function formatToolsToGeminiAITools(tools, config, model) {
   ];
   let googleSearch = config.googleSearch;
   let codeExecution = config.codeExecution;
-  let urlContent = config.urlContent;
-  const useCustomTools = config.googleSearch || config.codeExecution || config.urlContent;
+  let urlContext = config.urlContext;
+  const useCustomTools = config.googleSearch || config.codeExecution || config.urlContext;
   if (functions.length > 0 && !useCustomTools) {
     result.push({
       functionDeclarations: functions
@@ -254,7 +254,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
     );
     googleSearch = false;
     codeExecution = false;
-    urlContent = false;
+    urlContext = false;
   }
   if (googleSearch) {
     if (model.includes("gemini-2")) {
@@ -277,9 +277,9 @@ function formatToolsToGeminiAITools(tools, config, model) {
       code_execution: {}
     });
   }
-  if (urlContent) {
+  if (urlContext) {
     result.push({
-      url_content: {}
+      urlContext: {}
     });
   }
   return result;
@@ -401,7 +401,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
               includeThoughts: this._pluginConfig.includeThoughts
             } : void 0
           },
-          tools: params.tools != null || this._pluginConfig.googleSearch || this._pluginConfig.codeExecution || this._pluginConfig.urlContent ? formatToolsToGeminiAITools(
+          tools: params.tools != null || this._pluginConfig.googleSearch || this._pluginConfig.codeExecution || this._pluginConfig.urlContext ? formatToolsToGeminiAITools(
             params.tools ?? [],
             this._pluginConfig,
             params.model
@@ -476,7 +476,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
         }
         const deltaFunctionCall = chatFunctionCallingPart?.functionCall;
         if (deltaFunctionCall) {
-          let args = deltaFunctionCall.args?.input ?? deltaFunctionCall.args;
+          let args = deltaFunctionCall.args;
           try {
             let parsedArgs = JSON.parse(args);
             if (typeof parsedArgs !== "string") {
@@ -810,7 +810,7 @@ var Config3 = import_koishi.Schema.intersect([
     temperature: import_koishi.Schema.percent().min(0).max(2).step(0.1).default(0.8),
     googleSearch: import_koishi.Schema.boolean().default(false),
     codeExecution: import_koishi.Schema.boolean().default(false),
-    urlContent: import_koishi.Schema.boolean().default(false),
+    urlContext: 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),

package/lib/index.d.ts

@@ -10,7 +10,7 @@ export interface Config extends ChatLunaPlugin.Config {
     temperature: number;
     googleSearch: boolean;
     codeExecution: boolean;
-    urlContent: boolean;
+    urlContext: boolean;
     searchThreshold: number;
     groundingContentDisplay: boolean;
     imageGeneration: boolean;

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: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContent: "为模型启用 URL 内容获取工具。" }] };
+    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: "思考预算，范围：(-1~24576)，设置的数值越大，思考时花费的 Token 越多,-1 为动态思考，0 为不思考。目前仅支持 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: "为模型启用代码执行工具。", urlContext: "为模型启用 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", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContent: "Enable URL content retrieval tool" }] };
+    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 (-1-24576). (-1: dynamic thinking, 0: no 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-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", urlContext: "Enable URL context retrieval tool" }] };
   }
 });
 
@@ -219,8 +219,8 @@ function formatToolsToGeminiAITools(tools, config, model) {
   ];
   let googleSearch = config.googleSearch;
   let codeExecution = config.codeExecution;
-  let urlContent = config.urlContent;
-  const useCustomTools = config.googleSearch || config.codeExecution || config.urlContent;
+  let urlContext = config.urlContext;
+  const useCustomTools = config.googleSearch || config.codeExecution || config.urlContext;
   if (functions.length > 0 && !useCustomTools) {
     result.push({
       functionDeclarations: functions
@@ -237,7 +237,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
     );
     googleSearch = false;
     codeExecution = false;
-    urlContent = false;
+    urlContext = false;
   }
   if (googleSearch) {
     if (model.includes("gemini-2")) {
@@ -260,9 +260,9 @@ function formatToolsToGeminiAITools(tools, config, model) {
       code_execution: {}
     });
   }
-  if (urlContent) {
+  if (urlContext) {
     result.push({
-      url_content: {}
+      urlContext: {}
     });
   }
   return result;
@@ -384,7 +384,7 @@ var GeminiRequester = class extends ModelRequester {
               includeThoughts: this._pluginConfig.includeThoughts
             } : void 0
           },
-          tools: params.tools != null || this._pluginConfig.googleSearch || this._pluginConfig.codeExecution || this._pluginConfig.urlContent ? formatToolsToGeminiAITools(
+          tools: params.tools != null || this._pluginConfig.googleSearch || this._pluginConfig.codeExecution || this._pluginConfig.urlContext ? formatToolsToGeminiAITools(
             params.tools ?? [],
             this._pluginConfig,
             params.model
@@ -459,7 +459,7 @@ var GeminiRequester = class extends ModelRequester {
         }
         const deltaFunctionCall = chatFunctionCallingPart?.functionCall;
         if (deltaFunctionCall) {
-          let args = deltaFunctionCall.args?.input ?? deltaFunctionCall.args;
+          let args = deltaFunctionCall.args;
           try {
             let parsedArgs = JSON.parse(args);
             if (typeof parsedArgs !== "string") {
@@ -793,7 +793,7 @@ var Config3 = Schema.intersect([
     temperature: Schema.percent().min(0).max(2).step(0.1).default(0.8),
     googleSearch: Schema.boolean().default(false),
     codeExecution: Schema.boolean().default(false),
-    urlContent: Schema.boolean().default(false),
+    urlContext: 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),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "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.2"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.3"
   },
   "koishi": {
     "description": {