@langchain/google-genai 0.0.19 → 0.0.21

package/dist/chat_models.d.ts

@@ -3,7 +3,7 @@ import { CallbackManagerForLLMRun } from "@langchain/core/callbacks/manager";
 import { AIMessageChunk, BaseMessage } from "@langchain/core/messages";
 import { ChatGenerationChunk, ChatResult } from "@langchain/core/outputs";
 import { BaseChatModel, LangSmithParams, type BaseChatModelParams } from "@langchain/core/language_models/chat_models";
-import { BaseLanguageModelCallOptions, BaseLanguageModelInput, StructuredOutputMethodOptions } from "@langchain/core/language_models/base";
+import { BaseLanguageModelCallOptions, BaseLanguageModelInput, StructuredOutputMethodOptions, ToolDefinition } from "@langchain/core/language_models/base";
 import { StructuredToolInterface } from "@langchain/core/tools";
 import { Runnable } from "@langchain/core/runnables";
 import type { z } from "zod";
@@ -160,7 +160,7 @@ export declare class ChatGoogleGenerativeAI extends BaseChatModel<GoogleGenerati
     getLsParams(options: this["ParsedCallOptions"]): LangSmithParams;
     _combineLLMOutput(): never[];
     _llmType(): string;
-    bindTools(tools: (StructuredToolInterface | Record<string, unknown>)[], kwargs?: Partial<GoogleGenerativeAIChatCallOptions>): Runnable<BaseLanguageModelInput, AIMessageChunk, GoogleGenerativeAIChatCallOptions>;
+    bindTools(tools: (StructuredToolInterface | Record<string, unknown> | ToolDefinition)[], kwargs?: Partial<GoogleGenerativeAIChatCallOptions>): Runnable<BaseLanguageModelInput, AIMessageChunk, GoogleGenerativeAIChatCallOptions>;
     invocationParams(options?: this["ParsedCallOptions"]): Omit<GenerateContentRequest, "contents">;
     _generate(messages: BaseMessage[], options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): Promise<ChatResult>;
     _streamResponseChunks(messages: BaseMessage[], options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): AsyncGenerator<ChatGenerationChunk>;

package/dist/utils/common.cjs

@@ -4,6 +4,7 @@ exports.convertToGenerativeAITools = exports.convertResponseContentToChatGenerat
 const messages_1 = require("@langchain/core/messages");
 const outputs_1 = require("@langchain/core/outputs");
 const function_calling_1 = require("@langchain/core/utils/function_calling");
+const base_1 = require("@langchain/core/language_models/base");
 const zod_to_genai_parameters_js_1 = require("./zod_to_genai_parameters.cjs");
 function getMessageAuthor(message) {
     const type = message._getType();
@@ -53,84 +54,84 @@ function messageContentMedia(content) {
     }
     throw new Error("Invalid media content");
 }
