@langchain/google-common 0.2.10 → 0.2.12

package/dist/chat_models.cjs

@@ -8,6 +8,7 @@ const messages_1 = require("@langchain/core/messages");
 const runnables_1 = require("@langchain/core/runnables");
 const openai_tools_1 = require("@langchain/core/output_parsers/openai_tools");
 const stream_1 = require("@langchain/core/utils/stream");
+const types_1 = require("@langchain/core/utils/types");
 const common_js_1 = require("./utils/common.cjs");
 const connection_js_1 = require("./connection.cjs");
 const gemini_js_1 = require("./utils/gemini.cjs");
@@ -380,7 +381,7 @@ class ChatGoogleBase extends chat_models_1.BaseChatModel {
         let functionName = name ?? "extract";
         let outputParser;
         let tools;
-        if (isZodSchema(schema)) {
+        if ((0, types_1.isInteropZodSchema)(schema)) {
             const jsonSchema = (0, zod_to_gemini_parameters_js_1.schemaToGeminiParameters)(schema);
             tools = [
                 {
@@ -408,10 +409,12 @@ class ChatGoogleBase extends chat_models_1.BaseChatModel {
                 functionName = schema.name;
             }
             else {
+                // We are providing the schema for *just* the parameters, probably
+                const parameters = (0, zod_to_gemini_parameters_js_1.removeAdditionalProperties)(schema);
                 geminiFunctionDefinition = {
                     name: functionName,
                     description: schema.description ?? "",
-                    parameters: schema,
+                    parameters,
                 };
             }
             tools = [
@@ -451,9 +454,3 @@ class ChatGoogleBase extends chat_models_1.BaseChatModel {
     }
 }
 exports.ChatGoogleBase = ChatGoogleBase;
-function isZodSchema(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-input) {
-    // Check for a characteristic method of Zod schemas
-    return typeof input?.parse === "function";
-}

package/dist/chat_models.d.ts

@@ -4,9 +4,9 @@ import { BaseChatModel, LangSmithParams, type BaseChatModelParams } from "@langc
 import { ChatGenerationChunk, ChatResult } from "@langchain/core/outputs";
 import { AIMessageChunk } from "@langchain/core/messages";
 import { BaseLanguageModelInput, StructuredOutputMethodOptions } from "@langchain/core/language_models/base";
-import type { z } from "zod";
 import { Runnable } from "@langchain/core/runnables";
 import { AsyncCaller } from "@langchain/core/utils/async_caller";
+import { InteropZodType } from "@langchain/core/utils/types";
 import { GoogleAIBaseLLMInput, GoogleAIModelParams, GoogleAISafetySetting, GoogleConnectionParams, GooglePlatformType, GoogleAIBaseLanguageModelCallOptions, GoogleAIAPI, GoogleAIAPIParams, GoogleSearchToolSetting } from "./types.js";
 import { AbstractGoogleLLMConnection } from "./connection.js";
 import { GoogleAbstractedClient } from "./auth.js";
@@ -74,8 +74,8 @@ export declare abstract class ChatGoogleBase<AuthOptions> extends BaseChatModel<
     _streamResponseChunks(_messages: BaseMessage[], options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): AsyncGenerator<ChatGenerationChunk>;
     /** @ignore */
     _combineLLMOutput(): never[];
-    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

@@ -5,12 +5,13 @@ import { AIMessageChunk } from "@langchain/core/messages";
 import { RunnablePassthrough, RunnableSequence, } from "@langchain/core/runnables";
 import { JsonOutputKeyToolsParser } from "@langchain/core/output_parsers/openai_tools";
 import { concat } from "@langchain/core/utils/stream";
+import { isInteropZodSchema, } from "@langchain/core/utils/types";
 import { convertToGeminiTools, copyAIModelParams, copyAndValidateModelParamsInto, } from "./utils/common.js";
 import { AbstractGoogleLLMConnection } from "./connection.js";
 import { DefaultGeminiSafetyHandler, getGeminiAPI } from "./utils/gemini.js";
 import { ApiKeyGoogleAuth } from "./auth.js";
 import { ensureParams } from "./utils/failed_handler.js";
-import { schemaToGeminiParameters } from "./utils/zod_to_gemini_parameters.js";
+import { removeAdditionalProperties, schemaToGeminiParameters, } from "./utils/zod_to_gemini_parameters.js";
 export class ChatConnection extends AbstractGoogleLLMConnection {
     constructor(fields, caller, client, streaming) {
         super(fields, caller, client, streaming);
@@ -376,7 +377,7 @@ export class ChatGoogleBase extends BaseChatModel {
         let functionName = name ?? "extract";
         let outputParser;
         let tools;
-        if (isZodSchema(schema)) {
+        if (isInteropZodSchema(schema)) {
             const jsonSchema = schemaToGeminiParameters(schema);
             tools = [
                 {
@@ -404,10 +405,12 @@ export class ChatGoogleBase extends BaseChatModel {
                 functionName = schema.name;
             }
             else {
+                // We are providing the schema for *just* the parameters, probably
+                const parameters = removeAdditionalProperties(schema);
                 geminiFunctionDefinition = {
                     name: functionName,
                     description: schema.description ?? "",
-                    parameters: schema,
+                    parameters,
                 };
             }
             tools = [
@@ -446,9 +449,3 @@ export class ChatGoogleBase extends BaseChatModel {
         });
     }
 }
-function isZodSchema(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-input) {
-    // Check for a characteristic method of Zod schemas
-    return typeof input?.parse === "function";
-}

package/dist/types-anthropic.d.ts

@@ -154,6 +154,7 @@ export interface AnthropicUsage {
     output_tokens: number;
     cache_creation_input_tokens: number | null;
     cache_creation_output_tokens: number | null;
+    cache_read_input_tokens: number | null;
 }
 export type AnthropicResponseData = AnthropicResponseMessage | AnthropicStreamBaseEvent;
 export interface AnthropicResponseMessage {

package/dist/utils/anthropic.cjs

@@ -116,13 +116,23 @@ function getAnthropicAPI(config) {
         };
         return newAIMessageChunk(ret);
     }
-    function messageToGenerationInfo(message) {
+    function messageToUsageMetadata(message) {
         const usage = message?.usage;
+        const inputTokens = usage?.input_tokens ?? 0;
+        const outputTokens = usage?.output_tokens ?? 0;
         const usageMetadata = {
-            input_tokens: usage?.input_tokens ?? 0,
-            output_tokens: usage?.output_tokens ?? 0,
-            total_tokens: (usage?.input_tokens ?? 0) + (usage?.output_tokens ?? 0),
+            input_tokens: inputTokens,
+            output_tokens: outputTokens,
+            total_tokens: inputTokens + outputTokens,
+            input_token_details: {
+                cache_read: usage?.cache_read_input_tokens ?? 0,
+                cache_creation: usage?.cache_creation_input_tokens ?? 0,
+            },
         };
+        return usageMetadata;
+    }
+    function messageToGenerationInfo(message) {
+        const usageMetadata = messageToUsageMetadata(message);
         return {
             usage_metadata: usageMetadata,
             finish_reason: message.stop_reason,

package/dist/utils/anthropic.js

@@ -113,13 +113,23 @@ export function getAnthropicAPI(config) {
         };
         return newAIMessageChunk(ret);
     }
-    function messageToGenerationInfo(message) {
+    function messageToUsageMetadata(message) {
         const usage = message?.usage;
+        const inputTokens = usage?.input_tokens ?? 0;
+        const outputTokens = usage?.output_tokens ?? 0;
         const usageMetadata = {
-            input_tokens: usage?.input_tokens ?? 0,
-            output_tokens: usage?.output_tokens ?? 0,
-            total_tokens: (usage?.input_tokens ?? 0) + (usage?.output_tokens ?? 0),
+            input_tokens: inputTokens,
+            output_tokens: outputTokens,
+            total_tokens: inputTokens + outputTokens,
+            input_token_details: {
+                cache_read: usage?.cache_read_input_tokens ?? 0,
+                cache_creation: usage?.cache_creation_input_tokens ?? 0,
+            },
         };
+        return usageMetadata;
+    }
+    function messageToGenerationInfo(message) {
+        const usageMetadata = messageToUsageMetadata(message);
         return {
             usage_metadata: usageMetadata,
             finish_reason: message.stop_reason,

package/dist/utils/zod_to_gemini_parameters.cjs

@@ -1,9 +1,45 @@
 "use strict";
 /* eslint-disable @typescript-eslint/no-unused-vars */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsonSchemaToGeminiParameters = exports.schemaToGeminiParameters = exports.removeAdditionalProperties = void 0;
+exports.jsonSchemaToGeminiParameters = exports.schemaToGeminiParameters = exports.removeAdditionalProperties = exports.adjustObjectType = 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");
+/* eslint-disable no-param-reassign */
+function adjustObjectType(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+obj
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+) {
+    if (!Array.isArray(obj.type)) {
+        return obj;
+    }
+    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;
+        obj.type = obj.type[typeIndex];
+        obj.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.
+        obj.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");
+    }
+    return obj;
+}
+exports.adjustObjectType = adjustObjectType;
+/* eslint-enable no-param-reassign */
 function removeAdditionalProperties(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 obj) {
@@ -12,31 +48,7 @@ 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");
-            }
-        }
+        adjustObjectType(newObj);
         for (const key in newObj) {
             if (key in newObj) {
                 if (Array.isArray(newObj[key])) {
@@ -57,7 +69,7 @@ function schemaToGeminiParameters(schema) {
     // 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 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_gemini_parameters.d.ts

@@ -1,6 +1,7 @@
-import type { z } from "zod";
-import { type JsonSchema7Type } from "zod-to-json-schema";
+import { InteropZodType } from "@langchain/core/utils/types";
+import { type JsonSchema7Type } from "@langchain/core/utils/json_schema";
 import { GeminiFunctionSchema, GeminiJsonSchema } from "../types.js";
+export declare function adjustObjectType(obj: Record<string, any>): Record<string, any>;
 export declare function removeAdditionalProperties(obj: Record<string, any>): GeminiJsonSchema;
-export declare function schemaToGeminiParameters<RunOutput extends Record<string, any> = Record<string, any>>(schema: z.ZodType<RunOutput> | z.ZodEffects<z.ZodType<RunOutput>> | JsonSchema7Type): GeminiFunctionSchema;
+export declare function schemaToGeminiParameters<RunOutput extends Record<string, any> = Record<string, any>>(schema: InteropZodType<RunOutput> | JsonSchema7Type): GeminiFunctionSchema;
 export declare function jsonSchemaToGeminiParameters(schema: Record<string, any>): GeminiFunctionSchema;

package/dist/utils/zod_to_gemini_parameters.js

@@ -1,6 +1,41 @@
 /* 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";
+/* eslint-disable no-param-reassign */
+export function adjustObjectType(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+obj
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+) {
+    if (!Array.isArray(obj.type)) {
+        return obj;
+    }
+    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;
+        obj.type = obj.type[typeIndex];
+        obj.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.
+        obj.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");
+    }
+    return obj;
+}
+/* eslint-enable no-param-reassign */
 export function removeAdditionalProperties(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 obj) {
@@ -9,31 +44,7 @@ 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");
-            }
-        }
+        adjustObjectType(newObj);
         for (const key in newObj) {
             if (key in newObj) {
                 if (Array.isArray(newObj[key])) {
@@ -53,7 +64,7 @@ export function schemaToGeminiParameters(schema) {
     // 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 jsonSchema = removeAdditionalProperties(isInteropZodSchema(schema) ? toJsonSchema(schema) : schema);
     const { $schema, ...rest } = jsonSchema;
     return rest;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-common",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "Core types and classes for Google services.",
   "type": "module",
   "engines": {
@@ -32,15 +32,14 @@
   "author": "LangChain",
   "license": "MIT",
   "dependencies": {
-    "uuid": "^10.0.0",
-    "zod-to-json-schema": "^3.22.4"
+    "uuid": "^10.0.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",
     "@swc/core": "^1.3.90",
     "@swc/jest": "^0.2.29",
@@ -138,4 +137,4 @@
     "experimental/utils/media_core.d.ts",
     "experimental/utils/media_core.d.cts"
   ]
-}
+}