@langchain/google-common 0.0.22 → 0.0.23

package/dist/chat_models.cjs

@@ -57,10 +57,23 @@ class ChatConnection extends connection_js_1.AbstractGoogleLLMConnection {
         return input
             .map((msg, i) => (0, gemini_js_1.baseMessageToContent)(msg, input[i - 1], this.useSystemInstruction))
             .reduce((acc, cur) => {
-            // Filter out the system content, since those don't belong
-            // in the actual content.
-            const hasNoSystem = cur.every((content) => content.role !== "system");
-            return hasNoSystem ? [...acc, ...cur] : acc;
+            // Filter out the system content
+            if (cur.every((content) => content.role === "system")) {
+                return acc;
+            }
+            // Combine adjacent function messages
+            if (cur[0]?.role === "function" &&
+                acc.length > 0 &&
+                acc[acc.length - 1].role === "function") {
+                acc[acc.length - 1].parts = [
+                    ...acc[acc.length - 1].parts,
+                    ...cur[0].parts,
+                ];
+            }
+            else {
+                acc.push(...cur);
+            }
+            return acc;
         }, []);
     }
     formatSystemInstruction(input, _parameters) {

package/dist/chat_models.d.ts

@@ -3,15 +3,14 @@ import { CallbackManagerForLLMRun } from "@langchain/core/callbacks/manager";
 import { BaseChatModel, LangSmithParams, type BaseChatModelParams } from "@langchain/core/language_models/chat_models";
 import { ChatGenerationChunk, ChatResult } from "@langchain/core/outputs";
 import { AIMessageChunk } from "@langchain/core/messages";
-import { BaseLanguageModelInput, StructuredOutputMethodOptions, ToolDefinition } from "@langchain/core/language_models/base";
+import { BaseLanguageModelInput, StructuredOutputMethodOptions } from "@langchain/core/language_models/base";
 import type { z } from "zod";
-import { Runnable, RunnableToolLike } from "@langchain/core/runnables";
+import { Runnable } from "@langchain/core/runnables";
 import { AsyncCaller } from "@langchain/core/utils/async_caller";
-import { StructuredToolInterface } from "@langchain/core/tools";
 import { GoogleAIBaseLLMInput, GoogleAIModelParams, GoogleAISafetySetting, GoogleConnectionParams, GooglePlatformType, GeminiContent, GoogleAIBaseLanguageModelCallOptions } from "./types.js";
 import { AbstractGoogleLLMConnection } from "./connection.js";
 import { GoogleAbstractedClient } from "./auth.js";
-import type { GoogleBaseLLMInput, GoogleAISafetyHandler, GoogleAISafetyParams } from "./types.js";
+import type { GoogleBaseLLMInput, GoogleAISafetyHandler, GoogleAISafetyParams, GoogleAIToolType } from "./types.js";
 declare class ChatConnection<AuthOptions> extends AbstractGoogleLLMConnection<BaseMessage[], AuthOptions> {
     convertSystemMessageToHumanContent: boolean | undefined;
     constructor(fields: GoogleAIBaseLLMInput<AuthOptions> | undefined, caller: AsyncCaller, client: GoogleAbstractedClient, streaming: boolean);
@@ -56,7 +55,7 @@ export declare abstract class ChatGoogleBase<AuthOptions> extends BaseChatModel<
     buildClient(fields?: GoogleAIBaseLLMInput<AuthOptions>): GoogleAbstractedClient;
     buildConnection(fields: GoogleBaseLLMInput<AuthOptions>, client: GoogleAbstractedClient): void;
     get platform(): GooglePlatformType;
-    bindTools(tools: (StructuredToolInterface | Record<string, unknown> | ToolDefinition | RunnableToolLike)[], kwargs?: Partial<GoogleAIBaseLanguageModelCallOptions>): Runnable<BaseLanguageModelInput, AIMessageChunk, GoogleAIBaseLanguageModelCallOptions>;
+    bindTools(tools: GoogleAIToolType[], kwargs?: Partial<GoogleAIBaseLanguageModelCallOptions>): Runnable<BaseLanguageModelInput, AIMessageChunk, GoogleAIBaseLanguageModelCallOptions>;
     _llmType(): string;
     /**
      * Get the parameters used to invoke the model

package/dist/chat_models.js

@@ -54,10 +54,23 @@ class ChatConnection extends AbstractGoogleLLMConnection {
         return input
             .map((msg, i) => baseMessageToContent(msg, input[i - 1], this.useSystemInstruction))
             .reduce((acc, cur) => {
-            // Filter out the system content, since those don't belong
-            // in the actual content.
-            const hasNoSystem = cur.every((content) => content.role !== "system");
-            return hasNoSystem ? [...acc, ...cur] : acc;
+            // Filter out the system content
+            if (cur.every((content) => content.role === "system")) {
+                return acc;
+            }
+            // Combine adjacent function messages
+            if (cur[0]?.role === "function" &&
+                acc.length > 0 &&
+                acc[acc.length - 1].role === "function") {
+                acc[acc.length - 1].parts = [
+                    ...acc[acc.length - 1].parts,
+                    ...cur[0].parts,
+                ];
+            }
+            else {
+                acc.push(...cur);
+            }
+            return acc;
         }, []);
     }
     formatSystemInstruction(input, _parameters) {

package/dist/connection.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractGoogleLLMConnection = exports.GoogleAIConnection = exports.GoogleHostConnection = exports.GoogleConnection = void 0;
 const env_1 = require("@langchain/core/utils/env");
+const function_calling_1 = require("@langchain/core/utils/function_calling");
 const zod_to_gemini_parameters_js_1 = require("./utils/zod_to_gemini_parameters.cjs");
 class GoogleConnection {
     constructor(caller, client, streaming) {
@@ -221,16 +222,11 @@ class AbstractGoogleLLMConnection extends GoogleAIConnection {
     formatSystemInstruction(_input, _parameters) {
         return {};
     }
-    // Borrowed from the OpenAI invocation params test
-    isStructuredToolArray(tools) {
-        return (tools !== undefined &&
-            tools.every((tool) => Array.isArray(tool.lc_namespace)));
-    }
     structuredToolToFunctionDeclaration(tool) {
         const jsonSchema = (0, zod_to_gemini_parameters_js_1.zodToGeminiParameters)(tool.schema);
         return {
             name: tool.name,
-            description: tool.description,
+            description: tool.description ?? `A function available to call.`,
             parameters: jsonSchema,
         };
     }
@@ -246,11 +242,13 @@ class AbstractGoogleLLMConnection extends GoogleAIConnection {
         if (!tools || tools.length === 0) {
             return [];
         }
-        if (this.isStructuredToolArray(tools)) {
+        if (tools.every(function_calling_1.isLangChainTool)) {
             return this.structuredToolsToGeminiTools(tools);
         }
         else {
-            if (tools.length === 1 && !tools[0].functionDeclarations?.length) {
+            if (tools.length === 1 &&
+                (!("functionDeclarations" in tools[0]) ||
+                    !tools[0].functionDeclarations?.length)) {
                 return [];
             }
             return tools;

package/dist/connection.d.ts

@@ -1,6 +1,6 @@
 import { BaseLanguageModelCallOptions } from "@langchain/core/language_models/base";
 import { AsyncCaller, AsyncCallerCallOptions } from "@langchain/core/utils/async_caller";
-import { StructuredToolInterface } from "@langchain/core/tools";
+import { StructuredToolParams } from "@langchain/core/tools";
 import type { GoogleAIBaseLLMInput, GoogleConnectionParams, GoogleLLMModelFamily, GooglePlatformType, GoogleResponse, GoogleLLMResponse, GeminiContent, GeminiGenerationConfig, GeminiRequest, GeminiSafetySetting, GeminiTool, GeminiFunctionDeclaration, GoogleAIModelRequestParams } from "./types.js";
 import { GoogleAbstractedClient, GoogleAbstractedClientOpsMethod } from "./auth.js";
 export declare abstract class GoogleConnection<CallOptions extends AsyncCallerCallOptions, ResponseType extends GoogleResponse> {
@@ -49,9 +49,8 @@ export declare abstract class AbstractGoogleLLMConnection<MessageType, AuthOptio
     formatGenerationConfig(_input: MessageType, parameters: GoogleAIModelRequestParams): GeminiGenerationConfig;
     formatSafetySettings(_input: MessageType, parameters: GoogleAIModelRequestParams): GeminiSafetySetting[];
     formatSystemInstruction(_input: MessageType, _parameters: GoogleAIModelRequestParams): GeminiContent;
-    isStructuredToolArray(tools?: unknown[]): tools is StructuredToolInterface[];
-    structuredToolToFunctionDeclaration(tool: StructuredToolInterface): GeminiFunctionDeclaration;
-    structuredToolsToGeminiTools(tools: StructuredToolInterface[]): GeminiTool[];
+    structuredToolToFunctionDeclaration(tool: StructuredToolParams): GeminiFunctionDeclaration;
+    structuredToolsToGeminiTools(tools: StructuredToolParams[]): GeminiTool[];
     formatTools(_input: MessageType, parameters: GoogleAIModelRequestParams): GeminiTool[];
     formatToolConfig(parameters: GoogleAIModelRequestParams): GeminiRequest["toolConfig"] | undefined;
     formatData(input: MessageType, parameters: GoogleAIModelRequestParams): GeminiRequest;

package/dist/connection.js

@@ -1,4 +1,5 @@
 import { getRuntimeEnvironment } from "@langchain/core/utils/env";
+import { isLangChainTool } from "@langchain/core/utils/function_calling";
 import { zodToGeminiParameters } from "./utils/zod_to_gemini_parameters.js";
 export class GoogleConnection {
     constructor(caller, client, streaming) {
@@ -215,16 +216,11 @@ export class AbstractGoogleLLMConnection extends GoogleAIConnection {
     formatSystemInstruction(_input, _parameters) {
         return {};
     }
-    // Borrowed from the OpenAI invocation params test
-    isStructuredToolArray(tools) {
-        return (tools !== undefined &&
-            tools.every((tool) => Array.isArray(tool.lc_namespace)));
-    }
     structuredToolToFunctionDeclaration(tool) {
         const jsonSchema = zodToGeminiParameters(tool.schema);
         return {
             name: tool.name,
-            description: tool.description,
+            description: tool.description ?? `A function available to call.`,
             parameters: jsonSchema,
         };
     }
@@ -240,11 +236,13 @@ export class AbstractGoogleLLMConnection extends GoogleAIConnection {
         if (!tools || tools.length === 0) {
             return [];
         }
-        if (this.isStructuredToolArray(tools)) {
+        if (tools.every(isLangChainTool)) {
             return this.structuredToolsToGeminiTools(tools);
         }
         else {
-            if (tools.length === 1 && !tools[0].functionDeclarations?.length) {
+            if (tools.length === 1 &&
+                (!("functionDeclarations" in tools[0]) ||
+                    !tools[0].functionDeclarations?.length)) {
                 return [];
             }
             return tools;

package/dist/types.d.ts

@@ -1,6 +1,5 @@
 import type { BaseLLMParams } from "@langchain/core/language_models/llms";
-import { StructuredToolInterface } from "@langchain/core/tools";
-import type { BaseChatModelCallOptions } from "@langchain/core/language_models/chat_models";
+import type { BaseChatModelCallOptions, BindToolsInput } from "@langchain/core/language_models/chat_models";
 import type { JsonStream } from "./utils/stream.js";
 /**
  * Parameters needed to setup the client connection.
@@ -36,6 +35,7 @@ export interface GoogleConnectionParams<AuthOptions> extends GoogleClientParams<
 export interface GoogleAISafetySetting {
     category: string;
     threshold: string;
+    method?: string;
 }
 export type GoogleAIResponseMimeType = "text/plain" | "application/json";
 export interface GoogleAIModelParams {
@@ -91,11 +91,12 @@ export interface GoogleAIModelParams {
      */
     streaming?: boolean;
 }
+export type GoogleAIToolType = BindToolsInput | GeminiTool;
 /**
  * The params which can be passed to the API at request time.
  */
 export interface GoogleAIModelRequestParams extends GoogleAIModelParams {
-    tools?: StructuredToolInterface[] | GeminiTool[];
+    tools?: GoogleAIToolType[];
     /**
      * Force the model to use tools in a specific way.
      *

package/dist/utils/common.cjs

@@ -36,35 +36,35 @@ function processToolChoice(toolChoice, allowedFunctionNames) {
     }
     throw new Error("Object inputs for tool_choice not supported.");
 }
-function convertToGeminiTools(structuredTools) {
-    const tools = [
+function convertToGeminiTools(tools) {
+    const geminiTools = [
         {
             functionDeclarations: [],
         },
     ];
-    structuredTools.forEach((tool) => {
+    tools.forEach((tool) => {
         if ("functionDeclarations" in tool &&
             Array.isArray(tool.functionDeclarations)) {
             const funcs = tool.functionDeclarations;
-            tools[0].functionDeclarations?.push(...funcs);
+            geminiTools[0].functionDeclarations?.push(...funcs);
         }
-        else if ((0, function_calling_1.isStructuredTool)(tool)) {
+        else if ((0, function_calling_1.isLangChainTool)(tool)) {
             const jsonSchema = (0, zod_to_gemini_parameters_js_1.zodToGeminiParameters)(tool.schema);
-            tools[0].functionDeclarations?.push({
+            geminiTools[0].functionDeclarations?.push({
                 name: tool.name,
-                description: tool.description,
+                description: tool.description ?? `A function available to call.`,
                 parameters: jsonSchema,
             });
         }
         else if ((0, base_1.isOpenAITool)(tool)) {
-            tools[0].functionDeclarations?.push({
+            geminiTools[0].functionDeclarations?.push({
                 name: tool.function.name,
                 description: tool.function.description ?? `A function available to call.`,
                 parameters: (0, zod_to_gemini_parameters_js_1.jsonSchemaToGeminiParameters)(tool.function.parameters),
             });
         }
     });
-    return tools;
+    return geminiTools;
 }
 exports.convertToGeminiTools = convertToGeminiTools;
 function copyAIModelParamsInto(params, options, target) {

package/dist/utils/common.d.ts

@@ -1,9 +1,6 @@
-import { StructuredToolInterface } from "@langchain/core/tools";
-import { ToolDefinition } from "@langchain/core/language_models/base";
-import { RunnableToolLike } from "@langchain/core/runnables";
-import type { GeminiTool, GoogleAIBaseLanguageModelCallOptions, GoogleAIModelParams, GoogleAIModelRequestParams, GoogleLLMModelFamily } from "../types.js";
+import type { GeminiTool, GoogleAIBaseLanguageModelCallOptions, GoogleAIModelParams, GoogleAIModelRequestParams, GoogleAIToolType, GoogleLLMModelFamily } from "../types.js";
 export declare function copyAIModelParams(params: GoogleAIModelParams | undefined, options: GoogleAIBaseLanguageModelCallOptions | undefined): GoogleAIModelRequestParams;
-export declare function convertToGeminiTools(structuredTools: (StructuredToolInterface | Record<string, unknown> | ToolDefinition | RunnableToolLike)[]): GeminiTool[];
+export declare function convertToGeminiTools(tools: GoogleAIToolType[]): GeminiTool[];
 export declare function copyAIModelParamsInto(params: GoogleAIModelParams | undefined, options: GoogleAIBaseLanguageModelCallOptions | undefined, target: GoogleAIModelParams): GoogleAIModelRequestParams;
 export declare function modelToFamily(modelName: string | undefined): GoogleLLMModelFamily;
 export declare function validateModelParams(params: GoogleAIModelParams | undefined): void;

package/dist/utils/common.js

@@ -1,5 +1,5 @@
-import { isOpenAITool, } from "@langchain/core/language_models/base";
-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 { isModelGemini, validateGeminiParams } from "./gemini.js";
 import { jsonSchemaToGeminiParameters, zodToGeminiParameters, } from "./zod_to_gemini_parameters.js";
 export function copyAIModelParams(params, options) {
@@ -32,35 +32,35 @@ function processToolChoice(toolChoice, allowedFunctionNames) {
     }
     throw new Error("Object inputs for tool_choice not supported.");
 }
-export function convertToGeminiTools(structuredTools) {
-    const tools = [
+export function convertToGeminiTools(tools) {
+    const geminiTools = [
         {
             functionDeclarations: [],
         },
     ];
-    structuredTools.forEach((tool) => {
+    tools.forEach((tool) => {
         if ("functionDeclarations" in tool &&
             Array.isArray(tool.functionDeclarations)) {
             const funcs = tool.functionDeclarations;
-            tools[0].functionDeclarations?.push(...funcs);
+            geminiTools[0].functionDeclarations?.push(...funcs);
         }
-        else if (isStructuredTool(tool)) {
+        else if (isLangChainTool(tool)) {
             const jsonSchema = zodToGeminiParameters(tool.schema);
-            tools[0].functionDeclarations?.push({
+            geminiTools[0].functionDeclarations?.push({
                 name: tool.name,
-                description: tool.description,
+                description: tool.description ?? `A function available to call.`,
                 parameters: jsonSchema,
             });
         }
         else if (isOpenAITool(tool)) {
-            tools[0].functionDeclarations?.push({
+            geminiTools[0].functionDeclarations?.push({
                 name: tool.function.name,
                 description: tool.function.description ?? `A function available to call.`,
                 parameters: jsonSchemaToGeminiParameters(tool.function.parameters),
             });
         }
     });
-    return tools;
+    return geminiTools;
 }
 export function copyAIModelParamsInto(params, options, target) {
     const ret = target || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-common",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "Core types and classes for Google services.",
   "type": "module",
   "engines": {
@@ -40,7 +40,7 @@
   "author": "LangChain",
   "license": "MIT",
   "dependencies": {
-    "@langchain/core": ">=0.2.16 <0.3.0",
+    "@langchain/core": ">=0.2.21 <0.3.0",
     "uuid": "^10.0.0",
     "zod-to-json-schema": "^3.22.4"
   },
@@ -63,7 +63,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",