cr

Author: hntrl

libs/providers/langchain-google/package.json

@@ -62,6 +62,17 @@
         "types": "./dist/index.d.cts",
         "default": "./dist/index.cjs"
       }
+    },
+    "./node": {
+      "input": "./src/node.ts",
+      "import": {
+        "types": "./dist/node.d.ts",
+        "default": "./dist/node.js"
+      },
+      "require": {
+        "types": "./dist/node.d.cts",
+        "default": "./dist/node.cjs"
+      }
     }
   },
   "files": [

libs/providers/langchain-google/src/chat_models/base.ts

@@ -88,11 +88,10 @@ export abstract class BaseChatGoogle<
 
   constructor(protected params: BaseChatGoogleParams) {
     super(params);
-    this.model = params.model;
-
     if (!params.apiClient) {
       throw new Error("BaseChatGoogle requires an apiClient");
     }
+    this.model = params.model;
     this.apiClient = params.apiClient;
   }
 
@@ -435,9 +434,7 @@ export abstract class BaseChatGoogle<
 
     // Determine llm and outputParser based on method
     let llm: Runnable<BaseMessage[], AIMessageChunk, CallOptions>;
-    let outputParser:
-      | RunnableLambda<BaseMessage, RunOutput>
-      | JsonOutputKeyToolsParser<RunOutput>;
+    let outputParser: Runnable<BaseMessage, RunOutput>;
 
     if (method === "jsonMode") {
       // Use JSON mode with responseSchema

libs/providers/langchain-google/src/chat_models/index.ts

@@ -1,3 +1,4 @@
+import { getEnvironmentVariable } from "@langchain/core/utils/env";
 import { WebApiClient } from "../clients/index.js";
 import {
   BaseChatGoogle,
@@ -6,16 +7,40 @@ import {
   getGoogleChatModelParams,
 } from "./base.js";
 
+/**
+ * Configuration parameters for the ChatGoogleGenerativeAI model.
+ *
+ * This interface extends the base Google chat model parameters and adds
+ * specific configuration options for the Generative AI API.
+ */
 export interface ChatGoogleGenerativeAIParams extends BaseChatGoogleParams {
+  /**
+   * Google API key for authentication with the Generative AI API.
+   *
+   * If not provided, the model will attempt to use the `GOOGLE_API_KEY`
+   * environment variable. You can obtain an API key from the
+   * [Google AI Studio](https://makersuite.google.com/app/apikey).
+   */
   apiKey?: string;
+
   /** @deprecated Import from `@langchain/google/node` to configure google auth options */
   authOptions?: never;
 }
 
+/**
+ * Call options for the ChatGoogleGenerativeAI model.
+ *
+ * This interface extends the base Google chat model call options and provides
+ * configuration for individual model invocations. These options can be passed
+ * when calling methods like `invoke()`, `stream()`, or `batch()` to customize
+ * the behavior of a specific request.
+ */
 export interface ChatGoogleGenerativeAICallOptions
   extends BaseChatGoogleCallOptions {}
 
 export class ChatGoogleGenerativeAI extends BaseChatGoogle<ChatGoogleGenerativeAICallOptions> {
+  apiKey?: string;
+
   _llmType() {
     return "generativeai";
   }
@@ -34,39 +59,69 @@ export class ChatGoogleGenerativeAI extends BaseChatGoogle<ChatGoogleGenerativeA
     paramsArg?: Omit<ChatGoogleGenerativeAIParams, "model">
   ) {
     const params = getGoogleChatModelParams(modelOrParams, paramsArg);
+    params.apiKey = params?.apiKey ?? getEnvironmentVariable("GOOGLE_API_KEY");
     const apiClient = params?.apiClient ?? new WebApiClient(params);
     super({ ...params, apiClient });
+
+    this.apiKey = params.apiKey;
   }
 }
 
+/**
+ * Parameters for configuring the ChatGoogleVertexAI model.
+ *
+ * This interface extends the base Google chat model parameters and provides
+ * configuration options specific to Google Vertex AI. These parameters are
+ * used when instantiating a new ChatGoogleVertexAI instance.
+ */
 export interface ChatGoogleVertexAIParams extends BaseChatGoogleParams {
+  /**
+   * Google API key for authentication with the Vertex AI API.
+   *
+   * If not provided, the model will attempt to use the `GOOGLE_API_KEY`
+   * environment variable. You can obtain an API key from the
+   * [Google Cloud Console](https://console.cloud.google.com/).
+   */
   apiKey?: string;
+
   /** @deprecated Import from `@langchain/google/node` to configure google auth options */
   authOptions?: never;
 }
 
+/**
+ * Call options for the ChatGoogleVertexAI model.
+ *
+ * This interface extends the base Google chat model call options and provides
+ * configuration options that can be passed when invoking the ChatGoogleVertexAI model.
+ * These options allow you to customize the behavior of individual model calls.
+ */
 export interface ChatGoogleVertexAICallOptions
   extends BaseChatGoogleCallOptions {}
 
 export class ChatGoogleVertexAI extends BaseChatGoogle<ChatGoogleVertexAICallOptions> {
+  apiKey?: string;
+
+  _llmType() {
+    return "vertexai";
+  }
+
+  getBaseUrl() {
+    return new URL(
+      `https://aiplatform.googleapis.com/v1/publishers/google/models/`
+    );
+  }
+
   constructor(model: string, params?: Omit<ChatGoogleVertexAIParams, "model">);
   constructor(params: ChatGoogleVertexAIParams);
   constructor(
     modelOrParams: string | ChatGoogleVertexAIParams,
     paramsArg?: Omit<ChatGoogleVertexAIParams, "model">
   ) {
     const params = getGoogleChatModelParams(modelOrParams, paramsArg);
+    params.apiKey = params?.apiKey ?? getEnvironmentVariable("GOOGLE_API_KEY");
     const apiClient = params?.apiClient ?? new WebApiClient(params);
     super({ ...params, apiClient });
-  }
 
-  _llmType() {
-    return "vertexai";
-  }
-
-  getBaseUrl() {
-    return new URL(
-      `https://aiplatform.googleapis.com/v1/publishers/google/models/`
-    );
+    this.apiKey = params.apiKey;
   }
 }

libs/providers/langchain-google/src/chat_models/node.ts

@@ -1,3 +1,4 @@
+import { getEnvironmentVariable } from "@langchain/core/utils/env";
 import {
   type ChatGoogleVertexAIParams,
   ChatGoogleVertexAI,
@@ -27,6 +28,9 @@ class ChatGoogleGenerativeAINode extends ChatGoogleGenerativeAI {
     paramsArg?: Omit<ChatGoogleGenerativeAINodeParams, "model">
   ) {
     const params = getGoogleChatModelParams(modelOrParams, paramsArg);
+    if (!params.googleAuthOptions) {
+      params.apiKey = params.apiKey ?? getEnvironmentVariable("GOOGLE_API_KEY");
+    }
     if (params.googleAuthOptions) {
       params.googleAuthOptions = ensureAuthScopes(
         params.googleAuthOptions,
@@ -53,6 +57,9 @@ class ChatGoogleVertexAINode extends ChatGoogleVertexAI {
     paramsArg?: Omit<ChatGoogleVertexAINodeParams, "model">
   ) {
     const params = getGoogleChatModelParams(modelOrParams, paramsArg);
+    if (!params.googleAuthOptions) {
+      params.apiKey = params.apiKey ?? getEnvironmentVariable("GOOGLE_API_KEY");
+    }
     if (params.googleAuthOptions) {
       params.googleAuthOptions = ensureAuthScopes(
         params.googleAuthOptions,

libs/providers/langchain-google/src/utils/errors.ts

@@ -311,6 +311,7 @@ export class RequestError extends GoogleError("request") {
     });
 
     const message =
+      errorBody?.error?.message ??
       errorBody?.message ??
       errorBody?.error ??
       `Request failed with status code ${response.status}`;