koishi-plugin-chatluna-google-gemini-adapter 1.2.21 → 1.2.22

package/lib/index.cjs

@@ -65,97 +65,28 @@ 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");
-async function langchainMessageToGeminiMessage(messages, model) {
-  const mappedMessages = await Promise.all(
-    messages.map(async (rawMessage) => {
-      const role = messageTypeToGeminiRole(rawMessage.getType());
-      if (role === "function" || rawMessage.additional_kwargs?.function_call != null) {
-        return {
-          role: "function",
-          parts: [
-            {
-              functionResponse: rawMessage.additional_kwargs?.function_call != null ? void 0 : {
-                name: rawMessage.name,
-                response: {
-                  name: rawMessage.name,
-                  content: (() => {
-                    try {
-                      const result2 = JSON.parse(
-                        rawMessage.content
-                      );
-                      if (typeof result2 === "string") {
-                        return {
-                          response: result2
-                        };
-                      } else {
-                        return result2;
-                      }
-                    } catch (e) {
-                      return {
-                        response: rawMessage.content
-                      };
-                    }
-                  })()
-                }
-              },
-              functionCall: rawMessage.additional_kwargs?.function_call != null ? {
-                name: rawMessage.additional_kwargs.function_call.name,
-                args: (() => {
-                  try {
-                    const result2 = JSON.parse(
-                      rawMessage.additional_kwargs.function_call.arguments
-                    );
-                    if (typeof result2 === "string") {
-                      return {
-                        input: result2
-                      };
-                    } else {
-                      return result2;
-                    }
-                  } catch (e) {
-                    return {
-                      input: rawMessage.additional_kwargs.function_call.arguments
-                    };
-                  }
-                })()
-              } : void 0
-            }
-          ]
-        };
+var import_v1_shared_adapter = require("@chatluna/v1-shared-adapter");
+var import_string = require("koishi-plugin-chatluna/utils/string");
+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;
+      if (role === "function" || hasFunctionCall) {
+        return processFunctionMessage(message);
       }
-      const images = rawMessage.additional_kwargs.images;
       const result = {
         role,
-        parts: [
-          {
-            text: rawMessage.content
-          }
-        ]
+        parts: []
       };
-      if ((model.includes("vision") || model.includes("gemini") || model.includes("gemma")) && images != null && !model.includes("gemini-1.0")) {
-        for (const image of images) {
-          const mineType = image.split(";")?.[0]?.split(":")?.[1];
-          const data = image.replace(/^data:image\/\w+;base64,/, "");
-          result.parts.push({
-            inline_data: {
-              // base64 image match type
-              data,
-              mime_type: mineType ?? "image/jpeg"
-            }
-          });
-        }
-        result.parts = result.parts.filter((uncheckedPart) => {
-          const part = partAsTypeCheck(
-            uncheckedPart,
-            (part2) => part2["text"] != null
-          );
-          return part == null || part.text.length > 0;
-        });
+      result.parts = typeof message.content === "string" ? [{ text: message.content }] : await processGeminiContentParts(plugin, message.content);
+      const images = message.additional_kwargs.images;
+      if (images) {
+        processImageParts(result, images, model);
       }
       return result;
     })
   );
-  return mappedMessages;
 }
 __name(langchainMessageToGeminiMessage, "langchainMessageToGeminiMessage");
 function extractSystemMessages(messages) {
@@ -188,6 +119,105 @@ 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);
+    return typeof result === "string" ? { input: result } : result;
+  } catch {
+    return { input: args };
+  }
+}
+__name(parseJsonArgs, "parseJsonArgs");
+function processFunctionMessage(message) {
+  const hasFunctionCall = message.additional_kwargs?.function_call != null;
+  if (hasFunctionCall) {
+    const functionCall = message.additional_kwargs.function_call;
+    return {
+      role: "function",
+      parts: [
+        {
+          functionCall: {
+            name: functionCall.name,
+            args: parseJsonArgs(functionCall.arguments)
+          }
+        }
+      ]
+    };
+  }
+  return {
+    role: "function",
+    parts: [
+      {
+        functionResponse: {
+          name: message.name,
+          response: {
+            name: message.name,
+            content: parseJsonSafely(message.content)
+          }
+        }
+      }
+    ]
+  };
+}
+__name(processFunctionMessage, "processFunctionMessage");
+function processImageParts(result, images, model) {
+  if (!((model.includes("vision") || model.includes("gemini") || model.includes("gemma")) && !model.includes("gemini-1.0"))) {
+    return;
+  }
+  for (const image of images) {
+    const mineType = image.split(";")?.[0]?.split(":")?.[1] ?? "image/jpeg";
+    const data = image.replace(/^data:image\/\w+;base64,/, "");
+    result.parts.push({
+      inline_data: { data, mime_type: mineType }
+    });
+  }
+  result.parts = result.parts.filter((uncheckedPart) => {
+    const part = partAsTypeCheck(
+      uncheckedPart,
+      (part2) => part2["text"] != null
+    );
+    return part == null || part.text.length > 0;
+  });
+}
+__name(processImageParts, "processImageParts");
+async function processGeminiImageContent(plugin, part) {
+  let url;
+  try {
+    url = await (0, import_v1_shared_adapter.fetchImageUrl)(plugin, part);
+  } catch (e) {
+    url = typeof part.image_url === "string" ? part.image_url : part.image_url.url;
+    logger.warn(`Failed to fetch image url: ${url}`, e);
+  }
+  const mineType = url.match(/^data:([^;]+);base64,/)?.[1] ?? "image/jpeg";
+  const data = url.replace(/^data:image\/\w+;base64,/, "");
+  return {
+    inline_data: { data, mime_type: mineType }
+  };
+}
+__name(processGeminiImageContent, "processGeminiImageContent");
+async function processGeminiContentParts(plugin, content) {
+  return Promise.all(
+    content.map(async (part) => {
+      if ((0, import_string.isMessageContentText)(part)) {
+        return { text: part.text };
+      }
+      if ((0, import_string.isMessageContentImageUrl)(part)) {
+        return await processGeminiImageContent(plugin, part);
+      }
+      return part;
+    })
+  );
+}
+__name(processGeminiContentParts, "processGeminiContentParts");
 function partAsType(part) {
   return part;
 }
