koishi-plugin-chatluna-google-gemini-adapter 1.1.0-beta.2 → 1.1.0-beta.3

package/lib/index.cjs

@@ -56,7 +56,6 @@ var import_error2 = require("koishi-plugin-chatluna/utils/error");
 // src/requester.ts
 var import_messages2 = require("@langchain/core/messages");
 var import_outputs = require("@langchain/core/outputs");
-var import_json = require("@streamparser/json");
 var import_api = require("koishi-plugin-chatluna/llm-core/platform/api");
 var import_error = require("koishi-plugin-chatluna/utils/error");
 var import_sse = require("koishi-plugin-chatluna/utils/sse");
@@ -243,14 +242,25 @@ function formatToolsToGeminiAITools(tools, config, model) {
   }
   const functions = tools.map(formatToolToGeminiAITool);
   const result = [];
-  if (functions.length > 0 && !config.googleSearch) {
+  const unsupportedModels = [
+    "gemini-1.0",
+    "gemini-2.0-flash-lite",
+    "gemini-1.5-flash"
+  ];
+  let googleSearch = config.googleSearch;
+  if (functions.length > 0 && !googleSearch) {
     result.push({
       functionDeclarations: functions
     });
-  } else if (functions.length > 0 && config.googleSearch) {
+  } else if (functions.length > 0 && googleSearch) {
     logger.warn("Google search is enabled, tool calling will be disable.");
+  } else if (unsupportedModels.some((model2) => model2.includes(model2)) && googleSearch) {
+    logger.warn(
+      `The model ${model} does not support google search. google search will be disable.`
+    );
+    googleSearch = false;
   }
-  if (config.googleSearch) {
+  if (googleSearch) {
     if (model.includes("gemini-2")) {
       result.push({
         google_search: {}
@@ -336,7 +346,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
   async *completionStream(params) {
     try {
       const response = await this._post(
-        `models/${params.model}:streamGenerateContent`,
+        `models/${params.model}:streamGenerateContent?alt=sse`,
         {
           contents: await langchainMessageToGeminiMessage(
             params.input,
@@ -345,23 +355,23 @@ var GeminiRequester = class extends import_api.ModelRequester {
           safetySettings: [
             {
               category: "HARM_CATEGORY_HARASSMENT",
-              threshold: "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_HATE_SPEECH",
-              threshold: "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-              threshold: "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-              threshold: "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_CIVIC_INTEGRITY",
-              threshold: "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
             }
           ],
           generationConfig: {
@@ -382,44 +392,41 @@ var GeminiRequester = class extends import_api.ModelRequester {
         }
       );
       let errorCount = 0;
-      const stream = new TransformStream();
-      const iterable = (0, import_stream.readableStreamToAsyncIterable)(
-        stream.readable
-      );
-      const jsonParser = new import_json.JSONParser();
-      const writable = stream.writable.getWriter();
       let groundingContent = "";
       let currentGroudingIndex = 0;
-      jsonParser.onEnd = async () => {
-        await writable.close();
-      };
-      jsonParser.onValue = async ({ value }) => {
-        const transformValue = value;
-        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));
+      await (0, import_sse.checkResponse)(response);
+      const readableStream = new ReadableStream({
+        async start(controller) {
+          for await (const chunk of (0, import_sse.sseIterable)(response)) {
+            controller.enqueue(chunk.data);
           }
-          for (const part of parts) {
-            await writable.write(part);
+          controller.close();
+        }
+      });
+      const transformToChatPartStream = new TransformStream({
+        async transform(chunk, controller) {
+          const parsedValue = JSON.parse(chunk);
+          const transformValue = parsedValue;
+          if (!transformValue.candidates) {
+            return;
           }
-          for (const source of candidate.groundingMetadata?.groundingChunks ?? []) {
-            groundingContent += `[^${currentGroudingIndex++}]: [${source.web.title}](${source.web.uri})
+          for (const candidate of transformValue.candidates) {
+            const parts = candidate.content?.parts;
+            if (parts == null || parts.length < 1) {
+              throw new Error(chunk);
+            }
+            for (const part of parts) {
+              controller.enqueue(part);
+            }
+            for (const source of candidate.groundingMetadata?.groundingChunks ?? []) {
+              groundingContent += `[^${currentGroudingIndex++}]: [${source.web.title}](${source.web.uri})
 `;
+            }
           }
         }
-      };
-      await (0, import_sse.checkResponse)(response);
-      (0, import_sse.sse)(
-        response,
-        async (rawData) => {
-          jsonParser.write(rawData);
-          return true;
-        },
-        0
+      });
+      const iterable = (0, import_stream.readableStreamToAsyncIterable)(
+        readableStream.pipeThrough(transformToChatPartStream)
       );
       let reasoningContent = "";
       let content = "";
@@ -602,10 +609,15 @@ ${groundingContent}`
   }
   _concatUrl(url) {
     const apiEndPoint = this._config.apiEndpoint;
+    let baseURL;
     if (apiEndPoint.endsWith("/")) {
-      return apiEndPoint + url + `?key=${this._config.apiKey}`;
+      baseURL = new URL(apiEndPoint + url);
+    } else {
+      baseURL = new URL(apiEndPoint + "/" + url);
     }
-    return apiEndPoint + "/" + url + `?key=${this._config.apiKey}`;
+    const searchParams = baseURL.searchParams;
+    searchParams.set("key", this._config.apiKey);
+    return baseURL.toString();
   }
   _buildHeaders() {
     return {

package/lib/index.mjs

@@ -40,7 +40,6 @@ import {
 // src/requester.ts
 import { AIMessageChunk as AIMessageChunk2 } from "@langchain/core/messages";
 import { ChatGenerationChunk } from "@langchain/core/outputs";
-import { JSONParser } from "@streamparser/json";
 import {
   ModelRequester
 } from "koishi-plugin-chatluna/llm-core/platform/api";
@@ -48,7 +47,7 @@ import {
   ChatLunaError,
   ChatLunaErrorCode
 } from "koishi-plugin-chatluna/utils/error";
-import { checkResponse, sse } from "koishi-plugin-chatluna/utils/sse";
+import { checkResponse, sseIterable } from "koishi-plugin-chatluna/utils/sse";
 import { readableStreamToAsyncIterable } from "koishi-plugin-chatluna/utils/stream";
 
 // src/utils.ts
@@ -237,14 +236,25 @@ function formatToolsToGeminiAITools(tools, config, model) {
   }
   const functions = tools.map(formatToolToGeminiAITool);
   const result = [];
-  if (functions.length > 0 && !config.googleSearch) {
+  const unsupportedModels = [
+    "gemini-1.0",
+    "gemini-2.0-flash-lite",
+    "gemini-1.5-flash"
+  ];
+  let googleSearch = config.googleSearch;
+  if (functions.length > 0 && !googleSearch) {
     result.push({
       functionDeclarations: functions
     });
-  } else if (functions.length > 0 && config.googleSearch) {
+  } else if (functions.length > 0 && googleSearch) {
     logger.warn("Google search is enabled, tool calling will be disable.");
+  } else if (unsupportedModels.some((model2) => model2.includes(model2)) && googleSearch) {
+    logger.warn(
+      `The model ${model} does not support google search. google search will be disable.`
+    );
+    googleSearch = false;
   }
-  if (config.googleSearch) {
+  if (googleSearch) {
     if (model.includes("gemini-2")) {
       result.push({
         google_search: {}
@@ -330,7 +340,7 @@ var GeminiRequester = class extends ModelRequester {
   async *completionStream(params) {
     try {
       const response = await this._post(
-        `models/${params.model}:streamGenerateContent`,
+        `models/${params.model}:streamGenerateContent?alt=sse`,
         {
           contents: await langchainMessageToGeminiMessage(
             params.input,
@@ -339,23 +349,23 @@ var GeminiRequester = class extends ModelRequester {
           safetySettings: [
             {
               category: "HARM_CATEGORY_HARASSMENT",
-              threshold: "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_HATE_SPEECH",
-              threshold: "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-              threshold: "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-              threshold: "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
             },
             {
               category: "HARM_CATEGORY_CIVIC_INTEGRITY",
-              threshold: "BLOCK_NONE"
+              threshold: params.model.includes("gemini-2.0") ? "OFF" : "BLOCK_NONE"
             }
           ],
           generationConfig: {
@@ -376,44 +386,41 @@ var GeminiRequester = class extends ModelRequester {
         }
       );
       let errorCount = 0;
-      const stream = new TransformStream();
-      const iterable = readableStreamToAsyncIterable(
-        stream.readable
-      );
-      const jsonParser = new JSONParser();
-      const writable = stream.writable.getWriter();
       let groundingContent = "";
       let currentGroudingIndex = 0;
-      jsonParser.onEnd = async () => {
-        await writable.close();
-      };
-      jsonParser.onValue = async ({ value }) => {
-        const transformValue = value;
-        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));
+      await checkResponse(response);
+      const readableStream = new ReadableStream({
+        async start(controller) {
+          for await (const chunk of sseIterable(response)) {
+            controller.enqueue(chunk.data);
           }
-          for (const part of parts) {
-            await writable.write(part);
+          controller.close();
+        }
+      });
+      const transformToChatPartStream = new TransformStream({
+        async transform(chunk, controller) {
+          const parsedValue = JSON.parse(chunk);
+          const transformValue = parsedValue;
+          if (!transformValue.candidates) {
+            return;
           }
-          for (const source of candidate.groundingMetadata?.groundingChunks ?? []) {
-            groundingContent += `[^${currentGroudingIndex++}]: [${source.web.title}](${source.web.uri})
+          for (const candidate of transformValue.candidates) {
+            const parts = candidate.content?.parts;
+            if (parts == null || parts.length < 1) {
+              throw new Error(chunk);
+            }
+            for (const part of parts) {
+              controller.enqueue(part);
+            }
+            for (const source of candidate.groundingMetadata?.groundingChunks ?? []) {
+              groundingContent += `[^${currentGroudingIndex++}]: [${source.web.title}](${source.web.uri})
 `;
+            }
           }
         }
-      };
-      await checkResponse(response);
-      sse(
-        response,
-        async (rawData) => {
-          jsonParser.write(rawData);
-          return true;
-        },
-        0
+      });
+      const iterable = readableStreamToAsyncIterable(
+        readableStream.pipeThrough(transformToChatPartStream)
       );
       let reasoningContent = "";
       let content = "";
@@ -596,10 +603,15 @@ ${groundingContent}`
   }
   _concatUrl(url) {
     const apiEndPoint = this._config.apiEndpoint;
+    let baseURL;
     if (apiEndPoint.endsWith("/")) {
-      return apiEndPoint + url + `?key=${this._config.apiKey}`;
+      baseURL = new URL(apiEndPoint + url);
+    } else {
+      baseURL = new URL(apiEndPoint + "/" + url);
     }
-    return apiEndPoint + "/" + url + `?key=${this._config.apiKey}`;
+    const searchParams = baseURL.searchParams;
+    searchParams.set("key", this._config.apiKey);
+    return baseURL.toString();
   }
   _buildHeaders() {
     return {

package/lib/utils.d.ts

@@ -7,4 +7,4 @@ export declare function partAsType<T extends ChatPart>(part: ChatPart): T;
 export declare function formatToolsToGeminiAITools(tools: StructuredTool[], config: Config, model: string): Record<string, any>;
 export declare function formatToolToGeminiAITool(tool: StructuredTool): ChatCompletionFunction;
 export declare function messageTypeToGeminiRole(type: MessageType): ChatCompletionResponseMessageRoleEnum;
-export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | ChatMessageChunk;
+export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | ChatMessageChunk;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.1.0-beta.2",
+  "version": "1.1.0-beta.3",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -63,7 +63,6 @@
   ],
   "dependencies": {
     "@langchain/core": "^0.3.18",
-    "@streamparser/json": "^0.0.21",
     "zod": "^3.24.0-canary.20241107T043915",
     "zod-to-json-schema": "^3.23.5"
   },
@@ -73,7 +72,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.4",
-    "koishi-plugin-chatluna": "^1.1.0-beta.14"
+    "koishi-plugin-chatluna": "^1.1.0-beta.16"
   },
   "koishi": {
     "description": {