@langchain/google 0.2.11 → 0.2.13

package/dist/chat_models/base.cjs

@@ -1,26 +1,18 @@
-const require_misc = require("../utils/misc.cjs");
-const require_errors = require("../utils/errors.cjs");
-const require_stream_events = require("../utils/stream_events.cjs");
 const require_profiles = require("./profiles.cjs");
-const require_types = require("./types.cjs");
-const require_stream = require("../utils/stream.cjs");
-const require_messages = require("../converters/messages.cjs");
-const require_tools = require("../converters/tools.cjs");
-const require_params = require("../converters/params.cjs");
+const require_errors = require("../utils/errors.cjs");
 const require_metadata = require("../utils/metadata.cjs");
+require("./handlers/index.cjs");
+const require_generate_content = require("./handlers/generate_content.cjs");
+const require_interactions = require("./handlers/interactions.cjs");
+const require_params = require("../converters/shared/params.cjs");
 let _langchain_core_utils_env = require("@langchain/core/utils/env");
 let _langchain_core_language_models_chat_models = require("@langchain/core/language_models/chat_models");
 let _langchain_core_messages = require("@langchain/core/messages");
 let _langchain_core_utils_stream = require("@langchain/core/utils/stream");
-let _langchain_core_outputs = require("@langchain/core/outputs");
-let eventsource_parser_stream = require("eventsource-parser/stream");
 let _langchain_core_runnables = require("@langchain/core/runnables");
-let _langchain_core_utils_json_schema = require("@langchain/core/utils/json_schema");
-let _langchain_core_utils_types = require("@langchain/core/utils/types");
-let _langchain_core_utils_standard_schema = require("@langchain/core/utils/standard_schema");
 let _langchain_core_language_models_structured_output = require("@langchain/core/language_models/structured_output");
 let _langchain_core_utils_gateway = require("@langchain/core/utils/gateway");
-//#region src/chat_models/base.ts
+// src/chat_models/base.ts
 function hasVertexCredentials(params) {
 	return typeof params.credentials !== "undefined" || typeof params.googleAuthOptions !== "undefined" || typeof (0, _langchain_core_utils_env.getEnvironmentVariable)("GOOGLE_CLOUD_CREDENTIALS") !== "undefined";
 }
