@langchain/google-genai 0.1.1 → 0.1.2

package/dist/chat_models.cjs

@@ -525,21 +525,56 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
         return this.bind({ tools: (0, common_js_1.convertToGenerativeAITools)(tools), ...kwargs });
     }
     invocationParams(options) {
-        if (options?.tool_choice) {
-            throw new Error("'tool_choice' call option is not supported by ChatGoogleGenerativeAI.");
-        }
-        const tools = options?.tools;
-        if (Array.isArray(tools) &&
-            !tools.some(
+        let genaiTools;
+        if (Array.isArray(options?.tools) &&
+            !options?.tools.some(
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             (t) => !("lc_namespace" in t))) {
             // Tools are in StructuredToolInterface format. Convert to GenAI format
-            return {
-                tools: (0, common_js_1.convertToGenerativeAITools)(options?.tools),
-            };
+            genaiTools = (0, common_js_1.convertToGenerativeAITools)(options?.tools);
+        }
+        else {
+            genaiTools = options?.tools;
+        }
+        let toolConfig;
+        if (genaiTools?.length && options?.tool_choice) {
+            if (["any", "auto", "none"].some((c) => c === options.tool_choice)) {
+                const modeMap = {
+                    any: generative_ai_1.FunctionCallingMode.ANY,
+                    auto: generative_ai_1.FunctionCallingMode.AUTO,
+                    none: generative_ai_1.FunctionCallingMode.NONE,
+                };
+                toolConfig = {
+                    functionCallingConfig: {
+                        mode: modeMap[options.tool_choice] ??
+                            "MODE_UNSPECIFIED",
+                        allowedFunctionNames: options.allowedFunctionNames,
+                    },
+                };
+            }
+            else if (typeof options.tool_choice === "string") {
+                toolConfig = {
+                    functionCallingConfig: {
+                        mode: generative_ai_1.FunctionCallingMode.ANY,
+                        allowedFunctionNames: [
+                            ...(options.allowedFunctionNames ?? []),
+                            options.tool_choice,
+                        ],
+                    },
+                };
+            }
+            if (!options.tool_choice && options.allowedFunctionNames) {
+                toolConfig = {
+                    functionCallingConfig: {
+                        mode: generative_ai_1.FunctionCallingMode.ANY,
+                        allowedFunctionNames: options.allowedFunctionNames,
+                    },
+                };
+            }
         }
         return {
-            tools: options?.tools,
+            tools: genaiTools,
+            toolConfig,
         };
     }
     async _generate(messages, options, runManager) {

package/dist/chat_models.d.ts

@@ -13,6 +13,11 @@ export type BaseMessageExamplePair = {
 };
 export interface GoogleGenerativeAIChatCallOptions extends BaseChatModelCallOptions {
     tools?: GoogleGenerativeAIToolType[];
+    /**
+     * Allowed functions to call when the mode is "any".
+     * If empty, any one of the provided functions are called.
+     */
+    allowedFunctionNames?: string[];
     /**
      * Whether or not to include usage data, like token counts
      * in the streamed response chunks.

package/dist/chat_models.js

@@ -1,4 +1,4 @@
-import { GoogleGenerativeAI as GenerativeAI, } from "@google/generative-ai";
+import { GoogleGenerativeAI as GenerativeAI, FunctionCallingMode, } from "@google/generative-ai";
 import { getEnvironmentVariable } from "@langchain/core/utils/env";
 import { BaseChatModel, } from "@langchain/core/language_models/chat_models";
 import { RunnablePassthrough, RunnableSequence, } from "@langchain/core/runnables";
@@ -522,21 +522,56 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
         return this.bind({ tools: convertToGenerativeAITools(tools), ...kwargs });
     }
     invocationParams(options) {
-        if (options?.tool_choice) {
-            throw new Error("'tool_choice' call option is not supported by ChatGoogleGenerativeAI.");
-        }
-        const tools = options?.tools;
-        if (Array.isArray(tools) &&
-            !tools.some(
+        let genaiTools;
+        if (Array.isArray(options?.tools) &&
+            !options?.tools.some(
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             (t) => !("lc_namespace" in t))) {
             // Tools are in StructuredToolInterface format. Convert to GenAI format
-            return {
-                tools: convertToGenerativeAITools(options?.tools),
-            };
+            genaiTools = convertToGenerativeAITools(options?.tools);
+        }
+        else {
+            genaiTools = options?.tools;
+        }
+        let toolConfig;
+        if (genaiTools?.length && options?.tool_choice) {
+            if (["any", "auto", "none"].some((c) => c === options.tool_choice)) {
+                const modeMap = {
+                    any: FunctionCallingMode.ANY,
+                    auto: FunctionCallingMode.AUTO,
+                    none: FunctionCallingMode.NONE,
+                };
+                toolConfig = {
+                    functionCallingConfig: {
+                        mode: modeMap[options.tool_choice] ??
+                            "MODE_UNSPECIFIED",
+                        allowedFunctionNames: options.allowedFunctionNames,
+                    },
+                };
+            }
+            else if (typeof options.tool_choice === "string") {
+                toolConfig = {
+                    functionCallingConfig: {
+                        mode: FunctionCallingMode.ANY,
+                        allowedFunctionNames: [
+                            ...(options.allowedFunctionNames ?? []),
+                            options.tool_choice,
+                        ],
+                    },
+                };
+            }
+            if (!options.tool_choice && options.allowedFunctionNames) {
+                toolConfig = {
+                    functionCallingConfig: {
+                        mode: FunctionCallingMode.ANY,
+                        allowedFunctionNames: options.allowedFunctionNames,
+                    },
+                };
+            }
         }
         return {
-            tools: options?.tools,
+            tools: genaiTools,
+            toolConfig,
         };
     }
     async _generate(messages, options, runManager) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-genai",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Google Generative AI integration for LangChain.js",
   "type": "module",
   "engines": {