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

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-2.0-flash-exp` 和 `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 参数。" }] };
+    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-2.0-flash-exp` 和 `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-2.0-flash-exp` 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." }] };
+    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-2.0-flash-exp` 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" }] };
   }
 });
 
@@ -323,7 +323,7 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 function prepareModelConfig(params, pluginConfig) {
   let model = params.model;
   let enabledThinking = null;
-  let thinkingLevel = "high";
+  let thinkingLevel = "THINKING_LEVEL_UNSPECIFIED";
   if (model.includes("-thinking") && model.includes("gemini-2.5")) {
     enabledThinking = !model.includes("-non-thinking");
     model = model.replace("-non-thinking", "").replace("-thinking", "");
@@ -341,10 +341,12 @@ function prepareModelConfig(params, pluginConfig) {
       thinkingLevel = match[1];
       model = model.replace(`-${match[1]}-thinking`, "");
     } else {
-      thinkingLevel = "low";
+      thinkingLevel = "THINKING_LEVEL_UNSPECIFIED";
       model = model.replace("-thinking", "");
     }
     thinkingBudget = void 0;
+  } else {
+    thinkingLevel = void 0;
   }
   let imageGeneration = pluginConfig.imageGeneration ?? false;
   if (imageGeneration) {
@@ -410,6 +412,7 @@ async function createChatGenerationParams(params, plugin, modelConfig, pluginCon
     modelConfig.model
   );
   const [systemInstruction, modelMessages] = extractSystemMessages(geminiMessages);
+  const systemInstructionKey = pluginConfig.useCamelCaseSystemInstruction ? "systemInstruction" : "system_instruction";
   return {
     contents: modelMessages,
     safetySettings: createSafetySettings(params.model),
@@ -418,7 +421,7 @@ async function createChatGenerationParams(params, plugin, modelConfig, pluginCon
       modelConfig,
       pluginConfig
     ),
-    system_instruction: systemInstruction != null ? systemInstruction : void 0,
+    [systemInstructionKey]: systemInstruction != null ? systemInstruction : void 0,
     tools: params.tools != null || pluginConfig.googleSearch || pluginConfig.codeExecution || pluginConfig.urlContext ? formatToolsToGeminiAITools(
       params.tools ?? [],
       pluginConfig,
@@ -1118,7 +1121,8 @@ var Config4 = import_koishi2.Schema.intersect([
     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)
+    searchThreshold: import_koishi2.Schema.number().min(0).max(1).step(0.1).default(0.5),
+    useCamelCaseSystemInstruction: import_koishi2.Schema.boolean().default(false)
   })
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),

package/lib/index.d.ts

@@ -17,6 +17,7 @@ export interface Config extends ChatLunaPlugin.Config {
     imageGeneration: boolean;
     thinkingBudget: number;
     includeThoughts: boolean;
+    useCamelCaseSystemInstruction: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare const inject: {

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-2.0-flash-exp` 和 `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 参数。" }] };
+    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-2.0-flash-exp` 和 `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-2.0-flash-exp` 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." }] };
+    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-2.0-flash-exp` 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" }] };
   }
 });
 
@@ -320,7 +320,7 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 function prepareModelConfig(params, pluginConfig) {
   let model = params.model;
   let enabledThinking = null;
-  let thinkingLevel = "high";
+  let thinkingLevel = "THINKING_LEVEL_UNSPECIFIED";
   if (model.includes("-thinking") && model.includes("gemini-2.5")) {
     enabledThinking = !model.includes("-non-thinking");
     model = model.replace("-non-thinking", "").replace("-thinking", "");
@@ -338,10 +338,12 @@ function prepareModelConfig(params, pluginConfig) {
       thinkingLevel = match[1];
       model = model.replace(`-${match[1]}-thinking`, "");
     } else {
-      thinkingLevel = "low";
+      thinkingLevel = "THINKING_LEVEL_UNSPECIFIED";
       model = model.replace("-thinking", "");
     }
     thinkingBudget = void 0;
+  } else {
+    thinkingLevel = void 0;
   }
   let imageGeneration = pluginConfig.imageGeneration ?? false;
   if (imageGeneration) {
@@ -407,6 +409,7 @@ async function createChatGenerationParams(params, plugin, modelConfig, pluginCon
     modelConfig.model
   );
   const [systemInstruction, modelMessages] = extractSystemMessages(geminiMessages);
+  const systemInstructionKey = pluginConfig.useCamelCaseSystemInstruction ? "systemInstruction" : "system_instruction";
   return {
     contents: modelMessages,
     safetySettings: createSafetySettings(params.model),
@@ -415,7 +418,7 @@ async function createChatGenerationParams(params, plugin, modelConfig, pluginCon
       modelConfig,
       pluginConfig
     ),
-    system_instruction: systemInstruction != null ? systemInstruction : void 0,
+    [systemInstructionKey]: systemInstruction != null ? systemInstruction : void 0,
     tools: params.tools != null || pluginConfig.googleSearch || pluginConfig.codeExecution || pluginConfig.urlContext ? formatToolsToGeminiAITools(
       params.tools ?? [],
       pluginConfig,
@@ -1115,7 +1118,8 @@ var Config4 = Schema.intersect([
     nonStreaming: 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)
+    searchThreshold: Schema.number().min(0).max(1).step(0.1).default(0.5),
+    useCamelCaseSystemInstruction: Schema.boolean().default(false)
   })
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),

package/lib/utils.d.ts

@@ -31,6 +31,17 @@ export declare function createGenerationConfig(params: ModelRequestParams, model
     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[] | {
+        category: string;
+        threshold: string;
+    }[] | Record<string, any>;
     contents: ChatCompletionResponseMessage[];
     safetySettings: {
         category: string;
@@ -44,7 +55,6 @@ export declare function createChatGenerationParams(params: ModelRequestParams, p
         responseModalities: string[];
         thinkingConfig: import("cosmokit").Dict<string | number | boolean, "thinkingBudget" | "thinkingLevel" | "includeThoughts">;
     };
-    system_instruction: ChatCompletionResponseMessage;
     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.5",
+  "version": "1.3.7",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",