koishi-plugin-chatluna-google-gemini-adapter 1.3.0-alpha.4 → 1.3.0-alpha.6

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_messages2 = require("@langchain/core/messages");
+var import_messages = 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,7 +63,6 @@ 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");
@@ -72,7 +71,7 @@ async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
       const role = messageTypeToGeminiRole(message.getType());
-      const hasFunctionCall = message.tool_calls != null;
+      const hasFunctionCall = message.tool_calls != null && message.tool_calls.length > 0;
       if (role === "function" || hasFunctionCall) {
         return processFunctionMessage(message);
       }
@@ -121,14 +120,17 @@ __name(extractSystemMessages, "extractSystemMessages");
 function parseJsonArgs(args) {
   try {
     const result = JSON.parse(args);
-    return typeof result === "string" ? { input: result } : result;
+    if (typeof result === "string") return { response: result };
+    if (Array.isArray(result)) return { response: result };
+    return result;
   } catch {
-    return { input: args };
+    return { response: args };
   }
 }
 __name(parseJsonArgs, "parseJsonArgs");
 function processFunctionMessage(message) {
-  if (message instanceof import_messages.AIMessageChunk || message instanceof import_messages.AIMessage) {
+  if (message["tool_calls"]) {
+    message = message;
     const toolCalls = message.tool_calls;
     return {
       role: "model",
@@ -143,13 +145,14 @@ function processFunctionMessage(message) {
       })
     };
   }
+  const finalMessage = message;
   return {
     role: "user",
     parts: [
       {
         functionResponse: {
           name: message.name,
-          id: message.tool_call_id,
+          id: finalMessage.tool_call_id,
           response: parseJsonArgs(message.content)
         }
       }
@@ -806,7 +809,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_messages2.AIMessageChunk(
+        const groundingMessage = new import_messages.AIMessageChunk(
           `
 ${groundingContent}`
         );
@@ -819,7 +822,7 @@ ${groundingContent}`
     }
   }
   _createMessageChunk(content, functionCall, imagePart) {
-    const messageChunk = new import_messages2.AIMessageChunk({
+    const messageChunk = new import_messages.AIMessageChunk({
       content: content ?? "",
       tool_call_chunks: [functionCall].filter(Boolean)
     });

package/lib/index.mjs

@@ -40,7 +40,7 @@ import {
 
 // src/requester.ts
 import {
-  AIMessageChunk as AIMessageChunk2
+  AIMessageChunk
 } from "@langchain/core/messages";
 import { ChatGenerationChunk } from "@langchain/core/outputs";
 import {
@@ -54,10 +54,6 @@ 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,
@@ -72,7 +68,7 @@ async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
       const role = messageTypeToGeminiRole(message.getType());
-      const hasFunctionCall = message.tool_calls != null;
+      const hasFunctionCall = message.tool_calls != null && message.tool_calls.length > 0;
       if (role === "function" || hasFunctionCall) {
         return processFunctionMessage(message);
       }
@@ -121,14 +117,17 @@ __name(extractSystemMessages, "extractSystemMessages");
 function parseJsonArgs(args) {
   try {
     const result = JSON.parse(args);
-    return typeof result === "string" ? { input: result } : result;
+    if (typeof result === "string") return { response: result };
+    if (Array.isArray(result)) return { response: result };
+    return result;
   } catch {
-    return { input: args };
+    return { response: args };
   }
 }
 __name(parseJsonArgs, "parseJsonArgs");
 function processFunctionMessage(message) {
-  if (message instanceof AIMessageChunk || message instanceof AIMessage) {
+  if (message["tool_calls"]) {
+    message = message;
     const toolCalls = message.tool_calls;
     return {
       role: "model",
@@ -143,13 +142,14 @@ function processFunctionMessage(message) {
       })
     };
   }
+  const finalMessage = message;
   return {
     role: "user",
     parts: [
       {
         functionResponse: {
           name: message.name,
-          id: message.tool_call_id,
+          id: finalMessage.tool_call_id,
           response: parseJsonArgs(message.content)
         }
       }
@@ -806,7 +806,7 @@ var GeminiRequester = class extends ModelRequester {
     if (groundingContent.length > 0) {
       logger.debug(`grounding content: ${groundingContent}`);
       if (this._pluginConfig.groundingContentDisplay) {
-        const groundingMessage = new AIMessageChunk2(
+        const groundingMessage = new AIMessageChunk(
           `
 ${groundingContent}`
         );
@@ -819,7 +819,7 @@ ${groundingContent}`
     }
   }
   _createMessageChunk(content, functionCall, imagePart) {
-    const messageChunk = new AIMessageChunk2({
+    const messageChunk = new AIMessageChunk({
       content: content ?? "",
       tool_call_chunks: [functionCall].filter(Boolean)
     });

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.4",
+  "version": "1.3.0-alpha.6",
   "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.30",
+    "koishi-plugin-chatluna": "^1.3.0-alpha.31",
     "koishi-plugin-chatluna-storage-service": "^0.0.8"
   },
   "peerDependenciesMeta": {