@langchain/google-genai 0.2.1 → 0.2.3

package/dist/chat_models.cjs

@@ -756,7 +756,7 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
             let functionName = name ?? "extract";
             let tools;
             if ((0, types_1.isZodSchema)(schema)) {
-                const jsonSchema = (0, zod_to_genai_parameters_js_1.zodToGenerativeAIParameters)(schema);
+                const jsonSchema = (0, zod_to_genai_parameters_js_1.schemaToGenerativeAIParameters)(schema);
                 tools = [
                     {
                         functionDeclarations: [
@@ -806,9 +806,7 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
             });
         }
         else {
-            const jsonSchema = (0, types_1.isZodSchema)(schema)
-                ? (0, zod_to_genai_parameters_js_1.zodToGenerativeAIParameters)(schema)
-                : (0, zod_to_genai_parameters_js_1.removeAdditionalProperties)(schema);
+            const jsonSchema = (0, zod_to_genai_parameters_js_1.schemaToGenerativeAIParameters)(schema);
             llm = this.bind({
                 responseSchema: jsonSchema,
             });

package/dist/chat_models.js

@@ -4,7 +4,7 @@ import { BaseChatModel, } from "@langchain/core/language_models/chat_models";
 import { RunnablePassthrough, RunnableSequence, } from "@langchain/core/runnables";
 import { isZodSchema } from "@langchain/core/utils/types";
 import { JsonOutputParser, } from "@langchain/core/output_parsers";
-import { zodToGenerativeAIParameters, removeAdditionalProperties, } from "./utils/zod_to_genai_parameters.js";
+import { schemaToGenerativeAIParameters, removeAdditionalProperties, } from "./utils/zod_to_genai_parameters.js";
 import { convertBaseMessagesToContent, convertResponseContentToChatGenerationChunk, mapGenerateContentResultToChatResult, } from "./utils/common.js";
 import { GoogleGenerativeAIToolsOutputParser } from "./output_parsers.js";
 import { convertToolsToGenAI } from "./utils/tools.js";
@@ -753,7 +753,7 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
             let functionName = name ?? "extract";
             let tools;
             if (isZodSchema(schema)) {
-                const jsonSchema = zodToGenerativeAIParameters(schema);
+                const jsonSchema = schemaToGenerativeAIParameters(schema);
                 tools = [
                     {
                         functionDeclarations: [
@@ -803,9 +803,7 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
             });
         }
         else {
-            const jsonSchema = isZodSchema(schema)
-                ? zodToGenerativeAIParameters(schema)
-                : removeAdditionalProperties(schema);
+            const jsonSchema = schemaToGenerativeAIParameters(schema);
             llm = this.bind({
                 responseSchema: jsonSchema,
             });

package/dist/utils/common.cjs

@@ -5,6 +5,7 @@ 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 uuid_1 = require("uuid");
 const zod_to_genai_parameters_js_1 = require("./zod_to_genai_parameters.cjs");
 function getMessageAuthor(message) {
     const type = message._getType();
@@ -63,8 +64,23 @@ function messageContentMedia(content) {
     }
     throw new Error("Invalid media content");
 }
-function convertMessageContentToParts(message, isMultimodalModel) {
-    if (typeof message.content === "string" && message.content !== "") {
+function inferToolNameFromPreviousMessages(message, previousMessages) {
+    return previousMessages
+        .map((msg) => {
+        if ((0, messages_1.isAIMessage)(msg)) {
+            return msg.tool_calls ?? [];
+        }
+        return [];
+    })
+        .flat()
+        .find((toolCall) => {
+        return toolCall.id === message.tool_call_id;
+    })?.name;
+}
+function convertMessageContentToParts(message, isMultimodalModel, previousMessages) {
+    if (typeof message.content === "string" &&
+        message.content !== "" &&
+        !(0, messages_1.isToolMessage)(message)) {
         return [{ text: message.content }];
     }
     let functionCalls = [];
@@ -80,12 +96,19 @@ function convertMessageContentToParts(message, isMultimodalModel) {
             },
         }));
     }
-    else if (message.getType() === "tool" && message.name && message.content) {
+    else if ((0, messages_1.isToolMessage)(message) && message.content) {
+        const messageName = message.name ??
+            inferToolNameFromPreviousMessages(message, previousMessages);
+        if (messageName === undefined) {
+            throw new Error(`Google requires a tool name for each tool call response, and we could not infer a called tool name for ToolMessage "${message.id}" from your passed messages. Please populate a "name" field on that ToolMessage explicitly.`);
+        }
         functionResponses = [
             {
                 functionResponse: {
-                    name: message.name,
-                    response: message.content,
+                    name: messageName,
+                    response: typeof message.content === "string"
+                        ? { result: message.content }
+                        : message.content,
                 },
             },
         ];
@@ -181,7 +204,7 @@ function convertBaseMessagesToContent(messages, isMultimodalModel, convertSystem
             prevContent.role === role) {
             throw new Error("Google Generative AI requires alternate messages between authors");
         }
-        const parts = convertMessageContentToParts(message, isMultimodalModel);
+        const parts = convertMessageContentToParts(message, isMultimodalModel, messages.slice(0, index));
         if (acc.mergeWithPreviousContent) {
             const prevContent = acc.content[acc.content.length - 1];
             if (!prevContent) {
@@ -263,10 +286,13 @@ function mapGenerateContentResultToChatResult(response, extra) {
         text,
         message: new messages_1.AIMessage({
             content,
-            tool_calls: functionCalls?.map((fc) => ({
-                ...fc,
-                type: "tool_call",
-            })),
+            tool_calls: functionCalls?.map((fc) => {
+                return {
+                    ...fc,
+                    type: "tool_call",
+                    id: "id" in fc && typeof fc.id === "string" ? fc.id : (0, uuid_1.v4)(),
+                };
+            }),
             additional_kwargs: {
                 ...generationInfo,
             },
@@ -336,6 +362,7 @@ function convertResponseContentToChatGenerationChunk(response, extra) {
             args: JSON.stringify(fc.args),
             index: extra.index,
             type: "tool_call_chunk",
+            id: "id" in fc && typeof fc.id === "string" ? fc.id : (0, uuid_1.v4)(),
         })));
     }
     return new outputs_1.ChatGenerationChunk({
@@ -362,7 +389,15 @@ function convertToGenerativeAITools(tools) {
         {
             functionDeclarations: tools.map((tool) => {
                 if ((0, function_calling_1.isLangChainTool)(tool)) {
-                    const jsonSchema = (0, zod_to_genai_parameters_js_1.zodToGenerativeAIParameters)(tool.schema);
+                    const jsonSchema = (0, zod_to_genai_parameters_js_1.schemaToGenerativeAIParameters)(tool.schema);
+                    if (jsonSchema.type === "object" &&
+                        "properties" in jsonSchema &&
+                        Object.keys(jsonSchema.properties).length === 0) {
+                        return {
+                            name: tool.name,
+                            description: tool.description,
+                        };
+                    }
                     return {
                         name: tool.name,
                         description: tool.description,

package/dist/utils/common.d.ts

@@ -10,7 +10,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): Part[];
+export declare function convertMessageContentToParts(message: BaseMessage, isMultimodalModel: boolean, previousMessages: BaseMessage[]): Part[];
 export declare function convertBaseMessagesToContent(messages: BaseMessage[], isMultimodalModel: boolean, convertSystemMessageToHumanContent?: boolean): Content[];
 export declare function mapGenerateContentResultToChatResult(response: EnhancedGenerateContentResponse, extra?: {
     usageMetadata: UsageMetadata | undefined;

package/dist/utils/common.js

@@ -1,8 +1,9 @@
-import { AIMessage, AIMessageChunk, ChatMessage, isBaseMessage, } from "@langchain/core/messages";
+import { AIMessage, AIMessageChunk, ChatMessage, isAIMessage, isBaseMessage, isToolMessage, } from "@langchain/core/messages";
 import { ChatGenerationChunk, } from "@langchain/core/outputs";
 import { isLangChainTool } from "@langchain/core/utils/function_calling";
 import { isOpenAITool } from "@langchain/core/language_models/base";
-import { jsonSchemaToGeminiParameters, zodToGenerativeAIParameters, } from "./zod_to_genai_parameters.js";
+import { v4 as uuidv4 } from "uuid";
+import { jsonSchemaToGeminiParameters, schemaToGenerativeAIParameters, } from "./zod_to_genai_parameters.js";
 export function getMessageAuthor(message) {
     const type = message._getType();
     if (ChatMessage.isInstance(message)) {
@@ -58,8 +59,23 @@ function messageContentMedia(content) {
     }
     throw new Error("Invalid media content");
 }
-export function convertMessageContentToParts(message, isMultimodalModel) {
-    if (typeof message.content === "string" && message.content !== "") {
+function inferToolNameFromPreviousMessages(message, previousMessages) {
+    return previousMessages
+        .map((msg) => {
+        if (isAIMessage(msg)) {
+            return msg.tool_calls ?? [];
+        }
+        return [];
+    })
+        .flat()
+        .find((toolCall) => {
+        return toolCall.id === message.tool_call_id;
+    })?.name;
+}
+export function convertMessageContentToParts(message, isMultimodalModel, previousMessages) {
+    if (typeof message.content === "string" &&
+        message.content !== "" &&
+        !isToolMessage(message)) {
         return [{ text: message.content }];
     }
     let functionCalls = [];
@@ -75,12 +91,19 @@ export function convertMessageContentToParts(message, isMultimodalModel) {
             },
         }));
     }
-    else if (message.getType() === "tool" && message.name && message.content) {
+    else if (isToolMessage(message) && message.content) {
+        const messageName = message.name ??
+            inferToolNameFromPreviousMessages(message, previousMessages);
+        if (messageName === undefined) {
+            throw new Error(`Google requires a tool name for each tool call response, and we could not infer a called tool name for ToolMessage "${message.id}" from your passed messages. Please populate a "name" field on that ToolMessage explicitly.`);
+        }
         functionResponses = [
             {
                 functionResponse: {
-                    name: message.name,
-                    response: message.content,
+                    name: messageName,
+                    response: typeof message.content === "string"
+                        ? { result: message.content }
+                        : message.content,
                 },
             },
         ];
@@ -175,7 +198,7 @@ export function convertBaseMessagesToContent(messages, isMultimodalModel, conver
             prevContent.role === role) {
             throw new Error("Google Generative AI requires alternate messages between authors");
         }
-        const parts = convertMessageContentToParts(message, isMultimodalModel);
+        const parts = convertMessageContentToParts(message, isMultimodalModel, messages.slice(0, index));
         if (acc.mergeWithPreviousContent) {
             const prevContent = acc.content[acc.content.length - 1];
             if (!prevContent) {
@@ -256,10 +279,13 @@ export function mapGenerateContentResultToChatResult(response, extra) {
         text,
         message: new AIMessage({
             content,
-            tool_calls: functionCalls?.map((fc) => ({
-                ...fc,
-                type: "tool_call",
-            })),
+            tool_calls: functionCalls?.map((fc) => {
+                return {
+                    ...fc,
+                    type: "tool_call",
+                    id: "id" in fc && typeof fc.id === "string" ? fc.id : uuidv4(),
+                };
+            }),
             additional_kwargs: {
                 ...generationInfo,
             },
@@ -328,6 +354,7 @@ export function convertResponseContentToChatGenerationChunk(response, extra) {
             args: JSON.stringify(fc.args),
             index: extra.index,
             type: "tool_call_chunk",
+            id: "id" in fc && typeof fc.id === "string" ? fc.id : uuidv4(),
         })));
     }
     return new ChatGenerationChunk({
@@ -353,7 +380,15 @@ export function convertToGenerativeAITools(tools) {
         {
             functionDeclarations: tools.map((tool) => {
                 if (isLangChainTool(tool)) {
-                    const jsonSchema = zodToGenerativeAIParameters(tool.schema);
+                    const jsonSchema = schemaToGenerativeAIParameters(tool.schema);
+                    if (jsonSchema.type === "object" &&
+                        "properties" in jsonSchema &&
+                        Object.keys(jsonSchema.properties).length === 0) {
+                        return {
+                            name: tool.name,
+                            description: tool.description,
+                        };
+                    }
                     return {
                         name: tool.name,
                         description: tool.description,

package/dist/utils/zod_to_genai_parameters.cjs

@@ -1,7 +1,8 @@
 "use strict";
 /* eslint-disable @typescript-eslint/no-unused-vars */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsonSchemaToGeminiParameters = exports.zodToGenerativeAIParameters = exports.removeAdditionalProperties = void 0;
+exports.jsonSchemaToGeminiParameters = exports.schemaToGenerativeAIParameters = exports.removeAdditionalProperties = void 0;
+const types_1 = require("@langchain/core/utils/types");
 const zod_to_json_schema_1 = require("zod-to-json-schema");
 function removeAdditionalProperties(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -32,16 +33,14 @@ obj) {
     return obj;
 }
 exports.removeAdditionalProperties = removeAdditionalProperties;
-function zodToGenerativeAIParameters(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-zodObj) {
+function schemaToGenerativeAIParameters(schema) {
     // GenerativeAI doesn't accept either the $schema or additionalProperties
     // attributes, so we need to explicitly remove them.
-    const jsonSchema = removeAdditionalProperties((0, zod_to_json_schema_1.zodToJsonSchema)(zodObj));
+    const jsonSchema = removeAdditionalProperties((0, types_1.isZodSchema)(schema) ? (0, zod_to_json_schema_1.zodToJsonSchema)(schema) : schema);
     const { $schema, ...rest } = jsonSchema;
     return rest;
 }
-exports.zodToGenerativeAIParameters = zodToGenerativeAIParameters;
+exports.schemaToGenerativeAIParameters = schemaToGenerativeAIParameters;
 function jsonSchemaToGeminiParameters(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 schema) {

package/dist/utils/zod_to_genai_parameters.d.ts

@@ -1,5 +1,6 @@
 import type { z } from "zod";
 import { type FunctionDeclarationSchema as GenerativeAIFunctionDeclarationSchema, type SchemaType as FunctionDeclarationSchemaType } from "@google/generative-ai";
+import { type JsonSchema7Type } from "zod-to-json-schema";
 export interface GenerativeAIJsonSchema extends Record<string, unknown> {
     properties?: Record<string, GenerativeAIJsonSchema>;
     type: FunctionDeclarationSchemaType;
@@ -9,5 +10,5 @@ export interface GenerativeAIJsonSchemaDirty extends GenerativeAIJsonSchema {
     additionalProperties?: boolean;
 }
 export declare function removeAdditionalProperties(obj: Record<string, any>): GenerativeAIJsonSchema;
-export declare function zodToGenerativeAIParameters(zodObj: z.ZodType<any>): GenerativeAIFunctionDeclarationSchema;
+export declare function schemaToGenerativeAIParameters<RunOutput extends Record<string, any> = Record<string, any>>(schema: z.ZodType<RunOutput> | z.ZodEffects<z.ZodType<RunOutput>> | JsonSchema7Type): GenerativeAIFunctionDeclarationSchema;
 export declare function jsonSchemaToGeminiParameters(schema: Record<string, any>): GenerativeAIFunctionDeclarationSchema;

package/dist/utils/zod_to_genai_parameters.js

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
+import { isZodSchema } from "@langchain/core/utils/types";
 import { zodToJsonSchema } from "zod-to-json-schema";
 export function removeAdditionalProperties(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -28,12 +29,10 @@ obj) {
     }
     return obj;
 }
-export function zodToGenerativeAIParameters(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-zodObj) {
+export function schemaToGenerativeAIParameters(schema) {
     // GenerativeAI doesn't accept either the $schema or additionalProperties
     // attributes, so we need to explicitly remove them.
-    const jsonSchema = removeAdditionalProperties(zodToJsonSchema(zodObj));
+    const jsonSchema = removeAdditionalProperties(isZodSchema(schema) ? zodToJsonSchema(schema) : schema);
     const { $schema, ...rest } = jsonSchema;
     return rest;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-genai",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Google Generative AI integration for LangChain.js",
   "type": "module",
   "engines": {
@@ -36,6 +36,7 @@
   "license": "MIT",
   "dependencies": {
     "@google/generative-ai": "^0.24.0",
+    "uuid": "^11.1.0",
     "zod-to-json-schema": "^3.22.4"
   },
   "peerDependencies": {
@@ -43,7 +44,7 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
-    "@langchain/core": "workspace:*",
+    "@langchain/core": "0.3.44",
     "@langchain/scripts": ">=0.1.0 <0.2.0",
     "@langchain/standard-tests": "0.0.0",
     "@swc/core": "^1.3.90",
@@ -91,4 +92,4 @@
     "index.d.ts",
     "index.d.cts"
   ]
-}
+}