@langchain/google-genai 0.0.20 → 0.0.22

package/dist/chat_models.d.ts

@@ -3,9 +3,9 @@ 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 { Runnable, RunnableToolLike } from "@langchain/core/runnables";
 import type { z } from "zod";
 export type BaseMessageExamplePair = {
     input: BaseMessage;
@@ -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 | RunnableToolLike)[], 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();
@@ -197,7 +198,10 @@ function mapGenerateContentResultToChatResult(response, extra) {
         text,
         message: new messages_1.AIMessage({
             content: text,
-            tool_calls: functionCalls,
+            tool_calls: functionCalls?.map((fc) => ({
+                ...fc,
+                type: "tool_call",
+            })),
             additional_kwargs: {
                 ...generationInfo,
             },
@@ -224,6 +228,7 @@ function convertResponseContentToChatGenerationChunk(response, extra) {
             ...fc,
             args: JSON.stringify(fc.args),
             index: extra.index,
+            type: "tool_call_chunk",
         })));
     }
     return new outputs_1.ChatGenerationChunk({
@@ -257,6 +262,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,8 @@ 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";
+import { RunnableToolLike } from "@langchain/core/runnables";
 export declare function getMessageAuthor(message: BaseMessage): string;
 /**
  * Maps a message type to a Google Generative AI chat author.
@@ -19,4 +21,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 | RunnableToolLike)[]): 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)) {
@@ -190,7 +191,10 @@ export function mapGenerateContentResultToChatResult(response, extra) {
         text,
         message: new AIMessage({
             content: text,
-            tool_calls: functionCalls,
+            tool_calls: functionCalls?.map((fc) => ({
+                ...fc,
+                type: "tool_call",
+            })),
             additional_kwargs: {
                 ...generationInfo,
             },
@@ -216,6 +220,7 @@ export function convertResponseContentToChatGenerationChunk(response, extra) {
             ...fc,
             args: JSON.stringify(fc.args),
             index: extra.index,
+            type: "tool_call_chunk",
         })));
     }
     return new ChatGenerationChunk({
@@ -248,6 +253,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.20",
+  "version": "0.0.22",
   "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.16 <0.3.0",
     "zod-to-json-schema": "^3.22.4"
   },
   "devDependencies": {