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

package/lib/index.cjs

@@ -23,7 +23,7 @@ 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: "为模型启用谷歌搜索。", searchThreshold: "搜索的置信度阈值，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。" }] };
+    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，设置的数值越低，则越倾向于使用谷歌搜索。" }] };
   }
 });
 
@@ -35,15 +35,15 @@ var require_en_US_schema = __commonJS({
 });
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   Config: () => Config3,
   apply: () => apply,
   inject: () => inject,
   logger: () => logger,
   name: () => name
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 var import_chat = require("koishi-plugin-chatluna/services/chat");
 var import_koishi = require("koishi");
 
@@ -333,6 +333,10 @@ var GeminiRequester = class extends import_api.ModelRequester {
             {
               category: "HARM_CATEGORY_DANGEROUS_CONTENT",
               threshold: "BLOCK_NONE"
+            },
+            {
+              category: "HARM_CATEGORY_CIVIC_INTEGRITY",
+              threshold: "BLOCK_NONE"
             }
           ],
           generationConfig: {
@@ -340,6 +344,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
             temperature: params.temperature,
             maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
             topP: params.topP
+            // thinkingConfig: { includeThoughts: true }
           },
           tools: params.tools != null || this._pluginConfig.googleSearch ? formatToolsToGeminiAITools(
             params.tools ?? [],
@@ -363,8 +368,11 @@ var GeminiRequester = class extends import_api.ModelRequester {
       };
       jsonParser.onValue = async ({ value }) => {
         const transformValue = value;
-        if (transformValue.candidates && transformValue.candidates[0]) {
-          const parts = transformValue.candidates[0]?.content?.parts;
+        if (!transformValue.candidates) {
+          return;
+        }
+        for (const candidate of transformValue.candidates) {
+          const parts = candidate.content?.parts;
           if (parts == null || parts.length < 1) {
             throw new Error(JSON.stringify(value));
           }
@@ -382,6 +390,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
         0
       );
       let content = "";
+      let reasoningContent = "";
       let isOldVisionModel = params.model.includes("vision");
       const functionCall = {
         name: "",
@@ -392,6 +401,10 @@ var GeminiRequester = class extends import_api.ModelRequester {
         const messagePart = partAsType(chunk);
         const chatFunctionCallingPart = partAsType(chunk);
         if (messagePart.text) {
+          if (messagePart.thought) {
+            reasoningContent += messagePart.text;
+            continue;
+          }
           if (params.tools != null) {
             content = messagePart.text;
           } else {
@@ -450,6 +463,9 @@ var GeminiRequester = class extends import_api.ModelRequester {
           }
         }
       }
+      if (reasoningContent.length > 0) {
+        logger.debug(`reasoning content: ${reasoningContent}`);
+      }
     } catch (e) {
       if (e instanceof import_error.ChatLunaError) {
         throw e;

package/lib/index.d.ts

@@ -27,6 +27,7 @@ export interface ChatCompletionResponseMessage {
 export type ChatPart = ChatMessagePart | ChatUploadDataPart | ChatFunctionCallingPart | ChatFunctionResponsePart;
 export type ChatMessagePart = {
     text: string;
+    thought?: boolean;
 };
 export type ChatUploadDataPart = {
     inline_data: {

package/lib/index.mjs

@@ -8,7 +8,7 @@ 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: "为模型启用谷歌搜索。", searchThreshold: "搜索的置信度阈值，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。" }] };
+    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，设置的数值越低，则越倾向于使用谷歌搜索。" }] };
   }
 });
 
@@ -327,6 +327,10 @@ var GeminiRequester = class extends ModelRequester {
             {
               category: "HARM_CATEGORY_DANGEROUS_CONTENT",
               threshold: "BLOCK_NONE"
+            },
+            {
+              category: "HARM_CATEGORY_CIVIC_INTEGRITY",
+              threshold: "BLOCK_NONE"
             }
           ],
           generationConfig: {
@@ -334,6 +338,7 @@ var GeminiRequester = class extends ModelRequester {
             temperature: params.temperature,
             maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
             topP: params.topP
+            // thinkingConfig: { includeThoughts: true }
           },
           tools: params.tools != null || this._pluginConfig.googleSearch ? formatToolsToGeminiAITools(
             params.tools ?? [],
@@ -357,8 +362,11 @@ var GeminiRequester = class extends ModelRequester {
       };
       jsonParser.onValue = async ({ value }) => {
         const transformValue = value;
-        if (transformValue.candidates && transformValue.candidates[0]) {
-          const parts = transformValue.candidates[0]?.content?.parts;
+        if (!transformValue.candidates) {
+          return;
+        }
+        for (const candidate of transformValue.candidates) {
+          const parts = candidate.content?.parts;
           if (parts == null || parts.length < 1) {
             throw new Error(JSON.stringify(value));
           }
@@ -376,6 +384,7 @@ var GeminiRequester = class extends ModelRequester {
         0
       );
       let content = "";
+      let reasoningContent = "";
       let isOldVisionModel = params.model.includes("vision");
       const functionCall = {
         name: "",
@@ -386,6 +395,10 @@ var GeminiRequester = class extends ModelRequester {
         const messagePart = partAsType(chunk);
         const chatFunctionCallingPart = partAsType(chunk);
         if (messagePart.text) {
+          if (messagePart.thought) {
+            reasoningContent += messagePart.text;
+            continue;
+          }
           if (params.tools != null) {
             content = messagePart.text;
           } else {
@@ -444,6 +457,9 @@ var GeminiRequester = class extends ModelRequester {
           }
         }
       }
+      if (reasoningContent.length > 0) {
+        logger.debug(`reasoning content: ${reasoningContent}`);
+      }
     } catch (e) {
       if (e instanceof ChatLunaError) {
         throw e;

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.2",
+  "version": "1.0.0",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -69,11 +69,11 @@
   },
   "devDependencies": {
     "atsc": "^2.1.0",
-    "koishi": "^4.18.1"
+    "koishi": "^4.18.4"
   },
   "peerDependencies": {
-    "koishi": "^4.18.1",
-    "koishi-plugin-chatluna": "^1.0.0-rc.2"
+    "koishi": "^4.18.4",
+    "koishi-plugin-chatluna": "^1.0.0"
   },
   "koishi": {
     "description": {