koishi-plugin-chatluna-google-gemini-adapter 1.3.0-alpha.2 → 1.3.0-alpha.3

package/lib/index.cjs

@@ -55,7 +55,7 @@ var import_types = require("koishi-plugin-chatluna/llm-core/platform/types");
 var import_error2 = require("koishi-plugin-chatluna/utils/error");
 
 // src/requester.ts
-var import_messages = require("@langchain/core/messages");
+var import_messages2 = require("@langchain/core/messages");
 var import_outputs = require("@langchain/core/outputs");
 var import_api = require("koishi-plugin-chatluna/llm-core/platform/api");
 var import_error = require("koishi-plugin-chatluna/utils/error");
@@ -63,6 +63,7 @@ var import_sse = require("koishi-plugin-chatluna/utils/sse");
 var import_stream = require("koishi-plugin-chatluna/utils/stream");
 
 // src/utils.ts
+var import_messages = require("@langchain/core/messages");
 var import_zod_to_json_schema = require("zod-to-json-schema");
 var import_v1_shared_adapter = require("@chatluna/v1-shared-adapter");
 var import_string = require("koishi-plugin-chatluna/utils/string");
@@ -71,7 +72,7 @@ async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
       const role = messageTypeToGeminiRole(message.getType());
-      const hasFunctionCall = message.additional_kwargs?.function_call != null;
+      const hasFunctionCall = message.tool_calls != null;
       if (role === "function" || hasFunctionCall) {
         return processFunctionMessage(message);
       }
@@ -117,15 +118,6 @@ function extractSystemMessages(messages) {
   ];
 }
 __name(extractSystemMessages, "extractSystemMessages");
