koishi-plugin-chatluna-google-gemini-adapter 1.0.0-rc.1 → 1.0.0-rc.2

package/README.md

@@ -2,6 +2,6 @@
 
 ## [![npm](https://img.shields.io/npm/v/koishi-plugin-chatluna-google-gemini-adapter)](https://www.npmjs.com/package/koishi-plugin-chatluna-google-gemini) [![npm](https://img.shields.io/npm/dm/koishi-plugin-chatluna-google-gemini-adapter)](https://www.npmjs.com/package//koishi-plugin-chatluna-google-gemini-adapter)
 
-> 为 ChatLuna 提供 Google-gemini 支持的适配器
+> 为 ChatLuna 提供 Google Gemini 支持的适配器
 
-[Google-gemini 适配器文档](https://chatluna.chat/guide/configure-model-platform/google-gemini.html)
+[Gemini 适配器文档](https://chatluna.chat/guide/configure-model-platform/google-gemini.html)

package/lib/index.cjs

@@ -23,21 +23,21 @@ 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）。" }] };
+    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: "为模型启用谷歌搜索。", 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" }] };
+    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", 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" }] };
   }
 });
 
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  Config: () => Config,
+  Config: () => Config3,
   apply: () => apply,
   inject: () => inject,
   logger: () => logger,
@@ -132,7 +132,7 @@ async function langchainMessageToGeminiMessage(messages, model) {
           }
         ]
       };
