@langchain/google-common 0.2.7 → 0.2.9

package/dist/chat_models.cjs

@@ -162,6 +162,12 @@ class ChatGoogleBase extends chat_models_1.BaseChatModel {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "seed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "presencePenalty", {
             enumerable: true,
             configurable: true,

package/dist/chat_models.d.ts

@@ -42,6 +42,7 @@ export declare abstract class ChatGoogleBase<AuthOptions> extends BaseChatModel<
     maxReasoningTokens: number;
     topP: number;
     topK: number;
+    seed: number;
     presencePenalty: number;
     frequencyPenalty: number;
     stopSequences: string[];

package/dist/chat_models.js

@@ -158,6 +158,12 @@ export class ChatGoogleBase extends BaseChatModel {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "seed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "presencePenalty", {
             enumerable: true,
             configurable: true,

package/dist/connection.cjs

@@ -121,12 +121,24 @@ class GoogleHostConnection extends GoogleConnection {
             value: void 0
         });
         this.caller = caller;
-        this.platformType = fields?.platformType;
+        this.platformType = this.fieldPlatformType(fields);
         this._endpoint = fields?.endpoint;
         this._location = fields?.location;
         this._apiVersion = fields?.apiVersion;
         this.client = client;
     }
+    fieldPlatformType(fields) {
+        if (typeof fields === "undefined") {
+            return undefined;
+        }
+        if (typeof fields.platformType !== "undefined") {
+            return fields.platformType;
+        }
+        if (fields.vertexai === true) {
+            return "gcp";
+        }
+        return undefined;
+    }
     get platform() {
         return this.platformType ?? this.computedPlatformType;
     }
