Fix for multiple function tools

langchain-ai · Dec 14, 2024 · 9756085 · 9756085
1 parent 8b6ddc7
commit 9756085
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 30 deletions.
diff --git a/libs/langchain-google-common/src/utils/common.ts b/libs/langchain-google-common/src/utils/common.ts
@@ -63,37 +63,42 @@ function processToolChoice(
 
 export function convertToGeminiTools(tools: GoogleAIToolType[]): GeminiTool[] {
   const geminiTools: GeminiTool[] = [];
+  let functionDeclarationsIndex = -1;
   tools.forEach((tool) => {
-    if (
-      "functionDeclarations" in tool &&
-      Array.isArray(tool.functionDeclarations)
-    ) {
-      const funcs: GeminiFunctionDeclaration[] = tool.functionDeclarations;
-      geminiTools.push({ functionDeclarations: [...funcs] });
-    } else if (isLangChainTool(tool)) {
-      const jsonSchema = zodToGeminiParameters(tool.schema);
-      geminiTools.push({
-        functionDeclarations: [
-          {
-            name: tool.name,
-            description: tool.description ?? `A function available to call.`,
-            parameters: jsonSchema as GeminiFunctionSchema,
-          },
-        ],
-      });
-    } else if (isOpenAITool(tool)) {
-      geminiTools.push({
-        functionDeclarations: [
-          {
-            name: tool.function.name,
-            description:
-              tool.function.description ?? `A function available to call.`,
-            parameters: jsonSchemaToGeminiParameters(tool.function.parameters),
-          },
-        ],
-      });
-    } else if ("googleSearchRetrieval" in tool || "retrieval" in tool) {
+    if ("googleSearchRetrieval" in tool || "retrieval" in tool) {
       geminiTools.push(tool);
+    } else {
+      if (functionDeclarationsIndex === -1) {
+        geminiTools.push({
+          functionDeclarations: [],
+        });
+        functionDeclarationsIndex = geminiTools.length - 1;
+      }
+      if (
+        "functionDeclarations" in tool &&
+        Array.isArray(tool.functionDeclarations)
+      ) {
+        const funcs: GeminiFunctionDeclaration[] = tool.functionDeclarations;
+        geminiTools[functionDeclarationsIndex].functionDeclarations!.push(
+          ...funcs
+        );
+      } else if (isLangChainTool(tool)) {
+        const jsonSchema = zodToGeminiParameters(tool.schema);
+        geminiTools[functionDeclarationsIndex].functionDeclarations!.push({
+          name: tool.name,
+          description: tool.description ?? `A function available to call.`,
+          parameters: jsonSchema as GeminiFunctionSchema,
+        });
+      } else if (isOpenAITool(tool)) {
+        geminiTools[functionDeclarationsIndex].functionDeclarations!.push({
+          name: tool.function.name,
+          description:
+            tool.function.description ?? `A function available to call.`,
+          parameters: jsonSchemaToGeminiParameters(tool.function.parameters),
+        });
+      } else {
+        throw new Error(`Received invalid tool: ${JSON.stringify(tool)}`);
+      }
     }
   });
   return geminiTools;

diff --git a/libs/langchain-google-vertexai/src/tests/chat_models.int.test.ts b/libs/langchain-google-vertexai/src/tests/chat_models.int.test.ts
@@ -545,7 +545,7 @@ describe("GAuth Anthropic Chat", () => {
     console.log(aiMessage.lc_kwargs);
   });
 
-  test("stream", async () => {
+  test.only("stream", async () => {
     const model = new ChatVertexAI({
       modelName,
       callbacks,