@langchain/google-genai 0.2.10 → 0.2.11

package/dist/chat_models.cjs

@@ -670,7 +670,7 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
         const generationResult = (0, common_js_1.mapGenerateContentResultToChatResult)(res.response, {
             usageMetadata,
         });
-        // may not have generations in output if there was a refusal for safety reasons
+        // may not have generations in output if there was a refusal for safety reasons, malformed function call, etc.
         if (generationResult.generations?.length > 0) {
             await runManager?.handleLLMNewToken(generationResult.generations[0]?.text ?? "");
         }
@@ -760,7 +760,7 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
         if (method === "functionCalling") {
             let functionName = name ?? "extract";
             let tools;
-            if ((0, types_1.isZodSchema)(schema)) {
+            if ((0, types_1.isInteropZodSchema)(schema)) {
                 const jsonSchema = (0, zod_to_genai_parameters_js_1.schemaToGenerativeAIParameters)(schema);
                 tools = [
                     {

package/dist/chat_models.d.ts

@@ -5,7 +5,7 @@ import { ChatGenerationChunk, ChatResult } from "@langchain/core/outputs";
 import { BaseChatModel, type BaseChatModelCallOptions, type LangSmithParams, type BaseChatModelParams } from "@langchain/core/language_models/chat_models";
 import { BaseLanguageModelInput, StructuredOutputMethodOptions } from "@langchain/core/language_models/base";
 import { Runnable } from "@langchain/core/runnables";
-import type { z } from "zod";
+import { InteropZodType } from "@langchain/core/utils/types";
 import { GoogleGenerativeAIToolType } from "./types.js";
 export type BaseMessageExamplePair = {
     input: BaseMessage;
@@ -534,8 +534,8 @@ export declare class ChatGoogleGenerativeAI extends BaseChatModel<GoogleGenerati
     _generate(messages: BaseMessage[], options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): Promise<ChatResult>;
     _streamResponseChunks(messages: BaseMessage[], options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): AsyncGenerator<ChatGenerationChunk>;
     completionWithRetry(request: string | GenerateContentRequest | (string | GenerativeAIPart)[], options?: this["ParsedCallOptions"]): Promise<import("@google/generative-ai").GenerateContentResult>;
-    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>(outputSchema: z.ZodType<RunOutput> | Record<string, any>, config?: StructuredOutputMethodOptions<false>): Runnable<BaseLanguageModelInput, RunOutput>;
-    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>(outputSchema: z.ZodType<RunOutput> | Record<string, any>, config?: StructuredOutputMethodOptions<true>): Runnable<BaseLanguageModelInput, {
+    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>(outputSchema: InteropZodType<RunOutput> | Record<string, any>, config?: StructuredOutputMethodOptions<false>): Runnable<BaseLanguageModelInput, RunOutput>;
+    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>(outputSchema: InteropZodType<RunOutput> | Record<string, any>, config?: StructuredOutputMethodOptions<true>): Runnable<BaseLanguageModelInput, {
         raw: BaseMessage;
         parsed: RunOutput;
     }>;

package/dist/chat_models.js

@@ -2,7 +2,7 @@ import { GoogleGenerativeAI as GenerativeAI, } from "@google/generative-ai";
 import { getEnvironmentVariable } from "@langchain/core/utils/env";
 import { BaseChatModel, } from "@langchain/core/language_models/chat_models";
 import { RunnablePassthrough, RunnableSequence, } from "@langchain/core/runnables";
-import { isZodSchema } from "@langchain/core/utils/types";
+import { isInteropZodSchema, } from "@langchain/core/utils/types";
 import { JsonOutputParser, } from "@langchain/core/output_parsers";
 import { schemaToGenerativeAIParameters, removeAdditionalProperties, } from "./utils/zod_to_genai_parameters.js";
 import { convertBaseMessagesToContent, convertResponseContentToChatGenerationChunk, mapGenerateContentResultToChatResult, } from "./utils/common.js";
@@ -667,7 +667,7 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
         const generationResult = mapGenerateContentResultToChatResult(res.response, {
             usageMetadata,
         });
-        // may not have generations in output if there was a refusal for safety reasons
+        // may not have generations in output if there was a refusal for safety reasons, malformed function call, etc.
         if (generationResult.generations?.length > 0) {
             await runManager?.handleLLMNewToken(generationResult.generations[0]?.text ?? "");
         }
@@ -757,7 +757,7 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
         if (method === "functionCalling") {
             let functionName = name ?? "extract";
             let tools;
-            if (isZodSchema(schema)) {
+            if (isInteropZodSchema(schema)) {
                 const jsonSchema = schemaToGenerativeAIParameters(schema);
                 tools = [
                     {

package/dist/output_parsers.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleGenerativeAIToolsOutputParser = void 0;
 const output_parsers_1 = require("@langchain/core/output_parsers");
+const types_1 = require("@langchain/core/utils/types");
 class GoogleGenerativeAIToolsOutputParser extends output_parsers_1.BaseLLMOutputParser {
     static lc_name() {
         return "GoogleGenerativeAIToolsOutputParser";
@@ -48,12 +49,12 @@ class GoogleGenerativeAIToolsOutputParser extends output_parsers_1.BaseLLMOutput
         if (this.zodSchema === undefined) {
             return result;
         }
-        const zodParsedResult = await this.zodSchema.safeParseAsync(result);
+        const zodParsedResult = await (0, types_1.interopSafeParseAsync)(this.zodSchema, result);
         if (zodParsedResult.success) {
             return zodParsedResult.data;
         }
         else {
-            throw new output_parsers_1.OutputParserException(`Failed to parse. Text: "${JSON.stringify(result, null, 2)}". Error: ${JSON.stringify(zodParsedResult.error.errors)}`, JSON.stringify(result, null, 2));
+            throw new output_parsers_1.OutputParserException(`Failed to parse. Text: "${JSON.stringify(result, null, 2)}". Error: ${JSON.stringify(zodParsedResult.error.issues)}`, JSON.stringify(result, null, 2));
         }
     }
     async parseResult(generations) {

package/dist/output_parsers.d.ts

@@ -1,8 +1,8 @@
-import type { z } from "zod";
 import { BaseLLMOutputParser } from "@langchain/core/output_parsers";
-import { JsonOutputKeyToolsParserParams } from "@langchain/core/output_parsers/openai_tools";
 import { ChatGeneration } from "@langchain/core/outputs";
-interface GoogleGenerativeAIToolsOutputParserParams<T extends Record<string, any>> extends JsonOutputKeyToolsParserParams<T> {
+import { InteropZodType } from "@langchain/core/utils/types";
+import { JsonOutputKeyToolsParserParamsInterop } from "@langchain/core/output_parsers/openai_tools";
+interface GoogleGenerativeAIToolsOutputParserParams<T extends Record<string, any>> extends JsonOutputKeyToolsParserParamsInterop<T> {
 }
 export declare class GoogleGenerativeAIToolsOutputParser<T extends Record<string, any> = Record<string, any>> extends BaseLLMOutputParser<T> {
     static lc_name(): string;
@@ -12,7 +12,7 @@ export declare class GoogleGenerativeAIToolsOutputParser<T extends Record<string
     keyName: string;
     /** Whether to return only the first tool call. */
     returnSingle: boolean;
-    zodSchema?: z.ZodType<T>;
+    zodSchema?: InteropZodType<T>;
     constructor(params: GoogleGenerativeAIToolsOutputParserParams<T>);
     protected _validateResult(result: unknown): Promise<T>;
     parseResult(generations: ChatGeneration[]): Promise<T>;

package/dist/output_parsers.js

@@ -1,4 +1,5 @@
 import { BaseLLMOutputParser, OutputParserException, } from "@langchain/core/output_parsers";
+import { interopSafeParseAsync, } from "@langchain/core/utils/types";
 export class GoogleGenerativeAIToolsOutputParser extends BaseLLMOutputParser {
     static lc_name() {
         return "GoogleGenerativeAIToolsOutputParser";
@@ -45,12 +46,12 @@ export class GoogleGenerativeAIToolsOutputParser extends BaseLLMOutputParser {
         if (this.zodSchema === undefined) {
             return result;
         }
-        const zodParsedResult = await this.zodSchema.safeParseAsync(result);
+        const zodParsedResult = await interopSafeParseAsync(this.zodSchema, result);
         if (zodParsedResult.success) {
             return zodParsedResult.data;
         }
         else {
-            throw new OutputParserException(`Failed to parse. Text: "${JSON.stringify(result, null, 2)}". Error: ${JSON.stringify(zodParsedResult.error.errors)}`, JSON.stringify(result, null, 2));
+            throw new OutputParserException(`Failed to parse. Text: "${JSON.stringify(result, null, 2)}". Error: ${JSON.stringify(zodParsedResult.error.issues)}`, JSON.stringify(result, null, 2));
         }
     }
     async parseResult(generations) {

package/dist/utils/common.cjs

@@ -390,10 +390,13 @@ function mapGenerateContentResultToChatResult(response, extra) {
     const [candidate] = response.candidates;
     const { content: candidateContent, ...generationInfo } = candidate;
     let content;
-    if (candidateContent?.parts.length === 1 && candidateContent.parts[0].text) {
+    if (Array.isArray(candidateContent?.parts) &&
+        candidateContent.parts.length === 1 &&
+        candidateContent.parts[0].text) {
         content = candidateContent.parts[0].text;
     }
-    else {
+    else if (Array.isArray(candidateContent?.parts) &&
+        candidateContent.parts.length > 0) {
         content = candidateContent.parts.map((p) => {
             if ("text" in p) {
                 return {
@@ -416,17 +419,22 @@ function mapGenerateContentResultToChatResult(response, extra) {
             return p;
         });
     }
+    else {
+        // no content returned - likely due to abnormal stop reason, e.g. malformed function call
+        content = [];
+    }
     let text = "";
     if (typeof content === "string") {
         text = content;
     }
-    else if ("text" in content[0]) {
-        text = content[0].text;
+    else if (Array.isArray(content) && content.length > 0) {
+        const block = content.find((b) => "text" in b);
+        text = block?.text ?? text;
     }
     const generation = {
         text,
         message: new messages_1.AIMessage({
-            content,
+            content: content ?? "",
             tool_calls: functionCalls?.map((fc) => {
                 return {
                     ...fc,
@@ -462,11 +470,11 @@ function convertResponseContentToChatGenerationChunk(response, extra) {
     const { content: candidateContent, ...generationInfo } = candidate;
     let content;
     // Checks if some parts do not have text. If false, it means that the content is a string.
-    if (candidateContent?.parts &&
+    if (Array.isArray(candidateContent?.parts) &&
         candidateContent.parts.every((p) => "text" in p)) {
         content = candidateContent.parts.map((p) => p.text).join("");
     }
-    else if (candidateContent.parts) {
+    else if (Array.isArray(candidateContent?.parts)) {
         content = candidateContent.parts.map((p) => {
             if ("text" in p) {
                 return {
@@ -489,12 +497,17 @@ function convertResponseContentToChatGenerationChunk(response, extra) {
             return p;
         });
     }
+    else {
+        // no content returned - likely due to abnormal stop reason, e.g. malformed function call
+        content = [];
+    }
     let text = "";
     if (content && typeof content === "string") {
         text = content;
     }
-    else if (content && typeof content === "object" && "text" in content[0]) {
-        text = content[0].text;
+    else if (Array.isArray(content)) {
+        const block = content.find((b) => "text" in b);
+        text = block?.text ?? "";
     }
     const toolCallChunks = [];
     if (functionCalls) {

package/dist/utils/common.js

@@ -383,10 +383,13 @@ export function mapGenerateContentResultToChatResult(response, extra) {
     const [candidate] = response.candidates;
     const { content: candidateContent, ...generationInfo } = candidate;
     let content;
-    if (candidateContent?.parts.length === 1 && candidateContent.parts[0].text) {
+    if (Array.isArray(candidateContent?.parts) &&
+        candidateContent.parts.length === 1 &&
+        candidateContent.parts[0].text) {
         content = candidateContent.parts[0].text;
     }
-    else {
+    else if (Array.isArray(candidateContent?.parts) &&
+        candidateContent.parts.length > 0) {
         content = candidateContent.parts.map((p) => {
             if ("text" in p) {
                 return {
@@ -409,17 +412,22 @@ export function mapGenerateContentResultToChatResult(response, extra) {
             return p;
         });
     }
+    else {
+        // no content returned - likely due to abnormal stop reason, e.g. malformed function call
+        content = [];
+    }
     let text = "";
     if (typeof content === "string") {
         text = content;
     }
-    else if ("text" in content[0]) {
-        text = content[0].text;
+    else if (Array.isArray(content) && content.length > 0) {
+        const block = content.find((b) => "text" in b);
+        text = block?.text ?? text;
     }
     const generation = {
         text,
         message: new AIMessage({
-            content,
+            content: content ?? "",
             tool_calls: functionCalls?.map((fc) => {
                 return {
                     ...fc,
@@ -454,11 +462,11 @@ export function convertResponseContentToChatGenerationChunk(response, extra) {
     const { content: candidateContent, ...generationInfo } = candidate;
     let content;
     // Checks if some parts do not have text. If false, it means that the content is a string.
-    if (candidateContent?.parts &&
+    if (Array.isArray(candidateContent?.parts) &&
         candidateContent.parts.every((p) => "text" in p)) {
         content = candidateContent.parts.map((p) => p.text).join("");
     }
-    else if (candidateContent.parts) {
+    else if (Array.isArray(candidateContent?.parts)) {
         content = candidateContent.parts.map((p) => {
             if ("text" in p) {
                 return {
@@ -481,12 +489,17 @@ export function convertResponseContentToChatGenerationChunk(response, extra) {
             return p;
         });
     }
+    else {
+        // no content returned - likely due to abnormal stop reason, e.g. malformed function call
+        content = [];
+    }
     let text = "";
     if (content && typeof content === "string") {
         text = content;
     }
-    else if (content && typeof content === "object" && "text" in content[0]) {
-        text = content[0].text;
+    else if (Array.isArray(content)) {
+        const block = content.find((b) => "text" in b);
+        text = block?.text ?? "";
     }
     const toolCallChunks = [];
     if (functionCalls) {

package/dist/utils/zod_to_genai_parameters.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonSchemaToGeminiParameters = exports.schemaToGenerativeAIParameters = exports.removeAdditionalProperties = void 0;
 const types_1 = require("@langchain/core/utils/types");
-const zod_to_json_schema_1 = require("zod-to-json-schema");
+const json_schema_1 = require("@langchain/core/utils/json_schema");
 function removeAdditionalProperties(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 obj) {
@@ -36,7 +36,7 @@ exports.removeAdditionalProperties = removeAdditionalProperties;
 function schemaToGenerativeAIParameters(schema) {
     // GenerativeAI doesn't accept either the $schema or additionalProperties
     // attributes, so we need to explicitly remove them.
-    const jsonSchema = removeAdditionalProperties((0, types_1.isZodSchema)(schema) ? (0, zod_to_json_schema_1.zodToJsonSchema)(schema) : schema);
+    const jsonSchema = removeAdditionalProperties((0, types_1.isInteropZodSchema)(schema) ? (0, json_schema_1.toJsonSchema)(schema) : schema);
     const { $schema, ...rest } = jsonSchema;
     return rest;
 }

package/dist/utils/zod_to_genai_parameters.d.ts

@@ -1,6 +1,6 @@
-import type { z } from "zod";
 import { type FunctionDeclarationSchema as GenerativeAIFunctionDeclarationSchema, type SchemaType as FunctionDeclarationSchemaType } from "@google/generative-ai";
-import { type JsonSchema7Type } from "zod-to-json-schema";
+import { InteropZodType } from "@langchain/core/utils/types";
+import { type JsonSchema7Type } from "@langchain/core/utils/json_schema";
 export interface GenerativeAIJsonSchema extends Record<string, unknown> {
     properties?: Record<string, GenerativeAIJsonSchema>;
     type: FunctionDeclarationSchemaType;
@@ -10,5 +10,5 @@ export interface GenerativeAIJsonSchemaDirty extends GenerativeAIJsonSchema {
     additionalProperties?: boolean;
 }
 export declare function removeAdditionalProperties(obj: Record<string, any>): GenerativeAIJsonSchema;
-export declare function schemaToGenerativeAIParameters<RunOutput extends Record<string, any> = Record<string, any>>(schema: z.ZodType<RunOutput> | z.ZodEffects<z.ZodType<RunOutput>> | JsonSchema7Type): GenerativeAIFunctionDeclarationSchema;
+export declare function schemaToGenerativeAIParameters<RunOutput extends Record<string, any> = Record<string, any>>(schema: InteropZodType<RunOutput> | JsonSchema7Type): GenerativeAIFunctionDeclarationSchema;
 export declare function jsonSchemaToGeminiParameters(schema: Record<string, any>): GenerativeAIFunctionDeclarationSchema;

package/dist/utils/zod_to_genai_parameters.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { isZodSchema } from "@langchain/core/utils/types";
-import { zodToJsonSchema } from "zod-to-json-schema";
+import { isInteropZodSchema, } from "@langchain/core/utils/types";
+import { toJsonSchema, } from "@langchain/core/utils/json_schema";
 export function removeAdditionalProperties(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 obj) {
@@ -32,7 +32,7 @@ obj) {
 export function schemaToGenerativeAIParameters(schema) {
     // GenerativeAI doesn't accept either the $schema or additionalProperties
     // attributes, so we need to explicitly remove them.
-    const jsonSchema = removeAdditionalProperties(isZodSchema(schema) ? zodToJsonSchema(schema) : schema);
+    const jsonSchema = removeAdditionalProperties(isInteropZodSchema(schema) ? toJsonSchema(schema) : schema);
     const { $schema, ...rest } = jsonSchema;
     return rest;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-genai",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "Google Generative AI integration for LangChain.js",
   "type": "module",
   "engines": {
@@ -36,15 +36,14 @@
   "license": "MIT",
   "dependencies": {
     "@google/generative-ai": "^0.24.0",
-    "uuid": "^11.1.0",
-    "zod-to-json-schema": "^3.22.4"
+    "uuid": "^11.1.0"
   },
   "peerDependencies": {
-    "@langchain/core": ">=0.3.55 <0.4.0"
+    "@langchain/core": ">=0.3.58 <0.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
-    "@langchain/core": "0.3.57",
+    "@langchain/core": "workspace:*",
     "@langchain/scripts": ">=0.1.0 <0.2.0",
     "@langchain/standard-tests": "0.0.0",
     "@swc/core": "^1.3.90",
@@ -68,7 +67,7 @@
     "rollup": "^4.5.2",
     "ts-jest": "^29.1.0",
     "typescript": "<5.2.0",
-    "zod": "^3.22.4"
+    "zod": "^3.25.32"
   },
   "publishConfig": {
     "access": "public"
@@ -92,4 +91,4 @@
     "index.d.ts",
     "index.d.cts"
   ]
-}
+}