-      if ((model.includes("vision") || model.includes("gemini-1.5")) && images != null) {
+      if ((model.includes("vision") || model.includes("gemini")) && images != null && !model.includes("gemini-1.0")) {
         for (const image of images) {
           result2.parts.push({
             inline_data: {
@@ -237,11 +237,36 @@ function partAsType(part) {
   return part;
 }
 __name(partAsType, "partAsType");
-function formatToolsToGeminiAITools(tools) {
-  if (tools.length < 1) {
+function formatToolsToGeminiAITools(tools, config, model) {
+  if (tools.length < 1 && !config.googleSearch) {
     return void 0;
   }
-  return tools.map(formatToolToGeminiAITool);
+  const functions = tools.map(formatToolToGeminiAITool);
+  const result = [];
+  if (functions.length > 0 && !config.googleSearch) {
+    result.push({
+      functionDeclarations: functions
+    });
+  } else if (functions.length > 0 && config.googleSearch) {
+    logger.warn("Google search is enabled, function call will be disabled.");
+  }
+  if (config.googleSearch) {
+    if (model.includes("gemini-2")) {
+      result.push({
+        google_search: {}
+      });
+    } else {
+      result.push({
+        google_search_retrieval: {
+          dynamic_retrieval_config: {
+            mode: "MODE_DYNAMIC",
+            dynamic_threshold: config.searchThreshold
+          }
+        }
+      });
+    }
+  }
+  return result;
 }
 __name(formatToolsToGeminiAITools, "formatToolsToGeminiAITools");
 function formatToolToGeminiAITool(tool) {
@@ -274,10 +299,11 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 
 // src/requester.ts
 var GeminiRequester = class extends import_api.ModelRequester {
-  constructor(_config, _plugin) {
+  constructor(_config, _plugin, _pluginConfig) {
     super();
     this._config = _config;
     this._plugin = _plugin;
+    this._pluginConfig = _pluginConfig;
   }
   static {
     __name(this, "GeminiRequester");
@@ -315,9 +341,11 @@ var GeminiRequester = class extends import_api.ModelRequester {
             maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
             topP: params.topP
           },
-          tools: !params.model.includes("vision") && params.tools != null ? {
-            functionDeclarations: formatToolsToGeminiAITools(params.tools)
-          } : void 0
+          tools: params.tools != null || this._pluginConfig.googleSearch ? formatToolsToGeminiAITools(
+            params.tools ?? [],
+            this._pluginConfig,
+            params.model
+          ) : void 0
         },
         {
           signal: params.signal
@@ -543,7 +571,11 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
   constructor(ctx, _config, clientConfig, plugin) {
     super(ctx, clientConfig);
     this._config = _config;
-    this._requester = new GeminiRequester(clientConfig, plugin);
+    this._requester = new GeminiRequester(
+      clientConfig,
+      plugin,
+      this._config
+    );
   }
   static {
     __name(this, "GeminiClient");
@@ -651,7 +683,7 @@ function apply(ctx, config) {
   });
 }
 __name(apply, "apply");
-var Config = import_koishi.Schema.intersect([
+var Config3 = import_koishi.Schema.intersect([
   import_chat.ChatLunaPlugin.Config,
   import_koishi.Schema.object({
     apiKeys: import_koishi.Schema.array(
@@ -665,7 +697,9 @@ var Config = import_koishi.Schema.intersect([
   }),
   import_koishi.Schema.object({
     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)
+    temperature: import_koishi.Schema.percent().min(0).max(2).step(0.1).default(0.8),
+    googleSearch: import_koishi.Schema.boolean().default(false),
+    searchThreshold: import_koishi.Schema.number().min(0).max(1).step(0.1).default(0.5)
   })
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),

package/lib/index.d.ts

@@ -14,6 +14,8 @@ export interface Config extends ChatLunaPlugin.Config {
     apiKeys: [string, string][];
     maxTokens: number;
     temperature: number;
+    googleSearch: boolean;
+    searchThreshold: number;
 }
 export const Config: Schema<Config>;
 export const inject: string[];
@@ -80,14 +82,15 @@ export interface CreateEmbeddingResponse {
 export type ChatCompletionResponseMessageRoleEnum = 'system' | 'model' | 'user' | 'function';
 export function langchainMessageToGeminiMessage(messages: BaseMessage[], model?: string): Promise<ChatCompletionResponseMessage[]>;
 export function partAsType<T extends ChatPart>(part: ChatPart): T;
-export function formatToolsToGeminiAITools(tools: StructuredTool[]): ChatCompletionFunction[];
+export function formatToolsToGeminiAITools(tools: StructuredTool[], config: Config, model: string): Record<string, any>;
 export function formatToolToGeminiAITool(tool: StructuredTool): ChatCompletionFunction;
 export function messageTypeToGeminiRole(type: MessageType): ChatCompletionResponseMessageRoleEnum;
 export function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | ChatMessageChunk;
 export class GeminiRequester extends ModelRequester implements EmbeddingsRequester {
     private _config;
     private _plugin;
-    constructor(_config: ClientConfig, _plugin: ChatLunaPlugin);
+    private _pluginConfig;
+    constructor(_config: ClientConfig, _plugin: ChatLunaPlugin, _pluginConfig: Config);
     completionStream(params: ModelRequestParams): AsyncGenerator<ChatGenerationChunk>;
     embeddings(params: EmbeddingsRequestParams): Promise<number[] | number[][]>;
     getModels(): Promise<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: "请求选项", apiKeys: { $inner: ["Gemini 的 API Key", "Gemini API 的请求地址"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxTokens: "回复的最大 Token 数（16~2097000，必须是 16 的倍数）。注意：仅当您使用的模型最大 Token 为 8000 及以上时，才建议设置超过 2000 token。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。" }] };
+    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: "为模型启用谷歌搜索。", 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" }] };
+    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", 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" }] };
   }
 });
 
@@ -126,7 +126,7 @@ async function langchainMessageToGeminiMessage(messages, model) {
           }
         ]
       };
-      if ((model.includes("vision") || model.includes("gemini-1.5")) && images != null) {
+      if ((model.includes("vision") || model.includes("gemini")) && images != null && !model.includes("gemini-1.0")) {
         for (const image of images) {
           result2.parts.push({
             inline_data: {
@@ -231,11 +231,36 @@ function partAsType(part) {
   return part;
 }
 __name(partAsType, "partAsType");
-function formatToolsToGeminiAITools(tools) {
-  if (tools.length < 1) {
+function formatToolsToGeminiAITools(tools, config, model) {
+  if (tools.length < 1 && !config.googleSearch) {
     return void 0;
   }
-  return tools.map(formatToolToGeminiAITool);
+  const functions = tools.map(formatToolToGeminiAITool);
+  const result = [];
+  if (functions.length > 0 && !config.googleSearch) {
+    result.push({
+      functionDeclarations: functions
+    });
+  } else if (functions.length > 0 && config.googleSearch) {
+    logger.warn("Google search is enabled, function call will be disabled.");
+  }
+  if (config.googleSearch) {
+    if (model.includes("gemini-2")) {
+      result.push({
+        google_search: {}
+      });
+    } else {
+      result.push({
+        google_search_retrieval: {
+          dynamic_retrieval_config: {
+            mode: "MODE_DYNAMIC",
+            dynamic_threshold: config.searchThreshold
+          }
+        }
+      });
+    }
+  }
+  return result;
 }
 __name(formatToolsToGeminiAITools, "formatToolsToGeminiAITools");
 function formatToolToGeminiAITool(tool) {
@@ -268,10 +293,11 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 
 // src/requester.ts
 var GeminiRequester = class extends ModelRequester {
-  constructor(_config, _plugin) {
+  constructor(_config, _plugin, _pluginConfig) {
     super();
     this._config = _config;
     this._plugin = _plugin;
+    this._pluginConfig = _pluginConfig;
   }
   static {
     __name(this, "GeminiRequester");
@@ -309,9 +335,11 @@ var GeminiRequester = class extends ModelRequester {
             maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
             topP: params.topP
           },
-          tools: !params.model.includes("vision") && params.tools != null ? {
-            functionDeclarations: formatToolsToGeminiAITools(params.tools)
-          } : void 0
+          tools: params.tools != null || this._pluginConfig.googleSearch ? formatToolsToGeminiAITools(
+            params.tools ?? [],
+            this._pluginConfig,
+            params.model
+          ) : void 0
         },
         {
           signal: params.signal
@@ -537,7 +565,11 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
   constructor(ctx, _config, clientConfig, plugin) {
     super(ctx, clientConfig);
     this._config = _config;
-    this._requester = new GeminiRequester(clientConfig, plugin);
+    this._requester = new GeminiRequester(
+      clientConfig,
+      plugin,
+      this._config
+    );
   }
   static {
     __name(this, "GeminiClient");
@@ -645,7 +677,7 @@ function apply(ctx, config) {
   });
 }
 __name(apply, "apply");
-var Config = Schema.intersect([
+var Config3 = Schema.intersect([
   ChatLunaPlugin.Config,
   Schema.object({
     apiKeys: Schema.array(
@@ -659,7 +691,9 @@ var Config = Schema.intersect([
   }),
   Schema.object({
     maxTokens: Schema.number().min(16).max(2097e3).step(16).default(8064),
-    temperature: Schema.percent().min(0).max(2).step(0.1).default(0.8)
+    temperature: Schema.percent().min(0).max(2).step(0.1).default(0.8),
+    googleSearch: Schema.boolean().default(false),
+    searchThreshold: Schema.number().min(0).max(1).step(0.1).default(0.5)
   })
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),
@@ -669,7 +703,7 @@ var Config = Schema.intersect([
 var inject = ["chatluna"];
 var name = "chatluna-google-gemini-adapter";
 export {
-  Config,
+  Config3 as Config,
   apply,
   inject,
   logger,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.1",
-    "koishi-plugin-chatluna": "^1.0.0-rc.1"
+    "koishi-plugin-chatluna": "^1.0.0-rc.2"
   },
   "koishi": {
     "description": {