@langchain/google-common 0.2.3 → 0.2.4

package/dist/chat_models.cjs

@@ -369,7 +369,7 @@ class ChatGoogleBase extends chat_models_1.BaseChatModel {
         let outputParser;
         let tools;
         if (isZodSchema(schema)) {
-            const jsonSchema = (0, zod_to_gemini_parameters_js_1.zodToGeminiParameters)(schema);
+            const jsonSchema = (0, zod_to_gemini_parameters_js_1.schemaToGeminiParameters)(schema);
             tools = [
                 {
                     functionDeclarations: [

package/dist/chat_models.js

@@ -10,7 +10,7 @@ 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 { zodToGeminiParameters } from "./utils/zod_to_gemini_parameters.js";
+import { schemaToGeminiParameters } from "./utils/zod_to_gemini_parameters.js";
 export class ChatConnection extends AbstractGoogleLLMConnection {
     constructor(fields, caller, client, streaming) {
         super(fields, caller, client, streaming);
@@ -365,7 +365,7 @@ export class ChatGoogleBase extends BaseChatModel {
         let outputParser;
         let tools;
         if (isZodSchema(schema)) {
-            const jsonSchema = zodToGeminiParameters(schema);
+            const jsonSchema = schemaToGeminiParameters(schema);
             tools = [
                 {
                     functionDeclarations: [

package/dist/utils/common.cjs

@@ -69,7 +69,7 @@ function convertToGeminiTools(tools) {
                 geminiTools[functionDeclarationsIndex].functionDeclarations.push(...funcs);
             }
             else if ((0, function_calling_1.isLangChainTool)(tool)) {
-                const jsonSchema = (0, zod_to_gemini_parameters_js_1.zodToGeminiParameters)(tool.schema);
+                const jsonSchema = (0, zod_to_gemini_parameters_js_1.schemaToGeminiParameters)(tool.schema);
                 geminiTools[functionDeclarationsIndex].functionDeclarations.push({
                     name: tool.name,
                     description: tool.description ?? `A function available to call.`,

package/dist/utils/common.js

@@ -2,7 +2,7 @@ import { isOpenAITool } from "@langchain/core/language_models/base";
 import { isLangChainTool } from "@langchain/core/utils/function_calling";
 import { isModelGemini, isModelGemma, validateGeminiParams } from "./gemini.js";
 import { GeminiToolAttributes, } from "../types.js";
-import { jsonSchemaToGeminiParameters, zodToGeminiParameters, } from "./zod_to_gemini_parameters.js";
+import { jsonSchemaToGeminiParameters, schemaToGeminiParameters, } from "./zod_to_gemini_parameters.js";
 import { isModelClaude, validateClaudeParams } from "./anthropic.js";
 export function copyAIModelParams(params, options) {
     return copyAIModelParamsInto(params, options, {});
@@ -65,7 +65,7 @@ export function convertToGeminiTools(tools) {
                 geminiTools[functionDeclarationsIndex].functionDeclarations.push(...funcs);
             }
             else if (isLangChainTool(tool)) {
-                const jsonSchema = zodToGeminiParameters(tool.schema);
+                const jsonSchema = schemaToGeminiParameters(tool.schema);
                 geminiTools[functionDeclarationsIndex].functionDeclarations.push({
                     name: tool.name,
                     description: tool.description ?? `A function available to call.`,

package/dist/utils/gemini.cjs

@@ -994,7 +994,7 @@ function getGeminiAPI(config) {
         }
     }
     function structuredToolToFunctionDeclaration(tool) {
-        const jsonSchema = (0, zod_to_gemini_parameters_js_1.zodToGeminiParameters)(tool.schema);
+        const jsonSchema = (0, zod_to_gemini_parameters_js_1.schemaToGeminiParameters)(tool.schema);
         return {
             name: tool.name,
             description: tool.description ?? `A function available to call.`,

package/dist/utils/gemini.js

@@ -5,7 +5,7 @@ import { isLangChainTool } from "@langchain/core/utils/function_calling";
 import { concat } from "@langchain/core/utils/stream";
 import { GoogleAISafetyError } from "./safety.js";
 import { GeminiSearchToolAttributes, } from "../types.js";
-import { zodToGeminiParameters } from "./zod_to_gemini_parameters.js";
+import { schemaToGeminiParameters } from "./zod_to_gemini_parameters.js";
 export class DefaultGeminiSafetyHandler {
     constructor(settings) {
         Object.defineProperty(this, "errorFinish", {
@@ -989,7 +989,7 @@ export function getGeminiAPI(config) {
         }
     }
     function structuredToolToFunctionDeclaration(tool) {
-        const jsonSchema = zodToGeminiParameters(tool.schema);
+        const jsonSchema = schemaToGeminiParameters(tool.schema);
         return {
             name: tool.name,
             description: tool.description ?? `A function available to call.`,

package/dist/utils/zod_to_gemini_parameters.cjs

@@ -1,7 +1,8 @@
 "use strict";
 /* eslint-disable @typescript-eslint/no-unused-vars */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsonSchemaToGeminiParameters = exports.zodToGeminiParameters = exports.removeAdditionalProperties = void 0;
+exports.jsonSchemaToGeminiParameters = exports.schemaToGeminiParameters = exports.removeAdditionalProperties = void 0;
+const types_1 = require("@langchain/core/utils/types");
 const zod_to_json_schema_1 = require("zod-to-json-schema");
 function removeAdditionalProperties(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -26,17 +27,14 @@ obj) {
     return obj;
 }
 exports.removeAdditionalProperties = removeAdditionalProperties;
-function zodToGeminiParameters(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-zodObj) {
+function schemaToGeminiParameters(schema) {
     // 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 = removeAdditionalProperties((0, zod_to_json_schema_1.zodToJsonSchema)(zodObj));
+    const jsonSchema = removeAdditionalProperties((0, types_1.isZodSchema)(schema) ? (0, zod_to_json_schema_1.zodToJsonSchema)(schema) : schema);
     const { $schema, ...rest } = jsonSchema;
     return rest;
 }
-exports.zodToGeminiParameters = zodToGeminiParameters;
+exports.schemaToGeminiParameters = schemaToGeminiParameters;
 function jsonSchemaToGeminiParameters(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 schema) {

package/dist/utils/zod_to_gemini_parameters.d.ts

@@ -1,5 +1,6 @@
 import type { z } from "zod";
+import { type JsonSchema7Type } from "zod-to-json-schema";
 import { GeminiFunctionSchema, GeminiJsonSchema } from "../types.js";
 export declare function removeAdditionalProperties(obj: Record<string, any>): GeminiJsonSchema;
-export declare function zodToGeminiParameters(zodObj: z.ZodType<any>): GeminiFunctionSchema;
+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 jsonSchemaToGeminiParameters(schema: Record<string, any>): GeminiFunctionSchema;

package/dist/utils/zod_to_gemini_parameters.js

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
+import { isZodSchema } from "@langchain/core/utils/types";
 import { zodToJsonSchema } from "zod-to-json-schema";
 export function removeAdditionalProperties(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -22,13 +23,10 @@ obj) {
     }
     return obj;
 }
-export function zodToGeminiParameters(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-zodObj) {
+export function schemaToGeminiParameters(schema) {
     // 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 = removeAdditionalProperties(zodToJsonSchema(zodObj));
+    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.3",
+  "version": "0.2.4",
   "description": "Core types and classes for Google services.",
   "type": "module",
   "engines": {
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
-    "@langchain/core": "workspace:*",
+    "@langchain/core": "0.3.44",
     "@langchain/scripts": ">=0.1.0 <0.2.0",
     "@swc/core": "^1.3.90",
     "@swc/jest": "^0.2.29",
@@ -138,4 +138,4 @@
     "experimental/utils/media_core.d.ts",
     "experimental/utils/media_core.d.cts"
   ]
-}
+}