@@ -149,7 +161,12 @@ class GoogleHostConnection extends GoogleConnection {
         return this._endpoint ?? this.computedEndpoint;
     }
     get computedEndpoint() {
-        return `${this.location}-aiplatform.googleapis.com`;
+        if (this.location === "global") {
+            return "aiplatform.googleapis.com";
+        }
+        else {
+            return `${this.location}-aiplatform.googleapis.com`;
+        }
     }
     buildMethod() {
         return "POST";
@@ -233,6 +250,16 @@ class GoogleAIConnection extends GoogleHostConnection {
     get isApiKey() {
         return this.client.clientType === "apiKey";
     }
+    fieldPlatformType(fields) {
+        const ret = super.fieldPlatformType(fields);
+        if (typeof ret !== "undefined") {
+            return ret;
+        }
+        if (fields?.vertexai === false) {
+            return "gai";
+        }
+        return undefined;
+    }
     get computedPlatformType() {
         // This is not a completely correct assumption, since GCP can
         // have an API Key. But if so, then people need to set the platform

package/dist/connection.d.ts

@@ -27,6 +27,7 @@ export declare abstract class GoogleHostConnection<CallOptions extends AsyncCall
     _location: string | undefined;
     _apiVersion: string | undefined;
     constructor(fields: GoogleConnectionParams<AuthOptions> | undefined, caller: AsyncCaller, client: GoogleAbstractedClient, streaming?: boolean);
+    fieldPlatformType(fields: GoogleConnectionParams<any> | undefined): GooglePlatformType | undefined;
     get platform(): GooglePlatformType;
     get computedPlatformType(): GooglePlatformType;
     get computedApiVersion(): string;
@@ -53,6 +54,7 @@ export declare abstract class GoogleAIConnection<CallOptions extends AsyncCaller
     get apiName(): string;
     get api(): GoogleAIAPI;
     get isApiKey(): boolean;
+    fieldPlatformType(fields: GoogleConnectionParams<any> | undefined): GooglePlatformType | undefined;
     get computedPlatformType(): GooglePlatformType;
     get computedApiVersion(): string;
     get computedLocation(): string;

package/dist/connection.js

@@ -117,12 +117,24 @@ export class GoogleHostConnection extends GoogleConnection {
             value: void 0
         });
         this.caller = caller;
-        this.platformType = fields?.platformType;
+        this.platformType = this.fieldPlatformType(fields);
         this._endpoint = fields?.endpoint;
         this._location = fields?.location;
         this._apiVersion = fields?.apiVersion;
         this.client = client;
     }
+    fieldPlatformType(fields) {
+        if (typeof fields === "undefined") {
+            return undefined;
+        }
+        if (typeof fields.platformType !== "undefined") {
+            return fields.platformType;
+        }
+        if (fields.vertexai === true) {
+            return "gcp";
+        }
+        return undefined;
+    }
     get platform() {
         return this.platformType ?? this.computedPlatformType;
     }
@@ -145,7 +157,12 @@ export class GoogleHostConnection extends GoogleConnection {
         return this._endpoint ?? this.computedEndpoint;
     }
     get computedEndpoint() {
-        return `${this.location}-aiplatform.googleapis.com`;
+        if (this.location === "global") {
+            return "aiplatform.googleapis.com";
+        }
+        else {
+            return `${this.location}-aiplatform.googleapis.com`;
+        }
     }
     buildMethod() {
         return "POST";
@@ -227,6 +244,16 @@ export class GoogleAIConnection extends GoogleHostConnection {
     get isApiKey() {
         return this.client.clientType === "apiKey";
     }
+    fieldPlatformType(fields) {
+        const ret = super.fieldPlatformType(fields);
+        if (typeof ret !== "undefined") {
+            return ret;
+        }
+        if (fields?.vertexai === false) {
+            return "gai";
+        }
+        return undefined;
+    }
     get computedPlatformType() {
         // This is not a completely correct assumption, since GCP can
         // have an API Key. But if so, then people need to set the platform

package/dist/types.d.ts

@@ -36,6 +36,11 @@ export interface GoogleConnectionParams<AuthOptions> extends GoogleClientParams<
      * the "platform" getter.
      */
     platformType?: GooglePlatformType;
+    /**
+     * For compatibility with Google's libraries, should this use Vertex?
+     * The "platformType" parmeter takes precedence.
+     */
+    vertexai?: boolean;
 }
 export declare const GoogleAISafetyCategory: {
     readonly Harassment: "HARM_CATEGORY_HARASSMENT";
@@ -137,6 +142,10 @@ export interface GoogleAIModelParams {
      * among the 3 most probable tokens (using temperature).
      */
     topK?: number;
+    /**
+     * Seed used in decoding. If not set, the request uses a randomly generated seed.
+     */
+    seed?: number;
     /**
      * Presence penalty applied to the next token's logprobs
      * if the token has already been seen in the response.
@@ -410,6 +419,7 @@ export interface GeminiGenerationConfig {
     temperature?: number;
     topP?: number;
     topK?: number;
+    seed?: number;
     presencePenalty?: number;
     frequencyPenalty?: number;
     responseMimeType?: GoogleAIResponseMimeType;
@@ -495,6 +505,7 @@ export interface GoogleAISafetyParams {
 export type GeminiJsonSchema = Record<string, unknown> & {
     properties?: Record<string, GeminiJsonSchema>;
     type: GeminiFunctionSchemaType;
+    nullable?: boolean;
 };
 export interface GeminiJsonSchemaDirty extends GeminiJsonSchema {
     items?: GeminiJsonSchemaDirty;

package/dist/utils/common.cjs

@@ -131,6 +131,7 @@ function copyAIModelParamsInto(params, options, target) {
             reasoningEffortToReasoningTokens(ret.modelName, options?.reasoningEffort);
     ret.topP = options?.topP ?? params?.topP ?? target.topP;
     ret.topK = options?.topK ?? params?.topK ?? target.topK;
+    ret.seed = options?.seed ?? params?.seed ?? target.seed;
     ret.presencePenalty =
         options?.presencePenalty ??
             params?.presencePenalty ??

package/dist/utils/common.js

@@ -126,6 +126,7 @@ export function copyAIModelParamsInto(params, options, target) {
             reasoningEffortToReasoningTokens(ret.modelName, options?.reasoningEffort);
     ret.topP = options?.topP ?? params?.topP ?? target.topP;
     ret.topK = options?.topK ?? params?.topK ?? target.topK;
+    ret.seed = options?.seed ?? params?.seed ?? target.seed;
     ret.presencePenalty =
         options?.presencePenalty ??
             params?.presencePenalty ??

package/dist/utils/gemini.cjs

@@ -659,6 +659,9 @@ function getGeminiAPI(config) {
             const total_tokens = usageMetadata.totalTokenCount ?? input_tokens + output_tokens;
             const input_token_details = {};
             addModalityCounts(usageMetadata.promptTokensDetails, input_token_details);
+            if (typeof usageMetadata?.cachedContentTokenCount === "number") {
+                input_token_details.cache_read = usageMetadata.cachedContentTokenCount;
+            }
             const output_token_details = {};
             addModalityCounts(usageMetadata?.candidatesTokensDetails, output_token_details);
             if (typeof usageMetadata?.thoughtsTokenCount === "number") {
@@ -1072,6 +1075,7 @@ function getGeminiAPI(config) {
             temperature: parameters.temperature,
             topK: parameters.topK,
             topP: parameters.topP,
+            seed: parameters.seed,
             presencePenalty: parameters.presencePenalty,
             frequencyPenalty: parameters.frequencyPenalty,
             maxOutputTokens: parameters.maxOutputTokens,
@@ -1088,8 +1092,8 @@ function getGeminiAPI(config) {
             }
         }
         // Add thinking configuration if explicitly set
-        if (typeof parameters.maxReasoningTokens !== "undefined" &&
-            parameters.maxReasoningTokens !== 0) {
+        // Note that you cannot have thinkingBudget set to 0 and includeThoughts true
+        if (typeof parameters.maxReasoningTokens !== "undefined") {
             ret.thinkingConfig = {
                 thinkingBudget: parameters.maxReasoningTokens,
                 // TODO: Expose this configuration to the user once google fully supports it

package/dist/utils/gemini.js

@@ -654,6 +654,9 @@ export function getGeminiAPI(config) {
             const total_tokens = usageMetadata.totalTokenCount ?? input_tokens + output_tokens;
             const input_token_details = {};
             addModalityCounts(usageMetadata.promptTokensDetails, input_token_details);
+            if (typeof usageMetadata?.cachedContentTokenCount === "number") {
+                input_token_details.cache_read = usageMetadata.cachedContentTokenCount;
+            }
             const output_token_details = {};
             addModalityCounts(usageMetadata?.candidatesTokensDetails, output_token_details);
             if (typeof usageMetadata?.thoughtsTokenCount === "number") {
@@ -1067,6 +1070,7 @@ export function getGeminiAPI(config) {
             temperature: parameters.temperature,
             topK: parameters.topK,
             topP: parameters.topP,
+            seed: parameters.seed,
             presencePenalty: parameters.presencePenalty,
             frequencyPenalty: parameters.frequencyPenalty,
             maxOutputTokens: parameters.maxOutputTokens,
@@ -1083,8 +1087,8 @@ export function getGeminiAPI(config) {
             }
         }
         // Add thinking configuration if explicitly set
-        if (typeof parameters.maxReasoningTokens !== "undefined" &&
-            parameters.maxReasoningTokens !== 0) {
+        // Note that you cannot have thinkingBudget set to 0 and includeThoughts true
+        if (typeof parameters.maxReasoningTokens !== "undefined") {
             ret.thinkingConfig = {
                 thinkingBudget: parameters.maxReasoningTokens,
                 // TODO: Expose this configuration to the user once google fully supports it

package/dist/utils/zod_to_gemini_parameters.cjs

@@ -12,6 +12,31 @@ obj) {
         if ("additionalProperties" in newObj) {
             delete newObj.additionalProperties;
         }
+        if (Array.isArray(obj.type)) {
+            const len = obj.type.length;
+            const nullIndex = obj.type.indexOf("null");
+            if (len === 2 && nullIndex >= 0) {
+                // There are only two values set for the type, and one of them is "null".
+                // Set the type to the other one and set nullable to true.
+                const typeIndex = nullIndex === 0 ? 1 : 0;
+                newObj.type = obj.type[typeIndex];
+                newObj.nullable = true;
+            }
+            else if (len === 1 && nullIndex === 0) {
+                // This is nullable only without a type, which doesn't
+                // make sense for Gemini
+                throw new Error("zod_to_gemini_parameters: Gemini cannot handle null type");
+            }
+            else if (len === 1) {
+                // Although an array, it has only one value.
+                // So set it to the string to match what Gemini expects.
+                newObj.type = obj?.type[0];
+            }
+            else {
+                // Anything else could be a union type, so reject it.
+                throw new Error("zod_to_gemini_parameters: Gemini cannot handle union types");
+            }
+        }
         for (const key in newObj) {
             if (key in newObj) {
                 if (Array.isArray(newObj[key])) {
@@ -30,6 +55,8 @@ exports.removeAdditionalProperties = removeAdditionalProperties;
 function schemaToGeminiParameters(schema) {
     // Gemini doesn't accept either the $schema or additionalProperties
     // attributes, so we need to explicitly remove them.
+    // Zod sometimes also makes an array of type (because of .nullish()),
+    // which needs cleaning up.
     const jsonSchema = removeAdditionalProperties((0, types_1.isZodSchema)(schema) ? (0, zod_to_json_schema_1.zodToJsonSchema)(schema) : schema);
     const { $schema, ...rest } = jsonSchema;
     return rest;

package/dist/utils/zod_to_gemini_parameters.js

@@ -9,6 +9,31 @@ obj) {
         if ("additionalProperties" in newObj) {
             delete newObj.additionalProperties;
         }
+        if (Array.isArray(obj.type)) {
+            const len = obj.type.length;
+            const nullIndex = obj.type.indexOf("null");
+            if (len === 2 && nullIndex >= 0) {
+                // There are only two values set for the type, and one of them is "null".
+                // Set the type to the other one and set nullable to true.
+                const typeIndex = nullIndex === 0 ? 1 : 0;
+                newObj.type = obj.type[typeIndex];
+                newObj.nullable = true;
+            }
+            else if (len === 1 && nullIndex === 0) {
+                // This is nullable only without a type, which doesn't
+                // make sense for Gemini
+                throw new Error("zod_to_gemini_parameters: Gemini cannot handle null type");
+            }
+            else if (len === 1) {
+                // Although an array, it has only one value.
+                // So set it to the string to match what Gemini expects.
+                newObj.type = obj?.type[0];
+            }
+            else {
+                // Anything else could be a union type, so reject it.
+                throw new Error("zod_to_gemini_parameters: Gemini cannot handle union types");
+            }
+        }
         for (const key in newObj) {
             if (key in newObj) {
                 if (Array.isArray(newObj[key])) {
@@ -26,6 +51,8 @@ obj) {
 export function schemaToGeminiParameters(schema) {
     // Gemini doesn't accept either the $schema or additionalProperties
     // attributes, so we need to explicitly remove them.
+    // Zod sometimes also makes an array of type (because of .nullish()),
+    // which needs cleaning up.
     const jsonSchema = removeAdditionalProperties(isZodSchema(schema) ? zodToJsonSchema(schema) : schema);
     const { $schema, ...rest } = jsonSchema;
     return rest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-common",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "Core types and classes for Google services.",
   "type": "module",
   "engines": {