@langchain/google-common 0.0.11 → 0.0.13

package/dist/chat_models.cjs

@@ -109,6 +109,11 @@ class ChatGoogleBase extends chat_models_1.BaseChatModel {
     static lc_name() {
         return "ChatGoogle";
     }
+    get lc_secrets() {
+        return {
+            authOptions: "GOOGLE_AUTH_OPTIONS",
+        };
+    }
     constructor(fields) {
         super((0, failed_handler_js_1.ensureParams)(fields));
         Object.defineProperty(this, "lc_serializable", {

package/dist/chat_models.d.ts

@@ -30,6 +30,9 @@ export interface ChatGoogleBaseInput<AuthOptions> extends BaseChatModelParams, G
  */
 export declare abstract class ChatGoogleBase<AuthOptions> extends BaseChatModel<GoogleAIBaseLanguageModelCallOptions, AIMessageChunk> implements ChatGoogleBaseInput<AuthOptions> {
     static lc_name(): string;
+    get lc_secrets(): {
+        [key: string]: string;
+    } | undefined;
     lc_serializable: boolean;
     model: string;
     modelName: string;

package/dist/chat_models.js

@@ -106,6 +106,11 @@ export class ChatGoogleBase extends BaseChatModel {
     static lc_name() {
         return "ChatGoogle";
     }
+    get lc_secrets() {
+        return {
+            authOptions: "GOOGLE_AUTH_OPTIONS",
+        };
+    }
     constructor(fields) {
         super(ensureParams(fields));
         Object.defineProperty(this, "lc_serializable", {

package/dist/connection.cjs

@@ -28,21 +28,26 @@ class GoogleConnection {
         this.streaming = streaming ?? false;
     }
     async _clientInfoHeaders() {
-        const clientLibraryVersion = await this._clientLibraryVersion();
+        const { userAgent, clientLibraryVersion } = await this._getClientInfo();
         return {
-            "User-Agent": clientLibraryVersion,
+            "User-Agent": userAgent,
+            "Client-Info": clientLibraryVersion,
         };
     }
-    async _clientLibraryVersion() {
+    async _getClientInfo() {
         const env = await (0, env_1.getRuntimeEnvironment)();
         const langchain = env?.library ?? "langchain-js";
-        const langchainVersion = env?.libraryVersion ?? "0";
+        // TODO: Add an API for getting the current LangChain version
+        const langchainVersion = "0";
         const moduleName = await this._moduleName();
-        let ret = `${langchain}/${langchainVersion}`;
+        let clientLibraryVersion = `${langchain}/${langchainVersion}`;
         if (moduleName && moduleName.length) {
-            ret = `${ret}-${moduleName}`;
+            clientLibraryVersion = `${clientLibraryVersion}-${moduleName}`;
         }
-        return ret;
+        return {
+            userAgent: clientLibraryVersion,
+            clientLibraryVersion: `${langchainVersion}-${moduleName}`,
+        };
     }
     async _moduleName() {
         return this.constructor.name;
@@ -208,6 +213,7 @@ class AbstractGoogleLLMConnection extends GoogleAIConnection {
             topP: parameters.topP,
             maxOutputTokens: parameters.maxOutputTokens,
             stopSequences: parameters.stopSequences,
+            responseMimeType: parameters.responseMimeType,
         };
     }
     formatSafetySettings(_input, parameters) {

package/dist/connection.d.ts

@@ -11,7 +11,10 @@ export declare abstract class GoogleConnection<CallOptions extends AsyncCallerCa
     abstract buildUrl(): Promise<string>;
     abstract buildMethod(): GoogleAbstractedClientOpsMethod;
     _clientInfoHeaders(): Promise<Record<string, string>>;
-    _clientLibraryVersion(): Promise<string>;
+    _getClientInfo(): Promise<{
+        userAgent: string;
+        clientLibraryVersion: string;
+    }>;
     _moduleName(): Promise<string>;
     _request(data: unknown | undefined, options: CallOptions): Promise<ResponseType>;
 }

package/dist/connection.js

@@ -25,21 +25,26 @@ export class GoogleConnection {
         this.streaming = streaming ?? false;
     }
     async _clientInfoHeaders() {
-        const clientLibraryVersion = await this._clientLibraryVersion();
+        const { userAgent, clientLibraryVersion } = await this._getClientInfo();
         return {
-            "User-Agent": clientLibraryVersion,
+            "User-Agent": userAgent,
+            "Client-Info": clientLibraryVersion,
         };
     }
-    async _clientLibraryVersion() {
+    async _getClientInfo() {
         const env = await getRuntimeEnvironment();
         const langchain = env?.library ?? "langchain-js";
-        const langchainVersion = env?.libraryVersion ?? "0";
+        // TODO: Add an API for getting the current LangChain version
+        const langchainVersion = "0";
         const moduleName = await this._moduleName();
-        let ret = `${langchain}/${langchainVersion}`;
+        let clientLibraryVersion = `${langchain}/${langchainVersion}`;
         if (moduleName && moduleName.length) {
-            ret = `${ret}-${moduleName}`;
+            clientLibraryVersion = `${clientLibraryVersion}-${moduleName}`;
         }
-        return ret;
+        return {
+            userAgent: clientLibraryVersion,
+            clientLibraryVersion: `${langchainVersion}-${moduleName}`,
+        };
     }
     async _moduleName() {
         return this.constructor.name;
@@ -202,6 +207,7 @@ export class AbstractGoogleLLMConnection extends GoogleAIConnection {
             topP: parameters.topP,
             maxOutputTokens: parameters.maxOutputTokens,
             stopSequences: parameters.stopSequences,
+            responseMimeType: parameters.responseMimeType,
         };
     }
     formatSafetySettings(_input, parameters) {

package/dist/llms.cjs

@@ -107,6 +107,12 @@ class GoogleBaseLLM extends llms_1.LLM {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "responseMimeType", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "text/plain"
+        });
         Object.defineProperty(this, "connection", {
             enumerable: true,
             configurable: true,

package/dist/llms.d.ts

@@ -3,7 +3,7 @@ import { LLM } from "@langchain/core/language_models/llms";
 import { type BaseLanguageModelCallOptions, BaseLanguageModelInput } from "@langchain/core/language_models/base";
 import { BaseMessage, MessageContent } from "@langchain/core/messages";
 import { AbstractGoogleLLMConnection } from "./connection.js";
-import { GoogleAIBaseLLMInput, GoogleAIModelParams, GoogleAISafetySetting, GooglePlatformType, GeminiContent } from "./types.js";
+import { GoogleAIBaseLLMInput, GoogleAIModelParams, GoogleAISafetySetting, GooglePlatformType, GeminiContent, GoogleAIResponseMimeType } from "./types.js";
 import { GoogleAbstractedClient } from "./auth.js";
 import { ChatGoogleBase } from "./chat_models.js";
 import type { GoogleBaseLLMInput, GoogleAISafetyHandler } from "./types.js";
@@ -27,6 +27,7 @@ export declare abstract class GoogleBaseLLM<AuthOptions> extends LLM<BaseLanguag
     stopSequences: string[];
     safetySettings: GoogleAISafetySetting[];
     safetyHandler: GoogleAISafetyHandler;
+    responseMimeType: GoogleAIResponseMimeType;
     protected connection: GoogleLLMConnection<AuthOptions>;
     protected streamedConnection: GoogleLLMConnection<AuthOptions>;
     constructor(fields?: GoogleBaseLLMInput<AuthOptions>);

package/dist/llms.js

@@ -104,6 +104,12 @@ export class GoogleBaseLLM extends LLM {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "responseMimeType", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "text/plain"
+        });
         Object.defineProperty(this, "connection", {
             enumerable: true,
             configurable: true,

package/dist/types.d.ts

@@ -37,6 +37,7 @@ export interface GoogleAISafetySetting {
     category: string;
     threshold: string;
 }
+export type GoogleAIResponseMimeType = "text/plain" | "application/json";
 export interface GoogleAIModelParams {
     /** Model to use */
     model?: string;
@@ -74,6 +75,16 @@ export interface GoogleAIModelParams {
     stopSequences?: string[];
     safetySettings?: GoogleAISafetySetting[];
     convertSystemMessageToHumanContent?: boolean;
+    /**
+     * Available for `gemini-1.5-pro`.
+     * The output format of the generated candidate text.
+     * Supported MIME types:
+     *  - `text/plain`: Text output.
+     *  - `application/json`: JSON response in the candidates.
+     *
+     * @default "text/plain"
+     */
+    responseMimeType?: GoogleAIResponseMimeType;
 }
 /**
  * The params which can be passed to the API at request time.
@@ -160,6 +171,7 @@ export interface GeminiGenerationConfig {
     temperature?: number;
     topP?: number;
     topK?: number;
+    responseMimeType?: GoogleAIResponseMimeType;
 }
 export interface GeminiRequest {
     contents?: GeminiContent[];
@@ -204,4 +216,12 @@ export interface GoogleAISafetyHandler {
 export interface GoogleAISafetyParams {
     safetyHandler?: GoogleAISafetyHandler;
 }
+export type GeminiJsonSchema = Record<string, unknown> & {
+    properties?: Record<string, GeminiJsonSchema>;
+    type: GeminiFunctionSchemaType;
+};
+export interface GeminiJsonSchemaDirty extends GeminiJsonSchema {
+    properties?: Record<string, GeminiJsonSchemaDirty>;
+    additionalProperties?: boolean;
+}
 export {};

package/dist/utils/common.cjs

@@ -28,6 +28,10 @@ function copyAIModelParamsInto(params, options, target) {
         options?.convertSystemMessageToHumanContent ??
             params?.convertSystemMessageToHumanContent ??
             target?.convertSystemMessageToHumanContent;
+    ret.responseMimeType =
+        options?.responseMimeType ??
+            params?.responseMimeType ??
+            target?.responseMimeType;
     ret.tools = options?.tools;
     // Ensure tools are formatted properly for Gemini
     const geminiTools = options?.tools

package/dist/utils/common.js

@@ -24,6 +24,10 @@ export function copyAIModelParamsInto(params, options, target) {
         options?.convertSystemMessageToHumanContent ??
             params?.convertSystemMessageToHumanContent ??
             target?.convertSystemMessageToHumanContent;
+    ret.responseMimeType =
+        options?.responseMimeType ??
+            params?.responseMimeType ??
+            target?.responseMimeType;
     ret.tools = options?.tools;
     // Ensure tools are formatted properly for Gemini
     const geminiTools = options?.tools

package/dist/utils/zod_to_gemini_parameters.cjs

@@ -3,14 +3,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zodToGeminiParameters = void 0;
 const zod_to_json_schema_1 = require("zod-to-json-schema");
+function removeAdditionalProperties(schema) {
+    const updatedSchema = { ...schema };
+    if (Object.hasOwn(updatedSchema, "additionalProperties")) {
+        delete updatedSchema.additionalProperties;
+    }
+    if (updatedSchema.properties) {
+        const keys = Object.keys(updatedSchema.properties);
+        removeProperties(updatedSchema.properties, keys, 0);
+    }
+    return updatedSchema;
+}
+function removeProperties(properties, keys, index) {
+    if (index >= keys.length) {
+        return;
+    }
+    const key = keys[index];
+    // eslint-disable-next-line no-param-reassign
+    properties[key] = removeAdditionalProperties(properties[key]);
+    removeProperties(properties, keys, index + 1);
+}
 function zodToGeminiParameters(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 zodObj) {
     // Gemini doesn't accept either the $schema or additionalProperties
     // attributes, so we need to explicitly remove them.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const jsonSchema = (0, zod_to_json_schema_1.zodToJsonSchema)(zodObj);
-    const { $schema, additionalProperties, ...rest } = jsonSchema;
+    // const jsonSchema = zodToJsonSchema(zodObj) as any;
+    const jsonSchema = removeAdditionalProperties((0, zod_to_json_schema_1.zodToJsonSchema)(zodObj));
+    const { $schema, ...rest } = jsonSchema;
     return rest;
 }
 exports.zodToGeminiParameters = zodToGeminiParameters;

package/dist/utils/zod_to_gemini_parameters.js

@@ -1,12 +1,33 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { zodToJsonSchema } from "zod-to-json-schema";
+function removeAdditionalProperties(schema) {
+    const updatedSchema = { ...schema };
+    if (Object.hasOwn(updatedSchema, "additionalProperties")) {
+        delete updatedSchema.additionalProperties;
+    }
+    if (updatedSchema.properties) {
+        const keys = Object.keys(updatedSchema.properties);
+        removeProperties(updatedSchema.properties, keys, 0);
+    }
+    return updatedSchema;
+}
+function removeProperties(properties, keys, index) {
+    if (index >= keys.length) {
+        return;
+    }
+    const key = keys[index];
+    // eslint-disable-next-line no-param-reassign
+    properties[key] = removeAdditionalProperties(properties[key]);
+    removeProperties(properties, keys, index + 1);
+}
 export function zodToGeminiParameters(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 zodObj) {
     // Gemini doesn't accept either the $schema or additionalProperties
     // attributes, so we need to explicitly remove them.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const jsonSchema = zodToJsonSchema(zodObj);
-    const { $schema, additionalProperties, ...rest } = jsonSchema;
+    // const jsonSchema = zodToJsonSchema(zodObj) as any;
+    const jsonSchema = removeAdditionalProperties(zodToJsonSchema(zodObj));
+    const { $schema, ...rest } = jsonSchema;
     return rest;
 }

package/package.json

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