@langchain/google-genai 0.0.24 → 0.0.26

package/dist/chat_models.cjs

@@ -191,6 +191,7 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
                 temperature: this.temperature,
                 topP: this.topP,
                 topK: this.topK,
+                ...(fields?.json ? { responseMimeType: "application/json" } : {}),
             },
         }, {
             apiVersion: fields?.apiVersion,
@@ -328,7 +329,7 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
     async completionWithRetry(request, options) {
         return this.caller.callWithOptions({ signal: options?.signal }, async () => {
             try {
-                return this.client.generateContent(request);
+                return await this.client.generateContent(request);
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
             }
             catch (e) {

package/dist/chat_models.d.ts

@@ -1,18 +1,18 @@
-import { FunctionDeclarationsTool as GoogleGenerativeAIFunctionDeclarationsTool, GenerateContentRequest, SafetySetting, Part as GenerativeAIPart } from "@google/generative-ai";
+import { GenerateContentRequest, SafetySetting, Part as GenerativeAIPart } from "@google/generative-ai";
 import { CallbackManagerForLLMRun } from "@langchain/core/callbacks/manager";
 import { AIMessageChunk, BaseMessage } from "@langchain/core/messages";
 import { ChatGenerationChunk, ChatResult } from "@langchain/core/outputs";
 import { BaseChatModel, type BaseChatModelCallOptions, type LangSmithParams, type BaseChatModelParams } from "@langchain/core/language_models/chat_models";
-import { BaseLanguageModelInput, StructuredOutputMethodOptions, ToolDefinition } from "@langchain/core/language_models/base";
-import { StructuredToolInterface } from "@langchain/core/tools";
-import { Runnable, RunnableToolLike } from "@langchain/core/runnables";
+import { BaseLanguageModelInput, StructuredOutputMethodOptions } from "@langchain/core/language_models/base";
+import { Runnable } from "@langchain/core/runnables";
 import type { z } from "zod";
+import { GoogleGenerativeAIToolType } from "./types.js";
 export type BaseMessageExamplePair = {
     input: BaseMessage;
     output: BaseMessage;
 };
 export interface GoogleGenerativeAIChatCallOptions extends BaseChatModelCallOptions {
-    tools?: StructuredToolInterface[] | GoogleGenerativeAIFunctionDeclarationsTool[];
+    tools?: GoogleGenerativeAIToolType[];
     /**
      * Whether or not to include usage data, like token counts
      * in the streamed response chunks.
@@ -25,6 +25,8 @@ export interface GoogleGenerativeAIChatCallOptions extends BaseChatModelCallOpti
  */
 export interface GoogleGenerativeAIChatInput extends BaseChatModelParams, Pick<GoogleGenerativeAIChatCallOptions, "streamUsage"> {
     /**
+     * @deprecated Use "model" instead.
+     *
      * Model Name to use
      *
      * Alias for `model`
@@ -107,6 +109,12 @@ export interface GoogleGenerativeAIChatInput extends BaseChatModelParams, Pick<G
     baseUrl?: string;
     /** Whether to stream the results or not */
     streaming?: boolean;
+    /**
+     * Whether or not to force the model to respond with JSON.
+     * Available for `gemini-1.5` models and later.
+     * @default false
+     */
+    json?: boolean;
 }
 /**
  * A class that wraps the Google Palm chat model.
@@ -164,7 +172,7 @@ export declare class ChatGoogleGenerativeAI extends BaseChatModel<GoogleGenerati
     getLsParams(options: this["ParsedCallOptions"]): LangSmithParams;
     _combineLLMOutput(): never[];
     _llmType(): string;
-    bindTools(tools: (StructuredToolInterface | Record<string, unknown> | ToolDefinition | RunnableToolLike)[], kwargs?: Partial<GoogleGenerativeAIChatCallOptions>): Runnable<BaseLanguageModelInput, AIMessageChunk, GoogleGenerativeAIChatCallOptions>;
+    bindTools(tools: GoogleGenerativeAIToolType[], 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/chat_models.js

@@ -188,6 +188,7 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
                 temperature: this.temperature,
                 topP: this.topP,
                 topK: this.topK,
+                ...(fields?.json ? { responseMimeType: "application/json" } : {}),
             },
         }, {
             apiVersion: fields?.apiVersion,
@@ -325,7 +326,7 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
     async completionWithRetry(request, options) {
         return this.caller.callWithOptions({ signal: options?.signal }, async () => {
             try {
-                return this.client.generateContent(request);
+                return await this.client.generateContent(request);
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
             }
             catch (e) {

package/dist/types.cjs

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types.d.ts

@@ -0,0 +1,3 @@
+import { FunctionDeclarationsTool as GoogleGenerativeAIFunctionDeclarationsTool } from "@google/generative-ai";
+import { BindToolsInput } from "@langchain/core/language_models/chat_models";
+export type GoogleGenerativeAIToolType = BindToolsInput | GoogleGenerativeAIFunctionDeclarationsTool;

package/dist/types.js

@@ -0,0 +1 @@
+export {};

package/dist/utils/common.cjs

@@ -246,31 +246,30 @@ function convertResponseContentToChatGenerationChunk(response, extra) {
     });
 }
 exports.convertResponseContentToChatGenerationChunk = convertResponseContentToChatGenerationChunk;
-function convertToGenerativeAITools(structuredTools) {
-    if (structuredTools.every((tool) => "functionDeclarations" in tool &&
+function convertToGenerativeAITools(tools) {
+    if (tools.every((tool) => "functionDeclarations" in tool &&
         Array.isArray(tool.functionDeclarations))) {
-        return structuredTools;
+        return tools;
     }
     return [
         {
-            functionDeclarations: structuredTools.map((structuredTool) => {
-                if ((0, function_calling_1.isStructuredTool)(structuredTool)) {
-                    const jsonSchema = (0, zod_to_genai_parameters_js_1.zodToGenerativeAIParameters)(structuredTool.schema);
+            functionDeclarations: tools.map((tool) => {
+                if ((0, function_calling_1.isLangChainTool)(tool)) {
+                    const jsonSchema = (0, zod_to_genai_parameters_js_1.zodToGenerativeAIParameters)(tool.schema);
                     return {
-                        name: structuredTool.name,
-                        description: structuredTool.description,
+                        name: tool.name,
+                        description: tool.description,
                         parameters: jsonSchema,
                     };
                 }
-                if ((0, base_1.isOpenAITool)(structuredTool)) {
+                if ((0, base_1.isOpenAITool)(tool)) {
                     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),
+                        name: tool.function.name,
+                        description: tool.function.description ?? `A function available to call.`,
+                        parameters: (0, zod_to_genai_parameters_js_1.jsonSchemaToGeminiParameters)(tool.function.parameters),
                     };
                 }
-                return structuredTool;
+                return tool;
             }),
         },
     ];

package/dist/utils/common.d.ts

@@ -1,9 +1,7 @@
 import { EnhancedGenerateContentResponse, Content, Part, type FunctionDeclarationsTool as GoogleGenerativeAIFunctionDeclarationsTool, POSSIBLE_ROLES } from "@google/generative-ai";
 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";
+import { GoogleGenerativeAIToolType } from "../types.js";
 export declare function getMessageAuthor(message: BaseMessage): string;
 /**
  * Maps a message type to a Google Generative AI chat author.
@@ -21,4 +19,4 @@ export declare function convertResponseContentToChatGenerationChunk(response: En
     usageMetadata?: UsageMetadata | undefined;
     index: number;
 }): ChatGenerationChunk | null;
-export declare function convertToGenerativeAITools(structuredTools: (StructuredToolInterface | Record<string, unknown> | ToolDefinition | RunnableToolLike)[]): GoogleGenerativeAIFunctionDeclarationsTool[];
+export declare function convertToGenerativeAITools(tools: GoogleGenerativeAIToolType[]): GoogleGenerativeAIFunctionDeclarationsTool[];

package/dist/utils/common.js

@@ -1,7 +1,7 @@
 import { AIMessage, AIMessageChunk, ChatMessage, isBaseMessage, } from "@langchain/core/messages";
 import { ChatGenerationChunk, } from "@langchain/core/outputs";
-import { isStructuredTool } from "@langchain/core/utils/function_calling";
-import { isOpenAITool, } from "@langchain/core/language_models/base";
+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";
 export function getMessageAuthor(message) {
     const type = message._getType();
@@ -237,31 +237,30 @@ export function convertResponseContentToChatGenerationChunk(response, extra) {
         generationInfo,
     });
 }
-export function convertToGenerativeAITools(structuredTools) {
-    if (structuredTools.every((tool) => "functionDeclarations" in tool &&
+export function convertToGenerativeAITools(tools) {
+    if (tools.every((tool) => "functionDeclarations" in tool &&
         Array.isArray(tool.functionDeclarations))) {
-        return structuredTools;
+        return tools;
     }
     return [
         {
-            functionDeclarations: structuredTools.map((structuredTool) => {
-                if (isStructuredTool(structuredTool)) {
-                    const jsonSchema = zodToGenerativeAIParameters(structuredTool.schema);
+            functionDeclarations: tools.map((tool) => {
+                if (isLangChainTool(tool)) {
+                    const jsonSchema = zodToGenerativeAIParameters(tool.schema);
                     return {
-                        name: structuredTool.name,
-                        description: structuredTool.description,
+                        name: tool.name,
+                        description: tool.description,
                         parameters: jsonSchema,
                     };
                 }
-                if (isOpenAITool(structuredTool)) {
+                if (isOpenAITool(tool)) {
                     return {
-                        name: structuredTool.function.name,
-                        description: structuredTool.function.description ??
-                            `A function available to call.`,
-                        parameters: jsonSchemaToGeminiParameters(structuredTool.function.parameters),
+                        name: tool.function.name,
+                        description: tool.function.description ?? `A function available to call.`,
+                        parameters: jsonSchemaToGeminiParameters(tool.function.parameters),
                     };
                 }
-                return structuredTool;
+                return tool;
             }),
         },
     ];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@langchain/google-genai",
-  "version": "0.0.24",
-  "description": "Sample integration for LangChain.js",
+  "version": "0.0.26",
+  "description": "Google Generative AI integration for LangChain.js",
   "type": "module",
   "engines": {
     "node": ">=18"
@@ -36,7 +36,7 @@
   "license": "MIT",
   "dependencies": {
     "@google/generative-ai": "^0.7.0",
-    "@langchain/core": ">=0.2.16 <0.3.0",
+    "@langchain/core": ">=0.2.21 <0.3.0",
     "zod-to-json-schema": "^3.22.4"
   },
   "devDependencies": {
@@ -60,7 +60,7 @@
     "jest": "^29.5.0",
     "jest-environment-node": "^29.6.4",
     "prettier": "^2.8.3",
-    "release-it": "^15.10.1",
+    "release-it": "^17.6.0",
     "rollup": "^4.5.2",
     "ts-jest": "^29.1.0",
     "typescript": "<5.2.0",