-function parseJsonSafely(content) {
-  try {
-    const result = JSON.parse(content);
-    return typeof result === "string" ? { response: result } : result;
-  } catch {
-    return { response: content };
-  }
-}
-__name(parseJsonSafely, "parseJsonSafely");
 function parseJsonArgs(args) {
   try {
     const result = JSON.parse(args);
@@ -136,31 +128,29 @@ function parseJsonArgs(args) {
 }
 __name(parseJsonArgs, "parseJsonArgs");
 function processFunctionMessage(message) {
-  const hasFunctionCall = message.additional_kwargs?.function_call != null;
-  if (hasFunctionCall) {
-    const functionCall = message.additional_kwargs.function_call;
+  if (message instanceof import_messages.AIMessageChunk || message instanceof import_messages.AIMessage) {
+    const toolCalls = message.tool_calls;
     return {
-      role: "function",
-      parts: [
-        {
+      role: "model",
+      parts: toolCalls.map((toolCall) => {
+        return {
           functionCall: {
-            name: functionCall.name,
-            args: parseJsonArgs(functionCall.arguments)
+            name: toolCall.name,
+            args: toolCall.args,
+            id: toolCall.id
           }
-        }
-      ]
+        };
+      })
     };
   }
   return {
-    role: "function",
+    role: "user",
     parts: [
       {
         functionResponse: {
           name: message.name,
-          response: {
-            name: message.name,
-            content: parseJsonSafely(message.content)
-          }
+          id: message.tool_call_id,
+          response: parseJsonArgs(message.content)
         }
       }
     ]
@@ -314,7 +304,7 @@ function messageTypeToGeminiRole(type) {
       return "model";
     case "human":
       return "user";
-    case "function":
+    case "tool":
       return "function";
     default:
       throw new Error(`Unknown message type: ${type}`);
@@ -707,27 +697,23 @@ var GeminiRequester = class extends import_api.ModelRequester {
   async *_processChunks(iterable) {
     let reasoningContent = "";
     let errorCount = 0;
-    const functionCall = {
-      name: "",
-      args: "",
-      arguments: ""
-    };
+    let functionIndex = 0;
     for await (const chunk of iterable) {
       try {
-        const { updatedContent, updatedReasoning } = await this._processChunk(
+        const { updatedContent, updatedReasoning, updatedToolCalling } = await this._processChunk(
           chunk,
           reasoningContent,
-          functionCall
+          functionIndex
         );
         if (updatedReasoning !== reasoningContent) {
           reasoningContent = updatedReasoning;
           yield { type: "reasoning", content: reasoningContent };
           continue;
         }
-        if (updatedContent || functionCall.name) {
+        if (updatedContent || updatedToolCalling) {
           const messageChunk = this._createMessageChunk(
             updatedContent,
-            functionCall,
+            updatedToolCalling,
             this.ctx.chatluna_storage != null ? void 0 : partAsTypeCheck(
               chunk,
               (part) => part["inlineData"] != null
@@ -739,6 +725,9 @@ var GeminiRequester = class extends import_api.ModelRequester {
           });
           yield { type: "generation", generation: generationChunk };
         }
+        if (updatedToolCalling) {
+          functionIndex++;
+        }
       } catch (e) {
         if (errorCount > 5) {
           logger.error("error with chunk", chunk);
@@ -753,7 +742,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
       }
     }
   }
-  async _processChunk(chunk, reasoningContent, functionCall) {
+  async _processChunk(chunk, reasoningContent, functionIndex) {
     const messagePart = partAsType(chunk);
     const chatFunctionCallingPart = partAsType(chunk);
     const imagePart = partAsTypeCheck(
@@ -790,30 +779,25 @@ var GeminiRequester = class extends import_api.ModelRequester {
       }
     }
     const deltaFunctionCall = chatFunctionCallingPart?.functionCall;
+    let updatedToolCalling;
     if (deltaFunctionCall) {
-      this._updateFunctionCall(functionCall, deltaFunctionCall);
+      updatedToolCalling = this._createToolCallChunk(
+        deltaFunctionCall,
+        functionIndex
+      );
     }
     return {
       updatedContent: messageContent,
-      updatedReasoning: reasoningContent
+      updatedReasoning: reasoningContent,
+      updatedToolCalling
     };
   }
-  _updateFunctionCall(functionCall, deltaFunctionCall) {
-    let args = deltaFunctionCall.args;
-    try {
-      let parsedArgs = JSON.parse(args);
-      if (typeof parsedArgs !== "string") {
-        args = parsedArgs;
-      }
-      parsedArgs = JSON.parse(args);
-      if (typeof parsedArgs !== "string") {
-        args = parsedArgs;
-      }
-    } catch (e) {
-    }
-    functionCall.args = JSON.stringify(args);
-    functionCall.name = deltaFunctionCall.name;
-    functionCall.arguments = deltaFunctionCall.args;
+  _createToolCallChunk(deltaFunctionCall, functionIndex) {
+    return {
+      name: deltaFunctionCall?.name,
+      args: JSON.stringify(deltaFunctionCall.args),
+      id: deltaFunctionCall.id ?? `function_call_${functionIndex}`
+    };
   }
   _handleFinalContent(reasoningContent, groundingContent) {
     if (reasoningContent.length > 0) {
@@ -822,7 +806,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
     if (groundingContent.length > 0) {
       logger.debug(`grounding content: ${groundingContent}`);
       if (this._pluginConfig.groundingContentDisplay) {
-        const groundingMessage = new import_messages.AIMessageChunk(
+        const groundingMessage = new import_messages2.AIMessageChunk(
           `
 ${groundingContent}`
         );
@@ -835,16 +819,11 @@ ${groundingContent}`
     }
   }
   _createMessageChunk(content, functionCall, imagePart) {
-    const messageChunk = new import_messages.AIMessageChunk({
-      content: content ?? ""
+    const messageChunk = new import_messages2.AIMessageChunk({
+      content: content ?? "",
+      tool_call_chunks: [functionCall].filter(Boolean)
     });
     messageChunk.additional_kwargs = {
-      function_call: functionCall.name.length > 0 ? {
-        name: functionCall.name,
-        arguments: functionCall.args,
-        args: functionCall.arguments
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      } : void 0,
       images: imagePart ? [
         `data:${imagePart.inlineData.mimeType ?? "image/png"};base64,${imagePart.inlineData.data}`
       ] : void 0

package/lib/index.mjs

@@ -40,7 +40,7 @@ import {
 
 // src/requester.ts
 import {
-  AIMessageChunk
+  AIMessageChunk as AIMessageChunk2
 } from "@langchain/core/messages";
 import { ChatGenerationChunk } from "@langchain/core/outputs";
 import {
@@ -54,6 +54,10 @@ import { checkResponse, sseIterable } from "koishi-plugin-chatluna/utils/sse";
 import { readableStreamToAsyncIterable } from "koishi-plugin-chatluna/utils/stream";
 
 // src/utils.ts
+import {
+  AIMessage,
+  AIMessageChunk
+} from "@langchain/core/messages";
 import { zodToJsonSchema } from "zod-to-json-schema";
 import {
   fetchImageUrl,
@@ -68,7 +72,7 @@ async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
       const role = messageTypeToGeminiRole(message.getType());
-      const hasFunctionCall = message.additional_kwargs?.function_call != null;
+      const hasFunctionCall = message.tool_calls != null;
       if (role === "function" || hasFunctionCall) {
         return processFunctionMessage(message);
       }
@@ -114,15 +118,6 @@ function extractSystemMessages(messages) {
   ];
 }
 __name(extractSystemMessages, "extractSystemMessages");
-function parseJsonSafely(content) {
-  try {
-    const result = JSON.parse(content);
-    return typeof result === "string" ? { response: result } : result;
-  } catch {
-    return { response: content };
-  }
-}
-__name(parseJsonSafely, "parseJsonSafely");
 function parseJsonArgs(args) {
   try {
     const result = JSON.parse(args);
@@ -133,31 +128,29 @@ function parseJsonArgs(args) {
 }
 __name(parseJsonArgs, "parseJsonArgs");
 function processFunctionMessage(message) {
-  const hasFunctionCall = message.additional_kwargs?.function_call != null;
-  if (hasFunctionCall) {
-    const functionCall = message.additional_kwargs.function_call;
+  if (message instanceof AIMessageChunk || message instanceof AIMessage) {
+    const toolCalls = message.tool_calls;
     return {
-      role: "function",
-      parts: [
-        {
+      role: "model",
+      parts: toolCalls.map((toolCall) => {
+        return {
           functionCall: {
-            name: functionCall.name,
-            args: parseJsonArgs(functionCall.arguments)
+            name: toolCall.name,
+            args: toolCall.args,
+            id: toolCall.id
           }
-        }
-      ]
+        };
+      })
     };
   }
   return {
-    role: "function",
+    role: "user",
     parts: [
       {
         functionResponse: {
           name: message.name,
-          response: {
-            name: message.name,
-            content: parseJsonSafely(message.content)
-          }
+          id: message.tool_call_id,
+          response: parseJsonArgs(message.content)
         }
       }
     ]
@@ -311,7 +304,7 @@ function messageTypeToGeminiRole(type) {
       return "model";
     case "human":
       return "user";
-    case "function":
+    case "tool":
       return "function";
     default:
       throw new Error(`Unknown message type: ${type}`);
@@ -704,27 +697,23 @@ var GeminiRequester = class extends ModelRequester {
   async *_processChunks(iterable) {
     let reasoningContent = "";
     let errorCount = 0;
-    const functionCall = {
-      name: "",
-      args: "",
-      arguments: ""
-    };
+    let functionIndex = 0;
     for await (const chunk of iterable) {
       try {
-        const { updatedContent, updatedReasoning } = await this._processChunk(
+        const { updatedContent, updatedReasoning, updatedToolCalling } = await this._processChunk(
           chunk,
           reasoningContent,
-          functionCall
+          functionIndex
         );
         if (updatedReasoning !== reasoningContent) {
           reasoningContent = updatedReasoning;
           yield { type: "reasoning", content: reasoningContent };
           continue;
         }
-        if (updatedContent || functionCall.name) {
+        if (updatedContent || updatedToolCalling) {
           const messageChunk = this._createMessageChunk(
             updatedContent,
-            functionCall,
+            updatedToolCalling,
             this.ctx.chatluna_storage != null ? void 0 : partAsTypeCheck(
               chunk,
               (part) => part["inlineData"] != null
@@ -736,6 +725,9 @@ var GeminiRequester = class extends ModelRequester {
           });
           yield { type: "generation", generation: generationChunk };
         }
+        if (updatedToolCalling) {
+          functionIndex++;
+        }
       } catch (e) {
         if (errorCount > 5) {
           logger.error("error with chunk", chunk);
@@ -750,7 +742,7 @@ var GeminiRequester = class extends ModelRequester {
       }
     }
   }
-  async _processChunk(chunk, reasoningContent, functionCall) {
+  async _processChunk(chunk, reasoningContent, functionIndex) {
     const messagePart = partAsType(chunk);
     const chatFunctionCallingPart = partAsType(chunk);
     const imagePart = partAsTypeCheck(
@@ -787,30 +779,25 @@ var GeminiRequester = class extends ModelRequester {
       }
     }
     const deltaFunctionCall = chatFunctionCallingPart?.functionCall;
+    let updatedToolCalling;
     if (deltaFunctionCall) {
-      this._updateFunctionCall(functionCall, deltaFunctionCall);
+      updatedToolCalling = this._createToolCallChunk(
+        deltaFunctionCall,
+        functionIndex
+      );
     }
     return {
       updatedContent: messageContent,
-      updatedReasoning: reasoningContent
+      updatedReasoning: reasoningContent,
+      updatedToolCalling
     };
   }
-  _updateFunctionCall(functionCall, deltaFunctionCall) {
-    let args = deltaFunctionCall.args;
-    try {
-      let parsedArgs = JSON.parse(args);
-      if (typeof parsedArgs !== "string") {
-        args = parsedArgs;
-      }
-      parsedArgs = JSON.parse(args);
-      if (typeof parsedArgs !== "string") {
-        args = parsedArgs;
-      }
-    } catch (e) {
-    }
-    functionCall.args = JSON.stringify(args);
-    functionCall.name = deltaFunctionCall.name;
-    functionCall.arguments = deltaFunctionCall.args;
+  _createToolCallChunk(deltaFunctionCall, functionIndex) {
+    return {
+      name: deltaFunctionCall?.name,
+      args: JSON.stringify(deltaFunctionCall.args),
+      id: deltaFunctionCall.id ?? `function_call_${functionIndex}`
+    };
   }
   _handleFinalContent(reasoningContent, groundingContent) {
     if (reasoningContent.length > 0) {
@@ -819,7 +806,7 @@ var GeminiRequester = class extends ModelRequester {
     if (groundingContent.length > 0) {
       logger.debug(`grounding content: ${groundingContent}`);
       if (this._pluginConfig.groundingContentDisplay) {
-        const groundingMessage = new AIMessageChunk(
+        const groundingMessage = new AIMessageChunk2(
           `
 ${groundingContent}`
         );
@@ -832,16 +819,11 @@ ${groundingContent}`
     }
   }
   _createMessageChunk(content, functionCall, imagePart) {
-    const messageChunk = new AIMessageChunk({
-      content: content ?? ""
+    const messageChunk = new AIMessageChunk2({
+      content: content ?? "",
+      tool_call_chunks: [functionCall].filter(Boolean)
     });
     messageChunk.additional_kwargs = {
-      function_call: functionCall.name.length > 0 ? {
-        name: functionCall.name,
-        arguments: functionCall.args,
-        args: functionCall.arguments
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      } : void 0,
       images: imagePart ? [
         `data:${imagePart.inlineData.mimeType ?? "image/png"};base64,${imagePart.inlineData.data}`
       ] : void 0

package/lib/requester.d.ts

@@ -26,7 +26,7 @@ export declare class GeminiRequester extends ModelRequester implements Embedding
     private _processCandidateChunk;
     private _processChunks;
     private _processChunk;
-    private _updateFunctionCall;
+    private _createToolCallChunk;
     private _handleFinalContent;
     private _createMessageChunk;
     private _post;

package/lib/types.d.ts

@@ -23,12 +23,14 @@ export type ChatFunctionCallingPart = {
     functionCall: {
         name: string;
         args?: any;
+        id?: string;
     };
 };
 export type ChatFunctionResponsePart = {
     functionResponse: {
         name: string;
         response: any;
+        id?: string;
     };
 };
 export interface ChatResponse {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.3.0-alpha.2",
+  "version": "1.3.0-alpha.3",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.28",
+    "koishi-plugin-chatluna": "^1.3.0-alpha.30",
     "koishi-plugin-chatluna-storage-service": "^0.0.8"
   },
   "peerDependenciesMeta": {