@@ -265,7 +295,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
 }
 __name(formatToolsToGeminiAITools, "formatToolsToGeminiAITools");
 function formatToolToGeminiAITool(tool) {
-  const parameters = removeAdditionalProperties(
+  const parameters = (0, import_v1_shared_adapter.removeAdditionalProperties)(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (0, import_zod_to_json_schema.zodToJsonSchema)(tool.schema, {
       allowedAdditionalProperties: void 0
@@ -279,28 +309,6 @@ function formatToolToGeminiAITool(tool) {
   };
 }
 __name(formatToolToGeminiAITool, "formatToolToGeminiAITool");
-function removeAdditionalProperties(schema) {
-  if (!schema || typeof schema !== "object") return schema;
-  const stack = [[schema, null]];
-  while (stack.length > 0) {
-    const [current] = stack.pop();
-    if (typeof current !== "object" || current === null) continue;
-    if (Object.hasOwn(current, "additionalProperties")) {
-      delete current["additionalProperties"];
-    }
-    if (Object.hasOwn(current, "$schema")) {
-      delete current["$schema"];
-    }
-    for (const key of Object.keys(current)) {
-      const value = current[key];
-      if (value && typeof value === "object") {
-        stack.push([value, key]);
-      }
-    }
-  }
-  return schema;
-}
-__name(removeAdditionalProperties, "removeAdditionalProperties");
 function messageTypeToGeminiRole(type) {
   switch (type) {
     case "system":
@@ -376,9 +384,10 @@ function createGenerationConfig(params, modelConfig, pluginConfig) {
   };
 }
 __name(createGenerationConfig, "createGenerationConfig");
-async function createChatGenerationParams(params, modelConfig, pluginConfig) {
+async function createChatGenerationParams(params, plugin, modelConfig, pluginConfig) {
   const geminiMessages = await langchainMessageToGeminiMessage(
     params.input,
+    plugin,
     modelConfig.model
   );
   const [systemInstruction, modelMessages] = extractSystemMessages(geminiMessages);
@@ -405,7 +414,7 @@ function isChatResponse(response) {
 __name(isChatResponse, "isChatResponse");
 
 // src/requester.ts
-var import_string = require("koishi-plugin-chatluna/utils/string");
+var import_string2 = require("koishi-plugin-chatluna/utils/string");
 var GeminiRequester = class extends import_api.ModelRequester {
   constructor(ctx, _configPool, _pluginConfig, _plugin) {
     super(ctx, _configPool, _pluginConfig, _plugin);
@@ -437,6 +446,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
         `models/${modelConfig.model}:streamGenerateContent?alt=sse`,
         await createChatGenerationParams(
           params,
+          this._plugin,
           modelConfig,
           this._pluginConfig
         ),
@@ -458,9 +468,10 @@ var GeminiRequester = class extends import_api.ModelRequester {
     const modelConfig = prepareModelConfig(params, this._pluginConfig);
     try {
       const response = await this._post(
-        `models/${modelConfig.model}:generateContent?alt=sse`,
+        `models/${modelConfig.model}:generateContent`,
         await createChatGenerationParams(
           params,
+          this._plugin,
           modelConfig,
           this._pluginConfig
         ),
@@ -726,7 +737,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
           );
           const generationChunk = new import_outputs.ChatGenerationChunk({
             message: messageChunk,
-            text: (0, import_string.getMessageContent)(messageChunk.content) ?? ""
+            text: (0, import_string2.getMessageContent)(messageChunk.content) ?? ""
           });
           yield { type: "generation", generation: generationChunk };
         }

package/lib/index.mjs

@@ -61,97 +61,34 @@ import {
   SystemMessageChunk
 } from "@langchain/core/messages";
 import { zodToJsonSchema } from "zod-to-json-schema";
-async function langchainMessageToGeminiMessage(messages, model) {
-  const mappedMessages = await Promise.all(
-    messages.map(async (rawMessage) => {
-      const role = messageTypeToGeminiRole(rawMessage.getType());
-      if (role === "function" || rawMessage.additional_kwargs?.function_call != null) {
-        return {
-          role: "function",
-          parts: [
-            {
-              functionResponse: rawMessage.additional_kwargs?.function_call != null ? void 0 : {
-                name: rawMessage.name,
-                response: {
-                  name: rawMessage.name,
-                  content: (() => {
-                    try {
-                      const result2 = JSON.parse(
-                        rawMessage.content
-                      );
-                      if (typeof result2 === "string") {
-                        return {
-                          response: result2
-                        };
-                      } else {
-                        return result2;
-                      }
-                    } catch (e) {
-                      return {
-                        response: rawMessage.content
-                      };
-                    }
-                  })()
-                }
-              },
-              functionCall: rawMessage.additional_kwargs?.function_call != null ? {
-                name: rawMessage.additional_kwargs.function_call.name,
-                args: (() => {
-                  try {
-                    const result2 = JSON.parse(
-                      rawMessage.additional_kwargs.function_call.arguments
-                    );
-                    if (typeof result2 === "string") {
-                      return {
-                        input: result2
-                      };
-                    } else {
-                      return result2;
-                    }
-                  } catch (e) {
-                    return {
-                      input: rawMessage.additional_kwargs.function_call.arguments
-                    };
-                  }
-                })()
-              } : void 0
-            }
-          ]
-        };
+import {
+  fetchImageUrl,
+  removeAdditionalProperties
+} from "@chatluna/v1-shared-adapter";
+import {
+  isMessageContentImageUrl,
+  isMessageContentText
+} from "koishi-plugin-chatluna/utils/string";
+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;
+      if (role === "function" || hasFunctionCall) {
+        return processFunctionMessage(message);
       }
-      const images = rawMessage.additional_kwargs.images;
       const result = {
         role,
-        parts: [
-          {
-            text: rawMessage.content
-          }
-        ]
+        parts: []
       };
-      if ((model.includes("vision") || model.includes("gemini") || model.includes("gemma")) && images != null && !model.includes("gemini-1.0")) {
-        for (const image of images) {
-          const mineType = image.split(";")?.[0]?.split(":")?.[1];
-          const data = image.replace(/^data:image\/\w+;base64,/, "");
-          result.parts.push({
-            inline_data: {
-              // base64 image match type
-              data,
-              mime_type: mineType ?? "image/jpeg"
-            }
-          });
-        }
-        result.parts = result.parts.filter((uncheckedPart) => {
-          const part = partAsTypeCheck(
-            uncheckedPart,
-            (part2) => part2["text"] != null
-          );
-          return part == null || part.text.length > 0;
-        });
+      result.parts = typeof message.content === "string" ? [{ text: message.content }] : await processGeminiContentParts(plugin, message.content);
+      const images = message.additional_kwargs.images;
+      if (images) {
+        processImageParts(result, images, model);
       }
       return result;
     })
   );
-  return mappedMessages;
 }
 __name(langchainMessageToGeminiMessage, "langchainMessageToGeminiMessage");
 function extractSystemMessages(messages) {
@@ -184,6 +121,105 @@ 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);
+    return typeof result === "string" ? { input: result } : result;
+  } catch {
+    return { input: args };
+  }
+}
+__name(parseJsonArgs, "parseJsonArgs");
+function processFunctionMessage(message) {
+  const hasFunctionCall = message.additional_kwargs?.function_call != null;
+  if (hasFunctionCall) {
+    const functionCall = message.additional_kwargs.function_call;
+    return {
+      role: "function",
+      parts: [
+        {
+          functionCall: {
+            name: functionCall.name,
+            args: parseJsonArgs(functionCall.arguments)
+          }
+        }
+      ]
+    };
+  }
+  return {
+    role: "function",
+    parts: [
+      {
+        functionResponse: {
+          name: message.name,
+          response: {
+            name: message.name,
+            content: parseJsonSafely(message.content)
+          }
+        }
+      }
+    ]
+  };
+}
+__name(processFunctionMessage, "processFunctionMessage");
+function processImageParts(result, images, model) {
+  if (!((model.includes("vision") || model.includes("gemini") || model.includes("gemma")) && !model.includes("gemini-1.0"))) {
+    return;
+  }
+  for (const image of images) {
+    const mineType = image.split(";")?.[0]?.split(":")?.[1] ?? "image/jpeg";
+    const data = image.replace(/^data:image\/\w+;base64,/, "");
+    result.parts.push({
+      inline_data: { data, mime_type: mineType }
+    });
+  }
+  result.parts = result.parts.filter((uncheckedPart) => {
+    const part = partAsTypeCheck(
+      uncheckedPart,
+      (part2) => part2["text"] != null
+    );
+    return part == null || part.text.length > 0;
+  });
+}
+__name(processImageParts, "processImageParts");
+async function processGeminiImageContent(plugin, part) {
+  let url;
+  try {
+    url = await fetchImageUrl(plugin, part);
+  } catch (e) {
+    url = typeof part.image_url === "string" ? part.image_url : part.image_url.url;
+    logger.warn(`Failed to fetch image url: ${url}`, e);
+  }
+  const mineType = url.match(/^data:([^;]+);base64,/)?.[1] ?? "image/jpeg";
+  const data = url.replace(/^data:image\/\w+;base64,/, "");
+  return {
+    inline_data: { data, mime_type: mineType }
+  };
+}
+__name(processGeminiImageContent, "processGeminiImageContent");
+async function processGeminiContentParts(plugin, content) {
+  return Promise.all(
+    content.map(async (part) => {
+      if (isMessageContentText(part)) {
+        return { text: part.text };
+      }
+      if (isMessageContentImageUrl(part)) {
+        return await processGeminiImageContent(plugin, part);
+      }
+      return part;
+    })
+  );
+}
+__name(processGeminiContentParts, "processGeminiContentParts");
 function partAsType(part) {
   return part;
 }
@@ -275,28 +311,6 @@ function formatToolToGeminiAITool(tool) {
   };
 }
 __name(formatToolToGeminiAITool, "formatToolToGeminiAITool");
-function removeAdditionalProperties(schema) {
-  if (!schema || typeof schema !== "object") return schema;
-  const stack = [[schema, null]];
-  while (stack.length > 0) {
-    const [current] = stack.pop();
-    if (typeof current !== "object" || current === null) continue;
-    if (Object.hasOwn(current, "additionalProperties")) {
-      delete current["additionalProperties"];
-    }
-    if (Object.hasOwn(current, "$schema")) {
-      delete current["$schema"];
-    }
-    for (const key of Object.keys(current)) {
-      const value = current[key];
-      if (value && typeof value === "object") {
-        stack.push([value, key]);
-      }
-    }
-  }
-  return schema;
-}
-__name(removeAdditionalProperties, "removeAdditionalProperties");
 function messageTypeToGeminiRole(type) {
   switch (type) {
     case "system":
@@ -372,9 +386,10 @@ function createGenerationConfig(params, modelConfig, pluginConfig) {
   };
 }
 __name(createGenerationConfig, "createGenerationConfig");
-async function createChatGenerationParams(params, modelConfig, pluginConfig) {
+async function createChatGenerationParams(params, plugin, modelConfig, pluginConfig) {
   const geminiMessages = await langchainMessageToGeminiMessage(
     params.input,
+    plugin,
     modelConfig.model
   );
   const [systemInstruction, modelMessages] = extractSystemMessages(geminiMessages);
@@ -433,6 +448,7 @@ var GeminiRequester = class extends ModelRequester {
         `models/${modelConfig.model}:streamGenerateContent?alt=sse`,
         await createChatGenerationParams(
           params,
+          this._plugin,
           modelConfig,
           this._pluginConfig
         ),
@@ -454,9 +470,10 @@ var GeminiRequester = class extends ModelRequester {
     const modelConfig = prepareModelConfig(params, this._pluginConfig);
     try {
       const response = await this._post(
-        `models/${modelConfig.model}:generateContent?alt=sse`,
+        `models/${modelConfig.model}:generateContent`,
         await createChatGenerationParams(
           params,
+          this._plugin,
           modelConfig,
           this._pluginConfig
         ),

package/lib/utils.d.ts

@@ -3,7 +3,8 @@ import { StructuredTool } from '@langchain/core/tools';
 import { ChatCompletionFunction, ChatCompletionResponseMessage, ChatCompletionResponseMessageRoleEnum, ChatPart, ChatResponse } from './types';
 import { Config } from '.';
 import { ModelRequestParams } from 'koishi-plugin-chatluna/llm-core/platform/api';
-export declare function langchainMessageToGeminiMessage(messages: BaseMessage[], model?: string): Promise<ChatCompletionResponseMessage[]>;
+import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
+export declare function langchainMessageToGeminiMessage(messages: BaseMessage[], plugin: ChatLunaPlugin, model?: string): Promise<ChatCompletionResponseMessage[]>;
 export declare function extractSystemMessages(messages: ChatCompletionResponseMessage[]): [ChatCompletionResponseMessage, ChatCompletionResponseMessage[]];
 export declare function partAsType<T extends ChatPart>(part: ChatPart): T;
 export declare function partAsTypeCheck<T extends ChatPart>(part: ChatPart, check: (part: ChatPart & unknown) => boolean): T | undefined;
@@ -31,7 +32,7 @@ export declare function createGenerationConfig(params: ModelRequestParams, model
         includeThoughts: boolean;
     };
 };
-export declare function createChatGenerationParams(params: ModelRequestParams, modelConfig: ReturnType<typeof prepareModelConfig>, pluginConfig: Config): Promise<{
+export declare function createChatGenerationParams(params: ModelRequestParams, plugin: ChatLunaPlugin, modelConfig: ReturnType<typeof prepareModelConfig>, pluginConfig: Config): Promise<{
     contents: ChatCompletionResponseMessage[];
     safetySettings: {
         category: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -62,7 +62,7 @@
     "adapter"
   ],
   "dependencies": {
-    "@chatluna/v1-shared-adapter": "^1.0.4",
+    "@chatluna/v1-shared-adapter": "^1.0.5",
     "@langchain/core": "^0.3.43",
     "zod": "^3.25.0-canary.20250211T214501",
     "zod-to-json-schema": "^3.24.5"
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.16"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.17"
   },
   "koishi": {
     "description": {