koishi-plugin-chatluna-google-gemini-adapter 1.2.0-alpha.0 → 1.2.0-alpha.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: "请求选项", 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: "为模型启用谷歌搜索。", 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", 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", 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" }] };
   }
 });
 
@@ -226,7 +226,12 @@ function formatToolsToGeminiAITools(tools, config, model) {
   const unsupportedModels = [
     "gemini-1.0",
     "gemini-2.0-flash-lite",
-    "gemini-1.5-flash"
+    "gemini-1.5-flash",
+    "gemini-2.0-flash-exp"
+  ];
+  const imageInputModels = [
+    "gemini-2.0-flash-exp",
+    "gemini-2.0-flash-exp-image-generation"
   ];
   let googleSearch = config.googleSearch;
   if (functions.length > 0 && !googleSearch) {
@@ -235,9 +240,11 @@ function formatToolsToGeminiAITools(tools, config, model) {
     });
   } else if (functions.length > 0 && googleSearch) {
     logger.warn("Google search is enabled, tool calling will be disable.");
-  } else if (unsupportedModels.some(
+  } else if ((unsupportedModels.some(
     (unsupportedModel) => model.includes(unsupportedModel)
-  ) && googleSearch) {
+  ) || imageInputModels.some(
+    (unsupportedModels2) => model.includes(unsupportedModels2)
+  ) && config.imageGeneration) && googleSearch) {
     logger.warn(
       `The model ${model} does not support google search. google search will be disable.`
     );
@@ -265,7 +272,9 @@ __name(formatToolsToGeminiAITools, "formatToolsToGeminiAITools");
 function formatToolToGeminiAITool(tool) {
   const parameters = removeAdditionalProperties(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (0, import_zod_to_json_schema.zodToJsonSchema)(tool.schema)
+    (0, import_zod_to_json_schema.zodToJsonSchema)(tool.schema, {
+      allowedAdditionalProperties: void 0
+    })
   );
   return {
     name: tool.name,
@@ -637,6 +646,7 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
   constructor(ctx, _config, clientConfig, plugin) {
     super(ctx, clientConfig);
     this._config = _config;
+    this.platform = this.config.platform;
     this._requester = new GeminiRequester(
       clientConfig,
       plugin,
@@ -710,7 +720,7 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
         timeout: this._config.timeout,
         temperature: this._config.temperature,
         maxRetries: this._config.maxRetries,
-        llmType: "gemini"
+        llmType: this.platform
       });
     }
     return new import_model.ChatLunaEmbeddings({
@@ -725,7 +735,7 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
 var import_logger = require("koishi-plugin-chatluna/utils/logger");
 var logger;
 function apply(ctx, config) {
-  const plugin = new import_chat.ChatLunaPlugin(ctx, config, "gemini");
+  const plugin = new import_chat.ChatLunaPlugin(ctx, config, config.platform);
   logger = (0, import_logger.createLogger)(ctx, "chatluna-gemini-adapter");
   ctx.on("ready", async () => {
     plugin.registerToService();
@@ -734,7 +744,7 @@ function apply(ctx, config) {
         return {
           apiKey,
           apiEndpoint,
-          platform: "gemini",
+          platform: config2.platform,
           chatLimit: config2.chatTimeLimit,
           timeout: config2.timeout,
           maxRetries: config2.maxRetries,
@@ -752,6 +762,7 @@ __name(apply, "apply");
 var Config3 = import_koishi.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"),

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export declare function apply(ctx: Context, config: Config): void;
 export interface Config extends ChatLunaPlugin.Config {
     apiKeys: [string, string][];
     maxTokens: number;
+    platform: string;
     temperature: number;
     googleSearch: boolean;
     searchThreshold: number;

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: "请求选项", 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: "为模型启用谷歌搜索。", 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", 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", 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" }] };
   }
 });
 
@@ -210,7 +210,12 @@ function formatToolsToGeminiAITools(tools, config, model) {
   const unsupportedModels = [
     "gemini-1.0",
     "gemini-2.0-flash-lite",
-    "gemini-1.5-flash"
+    "gemini-1.5-flash",
+    "gemini-2.0-flash-exp"
+  ];
+  const imageInputModels = [
+    "gemini-2.0-flash-exp",
+    "gemini-2.0-flash-exp-image-generation"
   ];
   let googleSearch = config.googleSearch;
   if (functions.length > 0 && !googleSearch) {
@@ -219,9 +224,11 @@ function formatToolsToGeminiAITools(tools, config, model) {
     });
   } else if (functions.length > 0 && googleSearch) {
     logger.warn("Google search is enabled, tool calling will be disable.");
-  } else if (unsupportedModels.some(
+  } else if ((unsupportedModels.some(
     (unsupportedModel) => model.includes(unsupportedModel)
-  ) && googleSearch) {
+  ) || imageInputModels.some(
+    (unsupportedModels2) => model.includes(unsupportedModels2)
+  ) && config.imageGeneration) && googleSearch) {
     logger.warn(
       `The model ${model} does not support google search. google search will be disable.`
     );
@@ -249,7 +256,9 @@ __name(formatToolsToGeminiAITools, "formatToolsToGeminiAITools");
 function formatToolToGeminiAITool(tool) {
   const parameters = removeAdditionalProperties(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    zodToJsonSchema(tool.schema)
+    zodToJsonSchema(tool.schema, {
+      allowedAdditionalProperties: void 0
+    })
   );
   return {
     name: tool.name,
@@ -621,6 +630,7 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
   constructor(ctx, _config, clientConfig, plugin) {
     super(ctx, clientConfig);
     this._config = _config;
+    this.platform = this.config.platform;
     this._requester = new GeminiRequester(
       clientConfig,
       plugin,
@@ -694,7 +704,7 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
         timeout: this._config.timeout,
         temperature: this._config.temperature,
         maxRetries: this._config.maxRetries,
-        llmType: "gemini"
+        llmType: this.platform
       });
     }
     return new ChatLunaEmbeddings({
@@ -709,7 +719,7 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
 import { createLogger } from "koishi-plugin-chatluna/utils/logger";
 var logger;
 function apply(ctx, config) {
-  const plugin = new ChatLunaPlugin(ctx, config, "gemini");
+  const plugin = new ChatLunaPlugin(ctx, config, config.platform);
   logger = createLogger(ctx, "chatluna-gemini-adapter");
   ctx.on("ready", async () => {
     plugin.registerToService();
@@ -718,7 +728,7 @@ function apply(ctx, config) {
         return {
           apiKey,
           apiEndpoint,
-          platform: "gemini",
+          platform: config2.platform,
           chatLimit: config2.chatTimeLimit,
           timeout: config2.timeout,
           maxRetries: config2.maxRetries,
@@ -736,6 +746,7 @@ __name(apply, "apply");
 var Config3 = Schema.intersect([
   ChatLunaPlugin.Config,
   Schema.object({
+    platform: Schema.string().default("gemini"),
     apiKeys: Schema.array(
       Schema.tuple([
         Schema.string().role("secret"),

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.0",
+  "version": "1.2.0-alpha.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.2.0-alpha.0"
+    "koishi-plugin-chatluna": "^1.2.0-alpha.1"
   },
   "koishi": {
     "description": {