-function convertMessageContentToParts(message, isMultimodalModel, role) {
-    if (typeof message.content === "string") {
+function convertMessageContentToParts(message, isMultimodalModel) {
+    if (typeof message.content === "string" && message.content !== "") {
         return [{ text: message.content }];
     }
-    let functionCallParts = [];
-    if (role === "function") {
-        if (message.name && typeof message.content === "string") {
-            functionCallParts.push({
+    let functionCalls = [];
+    let functionResponses = [];
+    let messageParts = [];
+    if ("tool_calls" in message &&
+        Array.isArray(message.tool_calls) &&
+        message.tool_calls.length > 0) {
+        functionCalls = message.tool_calls.map((tc) => ({
+            functionCall: {
+                name: tc.name,
+                args: tc.args,
+            },
+        }));
+    }
+    else if (message._getType() === "tool" && message.name && message.content) {
+        functionResponses = [
+            {
                 functionResponse: {
                     name: message.name,
                     response: message.content,
                 },
-            });
-        }
-        else {
-            throw new Error("ChatGoogleGenerativeAI requires tool messages to contain the tool name, and a string content.");
-        }
-    }
-    if ("tool_calls" in message) {
-        const castMessage = message;
-        if (castMessage.tool_calls && castMessage.tool_calls.length > 0) {
-            functionCallParts = castMessage.tool_calls.map((tc) => ({
-                functionCall: {
-                    name: tc.name,
-                    args: tc.args,
-                },
-            }));
-        }
+            },
+        ];
     }
-    const messageContentParts = message.content.map((c) => {
-        if (c.type === "text") {
-            return {
-                text: c.text,
-            };
-        }
-        if (c.type === "image_url") {
-            if (!isMultimodalModel) {
-                throw new Error(`This model does not support images`);
-            }
-            let source;
-            if (typeof c.image_url === "string") {
-                source = c.image_url;
-            }
-            else if (typeof c.image_url === "object" && "url" in c.image_url) {
-                source = c.image_url.url;
+    else if (Array.isArray(message.content)) {
+        messageParts = message.content.map((c) => {
+            if (c.type === "text") {
+                return {
+                    text: c.text,
+                };
             }
-            else {
-                throw new Error("Please provide image as base64 encoded data URL");
+            if (c.type === "image_url") {
+                if (!isMultimodalModel) {
+                    throw new Error(`This model does not support images`);
+                }
+                let source;
+                if (typeof c.image_url === "string") {
+                    source = c.image_url;
+                }
+                else if (typeof c.image_url === "object" && "url" in c.image_url) {
+                    source = c.image_url.url;
+                }
+                else {
+                    throw new Error("Please provide image as base64 encoded data URL");
+                }
+                const [dm, data] = source.split(",");
+                if (!dm.startsWith("data:")) {
+                    throw new Error("Please provide image as base64 encoded data URL");
+                }
+                const [mimeType, encoding] = dm.replace(/^data:/, "").split(";");
+                if (encoding !== "base64") {
+                    throw new Error("Please provide image as base64 encoded data URL");
+                }
+                return {
+                    inlineData: {
+                        data,
+                        mimeType,
+                    },
+                };
             }
-            const [dm, data] = source.split(",");
-            if (!dm.startsWith("data:")) {
-                throw new Error("Please provide image as base64 encoded data URL");
+            else if (c.type === "media") {
+                return messageContentMedia(c);
             }
-            const [mimeType, encoding] = dm.replace(/^data:/, "").split(";");
-            if (encoding !== "base64") {
-                throw new Error("Please provide image as base64 encoded data URL");
+            else if (c.type === "tool_use") {
+                return {
+                    functionCall: {
+                        name: c.name,
+                        args: c.input,
+                    },
+                };
             }
-            return {
-                inlineData: {
-                    data,
-                    mimeType,
-                },
-            };
-        }
-        else if (c.type === "media") {
-            return messageContentMedia(c);
-        }
-        else if (c.type === "tool_use") {
-            return {
-                functionCall: {
-                    name: c.name,
-                    args: c.input,
-                },
-            };
-        }
-        throw new Error(`Unknown content type ${c.type}`);
-    });
-    return [...messageContentParts, ...functionCallParts];
+            throw new Error(`Unknown content type ${c.type}`);
+        });
+    }
+    return [...messageParts, ...functionCalls, ...functionResponses];
 }
 exports.convertMessageContentToParts = convertMessageContentToParts;
 function convertBaseMessagesToContent(messages, isMultimodalModel) {
@@ -149,7 +150,7 @@ function convertBaseMessagesToContent(messages, isMultimodalModel) {
             prevContent.role === role) {
             throw new Error("Google Generative AI requires alternate messages between authors");
         }
-        const parts = convertMessageContentToParts(message, isMultimodalModel, role);
+        const parts = convertMessageContentToParts(message, isMultimodalModel);
         if (acc.mergeWithPreviousContent) {
             const prevContent = acc.content[acc.content.length - 1];
             if (!prevContent) {
@@ -257,6 +258,14 @@ function convertToGenerativeAITools(structuredTools) {
                         parameters: jsonSchema,
                     };
                 }
+                if ((0, base_1.isOpenAITool)(structuredTool)) {
+                    return {
+                        name: structuredTool.function.name,
+                        description: structuredTool.function.description ??
+                            `A function available to call.`,
+                        parameters: (0, zod_to_genai_parameters_js_1.jsonSchemaToGeminiParameters)(structuredTool.function.parameters),
+                    };
+                }
                 return structuredTool;
             }),
         },

package/dist/utils/common.d.ts

@@ -2,6 +2,7 @@ import { EnhancedGenerateContentResponse, Content, Part, type FunctionDeclaratio
 import { BaseMessage, UsageMetadata } from "@langchain/core/messages";
 import { ChatGenerationChunk, ChatResult } from "@langchain/core/outputs";
 import { StructuredToolInterface } from "@langchain/core/tools";
+import { ToolDefinition } from "@langchain/core/language_models/base";
 export declare function getMessageAuthor(message: BaseMessage): string;
 /**
  * Maps a message type to a Google Generative AI chat author.
@@ -10,7 +11,7 @@ export declare function getMessageAuthor(message: BaseMessage): string;
  * @returns The message type mapped to a Google Generative AI chat author.
  */
 export declare function convertAuthorToRole(author: string): (typeof POSSIBLE_ROLES)[number];
-export declare function convertMessageContentToParts(message: BaseMessage, isMultimodalModel: boolean, role: (typeof POSSIBLE_ROLES)[number]): Part[];
+export declare function convertMessageContentToParts(message: BaseMessage, isMultimodalModel: boolean): Part[];
 export declare function convertBaseMessagesToContent(messages: BaseMessage[], isMultimodalModel: boolean): Content[];
 export declare function mapGenerateContentResultToChatResult(response: EnhancedGenerateContentResponse, extra?: {
     usageMetadata: UsageMetadata | undefined;
@@ -19,4 +20,4 @@ export declare function convertResponseContentToChatGenerationChunk(response: En
     usageMetadata?: UsageMetadata | undefined;
     index: number;
 }): ChatGenerationChunk | null;
-export declare function convertToGenerativeAITools(structuredTools: (StructuredToolInterface | Record<string, unknown>)[]): GoogleGenerativeAIFunctionDeclarationsTool[];
+export declare function convertToGenerativeAITools(structuredTools: (StructuredToolInterface | Record<string, unknown> | ToolDefinition)[]): GoogleGenerativeAIFunctionDeclarationsTool[];

package/dist/utils/common.js

@@ -1,7 +1,8 @@
 import { AIMessage, AIMessageChunk, ChatMessage, isBaseMessage, } from "@langchain/core/messages";
 import { ChatGenerationChunk, } from "@langchain/core/outputs";
 import { isStructuredTool } from "@langchain/core/utils/function_calling";
-import { zodToGenerativeAIParameters } from "./zod_to_genai_parameters.js";
+import { isOpenAITool, } from "@langchain/core/language_models/base";
+import { jsonSchemaToGeminiParameters, zodToGenerativeAIParameters, } from "./zod_to_genai_parameters.js";
 export function getMessageAuthor(message) {
     const type = message._getType();
     if (ChatMessage.isInstance(message)) {
@@ -48,84 +49,84 @@ function messageContentMedia(content) {
     }
     throw new Error("Invalid media content");
 }
-export function convertMessageContentToParts(message, isMultimodalModel, role) {
-    if (typeof message.content === "string") {
+export function convertMessageContentToParts(message, isMultimodalModel) {
+    if (typeof message.content === "string" && message.content !== "") {
         return [{ text: message.content }];
     }
-    let functionCallParts = [];
-    if (role === "function") {
-        if (message.name && typeof message.content === "string") {
-            functionCallParts.push({
+    let functionCalls = [];
+    let functionResponses = [];
+    let messageParts = [];
+    if ("tool_calls" in message &&
+        Array.isArray(message.tool_calls) &&
+        message.tool_calls.length > 0) {
+        functionCalls = message.tool_calls.map((tc) => ({
+            functionCall: {
+                name: tc.name,
+                args: tc.args,
+            },
+        }));
+    }
+    else if (message._getType() === "tool" && message.name && message.content) {
+        functionResponses = [
+            {
                 functionResponse: {
                     name: message.name,
                     response: message.content,
                 },
-            });
-        }
-        else {
-            throw new Error("ChatGoogleGenerativeAI requires tool messages to contain the tool name, and a string content.");
-        }
-    }
-    if ("tool_calls" in message) {
-        const castMessage = message;
-        if (castMessage.tool_calls && castMessage.tool_calls.length > 0) {
-            functionCallParts = castMessage.tool_calls.map((tc) => ({
-                functionCall: {
-                    name: tc.name,
-                    args: tc.args,
-                },
-            }));
-        }
+            },
+        ];
     }
-    const messageContentParts = message.content.map((c) => {
-        if (c.type === "text") {
-            return {
-                text: c.text,
-            };
-        }
-        if (c.type === "image_url") {
-            if (!isMultimodalModel) {
-                throw new Error(`This model does not support images`);
-            }
-            let source;
-            if (typeof c.image_url === "string") {
-                source = c.image_url;
-            }
-            else if (typeof c.image_url === "object" && "url" in c.image_url) {
-                source = c.image_url.url;
+    else if (Array.isArray(message.content)) {
+        messageParts = message.content.map((c) => {
+            if (c.type === "text") {
+                return {
+                    text: c.text,
+                };
             }
-            else {
-                throw new Error("Please provide image as base64 encoded data URL");
+            if (c.type === "image_url") {
+                if (!isMultimodalModel) {
+                    throw new Error(`This model does not support images`);
+                }
+                let source;
+                if (typeof c.image_url === "string") {
+                    source = c.image_url;
+                }
+                else if (typeof c.image_url === "object" && "url" in c.image_url) {
+                    source = c.image_url.url;
+                }
+                else {
+                    throw new Error("Please provide image as base64 encoded data URL");
+                }
+                const [dm, data] = source.split(",");
+                if (!dm.startsWith("data:")) {
+                    throw new Error("Please provide image as base64 encoded data URL");
+                }
+                const [mimeType, encoding] = dm.replace(/^data:/, "").split(";");
+                if (encoding !== "base64") {
+                    throw new Error("Please provide image as base64 encoded data URL");
+                }
+                return {
+                    inlineData: {
+                        data,
+                        mimeType,
+                    },
+                };
             }
-            const [dm, data] = source.split(",");
-            if (!dm.startsWith("data:")) {
-                throw new Error("Please provide image as base64 encoded data URL");
+            else if (c.type === "media") {
+                return messageContentMedia(c);
             }
-            const [mimeType, encoding] = dm.replace(/^data:/, "").split(";");
-            if (encoding !== "base64") {
-                throw new Error("Please provide image as base64 encoded data URL");
+            else if (c.type === "tool_use") {
+                return {
+                    functionCall: {
+                        name: c.name,
+                        args: c.input,
+                    },
+                };
             }
-            return {
-                inlineData: {
-                    data,
-                    mimeType,
-                },
-            };
-        }
-        else if (c.type === "media") {
-            return messageContentMedia(c);
-        }
-        else if (c.type === "tool_use") {
-            return {
-                functionCall: {
-                    name: c.name,
-                    args: c.input,
-                },
-            };
-        }
-        throw new Error(`Unknown content type ${c.type}`);
-    });
-    return [...messageContentParts, ...functionCallParts];
+            throw new Error(`Unknown content type ${c.type}`);
+        });
+    }
+    return [...messageParts, ...functionCalls, ...functionResponses];
 }
 export function convertBaseMessagesToContent(messages, isMultimodalModel) {
     return messages.reduce((acc, message, index) => {
@@ -143,7 +144,7 @@ export function convertBaseMessagesToContent(messages, isMultimodalModel) {
             prevContent.role === role) {
             throw new Error("Google Generative AI requires alternate messages between authors");
         }
-        const parts = convertMessageContentToParts(message, isMultimodalModel, role);
+        const parts = convertMessageContentToParts(message, isMultimodalModel);
         if (acc.mergeWithPreviousContent) {
             const prevContent = acc.content[acc.content.length - 1];
             if (!prevContent) {
@@ -248,6 +249,14 @@ export function convertToGenerativeAITools(structuredTools) {
                         parameters: jsonSchema,
                     };
                 }
+                if (isOpenAITool(structuredTool)) {
+                    return {
+                        name: structuredTool.function.name,
+                        description: structuredTool.function.description ??
+                            `A function available to call.`,
+                        parameters: jsonSchemaToGeminiParameters(structuredTool.function.parameters),
+                    };
+                }
                 return structuredTool;
             }),
         },

package/dist/utils/zod_to_genai_parameters.cjs

@@ -1,7 +1,7 @@
 "use strict";
 /* eslint-disable @typescript-eslint/no-unused-vars */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zodToGenerativeAIParameters = exports.removeAdditionalProperties = void 0;
+exports.jsonSchemaToGeminiParameters = exports.zodToGenerativeAIParameters = exports.removeAdditionalProperties = void 0;
 const zod_to_json_schema_1 = require("zod-to-json-schema");
 function removeAdditionalProperties(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -37,3 +37,14 @@ zodObj) {
     return rest;
 }
 exports.zodToGenerativeAIParameters = zodToGenerativeAIParameters;
+function jsonSchemaToGeminiParameters(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+schema) {
+    // Gemini doesn't accept either the $schema or additionalProperties
+    // attributes, so we need to explicitly remove them.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const jsonSchema = removeAdditionalProperties(schema);
+    const { $schema, ...rest } = jsonSchema;
+    return rest;
+}
+exports.jsonSchemaToGeminiParameters = jsonSchemaToGeminiParameters;

package/dist/utils/zod_to_genai_parameters.d.ts

@@ -10,3 +10,4 @@ export interface GenerativeAIJsonSchemaDirty extends GenerativeAIJsonSchema {
 }
 export declare function removeAdditionalProperties(obj: Record<string, any>): GenerativeAIJsonSchema;
 export declare function zodToGenerativeAIParameters(zodObj: z.ZodType<any>): GenerativeAIFunctionDeclarationSchema;
+export declare function jsonSchemaToGeminiParameters(schema: Record<string, any>): GenerativeAIFunctionDeclarationSchema;

package/dist/utils/zod_to_genai_parameters.js

@@ -32,3 +32,13 @@ zodObj) {
     const { $schema, ...rest } = jsonSchema;
     return rest;
 }
+export function jsonSchemaToGeminiParameters(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+schema) {
+    // Gemini doesn't accept either the $schema or additionalProperties
+    // attributes, so we need to explicitly remove them.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const jsonSchema = removeAdditionalProperties(schema);
+    const { $schema, ...rest } = jsonSchema;
+    return rest;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-genai",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "Sample integration for LangChain.js",
   "type": "module",
   "engines": {
@@ -36,7 +36,7 @@
   "license": "MIT",
   "dependencies": {
     "@google/generative-ai": "^0.7.0",
-    "@langchain/core": ">=0.2.5 <0.3.0",
+    "@langchain/core": ">=0.2.9 <0.3.0",
     "zod-to-json-schema": "^3.22.4"
   },
   "devDependencies": {