@@ -28,11 +20,11 @@ function hasVertexCredentials(params) {
 * Resolves LangSmith gateway routing for Google chat model params.
 *
 * The LangSmith gateway exposes direct paths for the Gemini Developer API and
-* Vertex AI. An explicit `endpoint` suppresses gateway routing.
+* Vertex AI. An explicit `endpoint` or explicit credentials (`apiKey`,
+* `credentials`, `googleAuthOptions`) suppress gateway routing.
 *
 * When `LANGSMITH_GATEWAY` is set, this rewrites `endpoint` to the gateway
-* host and lets the gateway key take precedence over the provider key (which
-* then rides as the `x-goog-api-key` header via the ApiClient). The default
+* host and uses the gateway key as the API key. The default
 * `https` gateway host is written scheme-less (the URL builders prepend
 * `https://`); a non-`https` custom gateway keeps its scheme so it is not
 * forced to TLS.
@@ -44,8 +36,9 @@ function hasVertexCredentials(params) {
 * @returns a new params object with gateway routing applied when applicable.
 */
 function applyGeminiGatewayParams(params) {
-	if (typeof params.endpoint !== "undefined") return { ...params };
-	const platform = require_params.convertParamsToPlatformType(params) ?? (hasVertexCredentials(params) ? "gcp" : "gai");
+	const p = params;
+	if (typeof p.endpoint !== "undefined" || typeof p.apiKey !== "undefined" || typeof p.credentials !== "undefined" || typeof p.googleAuthOptions !== "undefined") return { ...params };
+	const platform = require_params.convertParamsToPlatformType(p) ?? (hasVertexCredentials(p) ? "gcp" : "gai");
 	const gatewayConfig = (0, _langchain_core_utils_gateway.resolveLangSmithGatewayConfig)({ providerPath: platform === "gcp" ? "vertex" : "gemini" });
 	if (typeof gatewayConfig.baseURL === "undefined") return { ...params };
 	const gatewayUrl = new URL(gatewayConfig.baseURL);
@@ -53,7 +46,7 @@ function applyGeminiGatewayParams(params) {
 	const endpoint = gatewayUrl.protocol === "https:" ? `${gatewayUrl.host}${path}` : `${gatewayUrl.protocol}//${gatewayUrl.host}${path}`;
 	return {
 		...params,
-		apiKey: params.apiKey ?? gatewayConfig.apiKey,
+		apiKey: gatewayConfig.apiKey,
 		endpoint,
 		platformType: platform
 	};
@@ -63,20 +56,6 @@ function getPlatformType(platform, hasApiKey) {
 	else if (hasApiKey) return "gai";
 	else return "gcp";
 }
-function usageMetadataToTokenUsage(usageMetadata) {
-	return {
-		promptTokens: usageMetadata.input_tokens,
-		completionTokens: usageMetadata.output_tokens,
-		totalTokens: usageMetadata.total_tokens
-	};
-}
-function mapDetailToMediaResolution(detail) {
-	switch (detail) {
-		case "low": return "MEDIA_RESOLUTION_LOW";
-		case "high": return "MEDIA_RESOLUTION_HIGH";
-		default: return;
-	}
-}
 var BaseChatGoogle = class extends _langchain_core_language_models_chat_models.BaseChatModel {
 	params;
 	model;
@@ -92,7 +71,7 @@ var BaseChatGoogle = class extends _langchain_core_language_models_chat_models.B
 	constructor(params) {
 		super(params);
 		this.params = params;
-		this._addVersion("@langchain/google", "0.2.11");
+		this._addVersion("@langchain/google", "0.2.13");
 		if (!params.apiClient) throw new require_errors.ConfigurationError("BaseChatGoogle requires an apiClient. This should be provided automatically by ChatGoogle constructors. If you're extending BaseChatGoogle directly, please provide an apiClient instance.");
 		this.apiClient = params.apiClient;
 		this.model = params.model;
@@ -139,8 +118,38 @@ var BaseChatGoogle = class extends _langchain_core_language_models_chat_models.B
 	get publisher() {
 		return "google";
 	}
-	get urlMethod() {
-		return this.streaming ? "streamGenerateContent?alt=sse" : "generateContent";
+	_apiHandler;
+	_handlerParams;
+	syncHandlerParams() {
+		const nextParams = {
+			...this.params,
+			model: this.model,
+			platform: this.platform,
+			endpoint: this.endpoint,
+			location: this.location,
+			apiVersion: this.apiVersion,
+			isVertexExpress: this.isVertexExpress,
+			publisher: this.publisher,
+			streaming: this.streaming,
+			streamUsage: this.streamUsage,
+			customHeaders: this._customHeaders,
+			apiClient: this.apiClient,
+			caller: this.caller
+		};
+		if (this._handlerParams) return Object.assign(this._handlerParams, nextParams);
+		this._handlerParams = nextParams;
+		return this._handlerParams;
+	}
+	get apiHandler() {
+		const handlerParams = this.syncHandlerParams();
+		if (!this._apiHandler) {
+			const handlerConfig = this.params.apiHandler ?? "generateContent";
+			if (typeof handlerConfig === "function") this._apiHandler = handlerConfig(handlerParams);
+			else if (handlerConfig === "generateContent") this._apiHandler = new require_generate_content.GenerateContentApiHandler(handlerParams);
+			else if (handlerConfig === "interactions") this._apiHandler = new require_interactions.InteractionsApiHandler(handlerParams);
+			else throw new require_errors.ConfigurationError(`Unknown apiHandler: ${handlerConfig}`);
+		}
+		return this._apiHandler;
 	}
 	/**
 	* Returns the model profile for this instance's model, describing its
@@ -158,96 +167,24 @@ var BaseChatGoogle = class extends _langchain_core_language_models_chat_models.B
 	get profile() {
 		return require_profiles.default[this.model] ?? {};
 	}
-	async buildUrlGemini(urlMethod) {
-		const url = this.endpoint.includes("://") ? new URL(this.endpoint) : new URL(`https://${this.endpoint}`);
-		const [method, search] = (urlMethod ?? this.urlMethod).split("?", 2);
-		url.pathname = `${url.pathname.replace(/\/+$/, "")}/${this.apiVersion}/models/${this.model}:${method}`;
-		if (search) url.search = search;
-		return url.toString();
-	}
-	get endpointUrl() {
-		return this.endpoint.includes("://") ? this.endpoint : `https://${this.endpoint}`;
-	}
-	async buildUrlVertexExpress(urlMethod) {
-		return `${this.endpointUrl}/${this.apiVersion}/publishers/${this.publisher}/models/${this.model}:${urlMethod ?? this.urlMethod}`;
-	}
-	async buildUrlVertexLocation(urlMethod) {
-		const projectId = await this.apiClient.getProjectId();
-		return `${this.endpointUrl}/${this.apiVersion}/projects/${projectId}/locations/${this.location}/publishers/${this.publisher}/models/${this.model}:${urlMethod ?? this.urlMethod}`;
-	}
-	async buildUrlVertex(urlMethod) {
-		if (this.isVertexExpress) return this.buildUrlVertexExpress(urlMethod);
-		else return this.buildUrlVertexLocation(urlMethod);
-	}
 	async buildUrl(urlMethod) {
-		switch (this.platform) {
-			case "gai": return this.buildUrlGemini(urlMethod);
-			default: return this.buildUrlVertex(urlMethod);
-		}
+		return this.apiHandler.buildUrl(urlMethod);
 	}
 	invocationParams(options) {
-		const fields = combineGoogleChatModelFields(this.params, options);
-		const mediaResolution = fields.mediaResolution ?? mapDetailToMediaResolution(fields.detail);
-		const tools = fields.tools ? require_tools.convertToolsToGeminiTools(fields.tools) : void 0;
-		let toolConfig = require_tools.convertToolChoiceToGeminiConfig(options.tool_choice, !!(tools && tools.length > 0));
-		if (tools && require_tools.mixesBuiltinAndFunctionTools(tools)) toolConfig = {
-			...toolConfig,
-			includeServerSideToolInvocations: true
-		};
-		let responseJsonSchema;
-		let responseMimeType;
-		if (fields.responseSchema) {
-			if ((0, _langchain_core_utils_types.isInteropZodSchema)(fields.responseSchema) || (0, _langchain_core_utils_standard_schema.isSerializableSchema)(fields.responseSchema)) responseJsonSchema = (0, _langchain_core_utils_json_schema.toJsonSchema)(fields.responseSchema);
-			else responseJsonSchema = fields.responseSchema;
-			responseMimeType = "application/json";
-		}
-		return {
-			...tools && tools.length > 0 ? { tools } : {},
-			...toolConfig ? { toolConfig } : {},
-			safetySettings: fields.safetySettings,
-			generationConfig: {
-				temperature: fields.temperature,
-				topP: fields.topP,
-				topK: fields.topK,
-				maxOutputTokens: fields.maxOutputTokens,
-				presencePenalty: fields.presencePenalty,
-				frequencyPenalty: fields.frequencyPenalty,
-				stopSequences: fields.stopSequences,
-				...responseMimeType ? { responseMimeType } : {},
-				...responseJsonSchema ? { responseJsonSchema } : {},
-				...fields.responseModalities && fields.responseModalities.length > 0 ? { responseModalities: fields.responseModalities } : {},
-				candidateCount: 1,
-				seed: fields.seed,
-				responseLogprobs: fields.responseLogprobs,
-				logprobs: fields.logprobs,
-				...fields.enableEnhancedCivicAnswers !== void 0 ? { enableEnhancedCivicAnswers: fields.enableEnhancedCivicAnswers } : {},
-				thinkingConfig: require_params.convertFieldsToThinkingConfig(this.model, fields),
-				speechConfig: require_params.convertFieldsToSpeechConfig(fields),
-				...fields.imageConfig ? { imageConfig: fields.imageConfig } : {},
-				...mediaResolution ? { mediaResolution } : {}
-			},
-			...require_params.convertFieldsToServiceTier(this.platform, fields)
-		};
+		return this.apiHandler.invocationParams(options);
 	}
 	getLsParams(options) {
-		const params = this.invocationParams(options);
 		return {
 			ls_provider: this.platform === "gcp" ? "google_vertexai" : "google_genai",
 			ls_model_name: this.model,
 			ls_model_type: "chat",
-			ls_temperature: params.generationConfig?.temperature ?? void 0,
-			ls_max_tokens: params.generationConfig?.maxOutputTokens ?? void 0,
-			ls_stop: options.stop
+			ls_temperature: options?.temperature ?? this.params.temperature,
+			ls_max_tokens: options?.maxOutputTokens ?? this.params.maxOutputTokens,
+			ls_stop: options?.stopSequences ?? options?.stop ?? this.params.stopSequences
 		};
 	}
 	getHeaders(options) {
-		const fields = combineGoogleChatModelFields(this.params, options);
-		return {
-			"Content-Type": "application/json",
-			...this.platform === "gcp" && typeof fields.serviceTier !== "undefined" && require_types.settableServiceTier.includes(fields.serviceTier) ? { "X-Vertex-AI-LLM-Shared-Request-Type": fields.serviceTier } : {},
-			...this._customHeaders,
-			...options.customHeaders
-		};
+		return this.apiHandler.getHeaders(options);
 	}
 	async _generate(messages, options, runManager) {
 		if (this.streaming) {
@@ -255,242 +192,22 @@ var BaseChatGoogle = class extends _langchain_core_language_models_chat_models.B
 			let finalChunk = null;
 			for await (const chunk of stream) finalChunk = !finalChunk ? chunk : (0, _langchain_core_utils_stream.concat)(finalChunk, chunk);
 			if (typeof finalChunk?.message?.content === "string" && typeof (finalChunk?.message?.additional_kwargs?.originalTextContentBlock)?.text === "string") finalChunk.message.additional_kwargs.originalTextContentBlock.text = finalChunk.message.content;
-			const usageMetadata = finalChunk?.message?.usage_metadata;
+			const usageMetadata = (finalChunk?.message)?.usage_metadata;
 			return {
 				generations: finalChunk ? [finalChunk] : [],
 				...usageMetadata ? { llmOutput: {
-					tokenUsage: usageMetadataToTokenUsage(usageMetadata),
+					tokenUsage: require_metadata.usageMetadataToTokenUsage(usageMetadata),
 					usageMetadata
 				} } : {}
 			};
 		}
-		const url = await this.buildUrl();
-		const headers = this.getHeaders(options);
-		const body = {
-			...this.invocationParams(options),
-			systemInstruction: require_messages.convertMessagesToGeminiSystemInstruction(messages),
-			contents: require_messages.convertMessagesToGeminiContents(messages)
-		};
-		const moduleName = this.constructor.name;
-		await runManager?.handleCustomEvent(`google-request-${moduleName}`, {
-			url,
-			headers,
-			body
-		});
-		let response;
-		try {
-			response = await this.caller.callWithOptions({
-				signal: options.signal,
-				maxRetries: options.maxRetries
-			}, async () => {
-				const nextResponse = await this.apiClient.fetch(new Request(url, {
-					method: "POST",
-					headers,
-					body: JSON.stringify(body),
-					signal: options.signal
-				}));
-				if (!nextResponse.ok) throw await require_errors.RequestError.fromResponse(nextResponse);
-				return nextResponse;
-			});
-		} catch (error) {
-			await runManager?.handleCustomEvent(`google-response-${moduleName}`, { error });
-			throw error;
-		}
-		const data = await response.json();
-		await runManager?.handleCustomEvent(`google-response-${moduleName}`, {
-			data,
-			url: response.url,
-			headers: Array.from(response.headers.entries()),
-			status: response.status,
-			statusText: response.statusText
-		});
-		if (data.promptFeedback?.blockReason) throw require_errors.PromptBlockedError.fromPromptFeedback(data.promptFeedback);
-		if (!data.candidates || data.candidates.length === 0) throw new require_errors.NoCandidatesError();
-		const candidate = data.candidates[0];
-		const message = require_messages.convertGeminiCandidateToAIMessage(candidate);
-		const text = require_messages.convertAIMessageToText(message);
-		const usageMetadata = require_messages.convertGeminiGenerateContentResponseToUsageMetadata(data);
-		message.usage_metadata = usageMetadata;
-		const serviceTier = require_misc.iife(() => {
-			const trafficType = data.usageMetadata?.trafficType;
-			const serviceTierHeader = response.headers.get("x-gemini-service-tier");
-			if (trafficType?.startsWith("ON_DEMAND_")) return trafficType?.substring(10).toLowerCase();
-			return serviceTierHeader || "standard";
-		});
-		return {
-			generations: [{
-				text,
-				message,
-				generationInfo: {
-					finishReason: candidate.finishReason,
-					finishMessage: candidate.finishMessage,
-					safetyRatings: candidate.safetyRatings,
-					citationMetadata: candidate.citationMetadata,
-					tokenCount: candidate.tokenCount
-				}
-			}],
-			llmOutput: {
-				tokenUsage: usageMetadataToTokenUsage(usageMetadata),
-				model: data.modelVersion,
-				responseId: data.responseId,
-				usageMetadata,
-				serviceTier
-			}
-		};
+		return this.apiHandler.generate(messages, options, runManager);
 	}
-	async *_streamChatModelEvents(messages, options, _runManager) {
-		const body = {
-			...this.invocationParams(options),
-			systemInstruction: require_messages.convertMessagesToGeminiSystemInstruction(messages),
-			contents: require_messages.convertMessagesToGeminiContents(messages)
-		};
-		const url = await this.buildUrl("streamGenerateContent?alt=sse");
-		const headers = this.getHeaders(options);
-		const response = await this.apiClient.fetch(new Request(url, {
-			method: "POST",
-			headers,
-			body: JSON.stringify(body),
-			signal: options.signal
-		}));
-		if (!response.ok) throw await require_errors.RequestError.fromResponse(response);
-		if (!response.body) return;
-		const eventStream = response.body.pipeThrough(new TextDecoderStream()).pipeThrough(new eventsource_parser_stream.EventSourceParserStream()).pipeThrough(new require_stream.SafeJsonEventParserStream());
-		const shouldStreamUsage = this.streamUsage !== false && options.streamUsage !== false;
-		async function* geminiChunks(stream, signal) {
-			const reader = stream.getReader();
-			try {
-				while (true) {
-					if (signal?.aborted) return;
-					const { done, value } = await reader.read();
-					if (done) break;
-					if (value !== null) yield value;
-				}
-			} finally {
-				reader.releaseLock();
-			}
-		}
-		yield* require_stream_events.convertGoogleGeminiStream(geminiChunks(eventStream, options.signal), { streamUsage: shouldStreamUsage });
+	async *_streamChatModelEvents(messages, options, runManager) {
+		yield* this.apiHandler.streamChatModelEvents(messages, options, runManager);
 	}
 	async *_streamResponseChunks(messages, options, runManager) {
-		const streamUsage = this.streamUsage ?? true;
-		const body = {
-			...this.invocationParams(options),
-			systemInstruction: require_messages.convertMessagesToGeminiSystemInstruction(messages),
-			contents: require_messages.convertMessagesToGeminiContents(messages)
-		};
-		const url = await this.buildUrl("streamGenerateContent?alt=sse");
-		const headers = this.getHeaders(options);
-		const moduleName = this.constructor.name;
-		await runManager?.handleCustomEvent(`google-request-${moduleName}`, {
-			url,
-			headers,
-			body
-		});
-		let response;
-		try {
-			response = await this.caller.callWithOptions({
-				signal: options.signal,
-				maxRetries: options.maxRetries
-			}, async () => {
-				const nextResponse = await this.apiClient.fetch(new Request(url, {
-					method: "POST",
-					headers,
-					body: JSON.stringify(body),
-					signal: options.signal
-				}));
-				if (!nextResponse.ok) throw await require_errors.RequestError.fromResponse(nextResponse);
-				return nextResponse;
-			});
-		} catch (error) {
-			await runManager?.handleCustomEvent(`google-response-${moduleName}`, { error });
-			throw error;
-		}
-		await runManager?.handleCustomEvent(`google-response-${moduleName}`, {
-			url: response.url,
-			headers: response.headers,
-			status: response.status,
-			statusText: response.statusText
-		});
-		if (response.body) {
-			let previousUsage;
-			const reader = response.body.pipeThrough(new TextDecoderStream()).pipeThrough(new eventsource_parser_stream.EventSourceParserStream()).pipeThrough(new require_stream.SafeJsonEventParserStream()).pipeThrough(new TransformStream({ transform(chunk, controller) {
-				runManager?.handleCustomEvent(`google-chunk-${moduleName}`, { chunk });
-				if (chunk === null) {
-					controller.enqueue(new _langchain_core_outputs.ChatGenerationChunk({
-						text: "",
-						message: new _langchain_core_messages.AIMessageChunk({ content: "" }),
-						generationInfo: { finishReason: "stop" }
-					}));
-					return;
-				}
-				const candidate = chunk.candidates?.[0];
-				if (!candidate) {
-					if (chunk.usageMetadata && streamUsage) {
-						const cumulative = require_messages.convertGeminiGenerateContentResponseToUsageMetadata(chunk);
-						controller.enqueue(new _langchain_core_outputs.ChatGenerationChunk({
-							text: "",
-							message: new _langchain_core_messages.AIMessageChunk({
-								content: "",
-								response_metadata: { model_provider: "google" },
-								usage_metadata: require_metadata.subtractUsageMetadata(cumulative, previousUsage)
-							})
-						}));
-						previousUsage = cumulative;
-					}
-					return;
-				}
-				const message = require_messages.convertGeminiCandidateToAIMessage(candidate);
-				const text = require_messages.convertAIMessageToText(message);
-				const parts = candidate.content?.parts ?? [];
-				const toolCalls = require_messages.convertGeminiPartsToToolCalls(parts);
-				if (parts.length > 0 || candidate.finishReason) {
-					const messageChunkParams = {
-						content: message.content,
-						tool_calls: toolCalls,
-						response_metadata: { model_provider: "google" },
-						additional_kwargs: {
-							...message.additional_kwargs.originalTextContentBlock ? { originalTextContentBlock: message.additional_kwargs.originalTextContentBlock } : {},
-							...candidate.finishReason ? {
-								finishReason: candidate.finishReason,
-								finishMessage: candidate.finishMessage
-							} : {}
-						}
-					};
-					if (chunk?.usageMetadata && streamUsage) {
-						const cumulative = require_messages.convertGeminiGenerateContentResponseToUsageMetadata(chunk);
-						messageChunkParams.usage_metadata = require_metadata.subtractUsageMetadata(cumulative, previousUsage);
-						previousUsage = cumulative;
-					}
-					const messageChunk = new _langchain_core_messages.AIMessageChunk(messageChunkParams);
-					controller.enqueue(new _langchain_core_outputs.ChatGenerationChunk({
-						text,
-						message: messageChunk,
-						generationInfo: {
-							...candidate.finishReason && {
-								finishReason: candidate.finishReason,
-								finishMessage: candidate.finishMessage
-							},
-							...candidate.safetyRatings && { safetyRatings: candidate.safetyRatings },
-							...candidate.citationMetadata && { citationMetadata: candidate.citationMetadata },
-							...candidate.groundingMetadata && {
-								groundingMetadata: candidate.groundingMetadata,
-								groundingSupport: candidate.groundingMetadata.groundingSupports?.filter((s) => (s?.segment?.partIndex ?? 0) === 0)
-							}
-						}
-					}));
-				}
-			} })).getReader();
-			try {
-				while (true) {
-					const { done, value } = await reader.read();
-					if (done) break;
-					yield value;
-					await runManager?.handleLLMNewToken(value.text ?? "", void 0, void 0, void 0, void 0, { chunk: value });
-				}
-			} finally {
-				reader.releaseLock();
-			}
-		}
+		yield* this.apiHandler.streamResponseChunks(messages, options, runManager);
 	}
 	/**
 	* Bind tool-like objects to this chat model.
@@ -536,75 +253,15 @@ var BaseChatGoogle = class extends _langchain_core_language_models_chat_models.B
 				return await (0, _langchain_core_language_models_structured_output.createContentParser)(schema).parse(input.text);
 			});
 		} else if (method === "functionCalling") {
-			let functionName = name ?? "extract";
-			let geminiFunctionDeclaration;
-			if ((0, _langchain_core_utils_types.isInteropZodSchema)(schema) || (0, _langchain_core_utils_standard_schema.isSerializableSchema)(schema)) {
-				const jsonSchema = require_tools.schemaToGeminiParameters(schema);
-				const description = typeof jsonSchema.description === "string" ? jsonSchema.description : "A function available to call.";
-				geminiFunctionDeclaration = {
-					name: functionName,
-					description,
-					parameters: jsonSchema
-				};
-			} else if (typeof schema.name === "string" && typeof schema.parameters === "object" && schema.parameters != null) {
-				geminiFunctionDeclaration = schema;
-				functionName = schema.name;
-			} else {
-				const parameters = require_tools.schemaToGeminiParameters(schema);
-				geminiFunctionDeclaration = {
-					name: functionName,
-					description: schema.description ?? "",
-					parameters
-				};
-			}
-			const tools = [{ functionDeclarations: [geminiFunctionDeclaration] }];
-			llm = this.bindTools(tools).withConfig({ tool_choice: functionName });
+			const { tools, toolChoice, functionName } = this.apiHandler.formatStructuredOutputTool(schema, { name });
+			llm = this.bindTools(tools).withConfig({ tool_choice: toolChoice });
 			outputParser = (0, _langchain_core_language_models_structured_output.createFunctionCallingParser)(schema, functionName);
 		} else throw new require_errors.ConfigurationError(`Unrecognized structured output method '${method}'. Expected 'functionCalling' or 'jsonSchema'`);
 		return (0, _langchain_core_language_models_structured_output.assembleStructuredOutputPipeline)(llm, outputParser, includeRaw, includeRaw ? "ChatGoogleStructuredOutputRunnable" : "ChatGoogleStructuredOutput");
 	}
 };
-function combineGoogleChatModelFields(a, b, ...rest) {
-	const combined = {
-		temperature: b.temperature ?? a.temperature,
-		topP: b.topP ?? a.topP,
-		topK: b.topK ?? a.topK,
-		maxOutputTokens: b.maxOutputTokens ?? a.maxOutputTokens,
-		presencePenalty: b.presencePenalty ?? a.presencePenalty,
-		frequencyPenalty: b.frequencyPenalty ?? a.frequencyPenalty,
-		stopSequences: b.stopSequences ?? a.stopSequences,
-		seed: b.seed ?? a.seed,
-		responseLogprobs: b.responseLogprobs ?? a.responseLogprobs,
-		logprobs: b.logprobs ?? a.logprobs,
-		safetySettings: b.safetySettings ?? a.safetySettings,
-		responseSchema: b.responseSchema ?? a.responseSchema,
-		tools: b.tools ?? a.tools,
-		responseModalities: b.responseModalities ?? a.responseModalities,
-		enableEnhancedCivicAnswers: b.enableEnhancedCivicAnswers ?? a.enableEnhancedCivicAnswers,
-		speechConfig: b.speechConfig ?? a.speechConfig,
-		imageConfig: b.imageConfig ?? a.imageConfig,
-		mediaResolution: b.mediaResolution ?? a.mediaResolution,
-		detail: b.detail ?? a.detail,
-		maxReasoningTokens: b.maxReasoningTokens ?? a.maxReasoningTokens,
-		thinkingBudget: b.thinkingBudget ?? a.thinkingBudget,
-		reasoningEffort: b.reasoningEffort ?? a.reasoningEffort,
-		thinkingLevel: b.thinkingLevel ?? a.thinkingLevel,
-		serviceTier: b.serviceTier ?? a.serviceTier
-	};
-	if (rest.length > 0) return combineGoogleChatModelFields(combined, rest[0], ...rest.slice(1));
-	return combined;
-}
-function getGoogleChatModelParams(modelOrParams, paramsArg) {
-	return {
-		model: typeof modelOrParams === "string" ? modelOrParams : modelOrParams.model,
-		...typeof modelOrParams === "string" ? paramsArg : modelOrParams
-	};
-}
-//#endregion
 exports.BaseChatGoogle = BaseChatGoogle;
 exports.applyGeminiGatewayParams = applyGeminiGatewayParams;
-exports.combineGoogleChatModelFields = combineGoogleChatModelFields;
-exports.getGoogleChatModelParams = getGoogleChatModelParams;
 exports.getPlatformType = getPlatformType;
 
 //# sourceMappingURL=base.cjs.map