@langchain/google-genai 0.2.2 → 0.2.4

package/dist/chat_models.cjs

@@ -756,7 +756,7 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
             let functionName = name ?? "extract";
             let tools;
             if ((0, types_1.isZodSchema)(schema)) {
-                const jsonSchema = (0, zod_to_genai_parameters_js_1.zodToGenerativeAIParameters)(schema);
+                const jsonSchema = (0, zod_to_genai_parameters_js_1.schemaToGenerativeAIParameters)(schema);
                 tools = [
                     {
                         functionDeclarations: [
@@ -806,9 +806,7 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
             });
         }
         else {
-            const jsonSchema = (0, types_1.isZodSchema)(schema)
-                ? (0, zod_to_genai_parameters_js_1.zodToGenerativeAIParameters)(schema)
-                : (0, zod_to_genai_parameters_js_1.removeAdditionalProperties)(schema);
+            const jsonSchema = (0, zod_to_genai_parameters_js_1.schemaToGenerativeAIParameters)(schema);
             llm = this.bind({
                 responseSchema: jsonSchema,
             });

package/dist/chat_models.js

@@ -4,7 +4,7 @@ import { BaseChatModel, } from "@langchain/core/language_models/chat_models";
 import { RunnablePassthrough, RunnableSequence, } from "@langchain/core/runnables";
 import { isZodSchema } from "@langchain/core/utils/types";
 import { JsonOutputParser, } from "@langchain/core/output_parsers";
-import { zodToGenerativeAIParameters, removeAdditionalProperties, } from "./utils/zod_to_genai_parameters.js";
+import { schemaToGenerativeAIParameters, removeAdditionalProperties, } from "./utils/zod_to_genai_parameters.js";
 import { convertBaseMessagesToContent, convertResponseContentToChatGenerationChunk, mapGenerateContentResultToChatResult, } from "./utils/common.js";
 import { GoogleGenerativeAIToolsOutputParser } from "./output_parsers.js";
 import { convertToolsToGenAI } from "./utils/tools.js";
@@ -753,7 +753,7 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
             let functionName = name ?? "extract";
             let tools;
             if (isZodSchema(schema)) {
-                const jsonSchema = zodToGenerativeAIParameters(schema);
+                const jsonSchema = schemaToGenerativeAIParameters(schema);
                 tools = [
                     {
                         functionDeclarations: [
@@ -803,9 +803,7 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
             });
         }
         else {
-            const jsonSchema = isZodSchema(schema)
-                ? zodToGenerativeAIParameters(schema)
-                : removeAdditionalProperties(schema);
+            const jsonSchema = schemaToGenerativeAIParameters(schema);
             llm = this.bind({
                 responseSchema: jsonSchema,
             });

package/dist/utils/common.cjs

@@ -30,6 +30,7 @@ function convertAuthorToRole(author) {
          *  Note: Gemini currently is not supporting system messages
          *  we will convert them to human messages and merge with following
          * */
+        case "supervisor":
         case "ai":
         case "model": // getMessageAuthor returns message.name. code ex.: return message.name ?? type;
             return "model";
@@ -389,7 +390,7 @@ function convertToGenerativeAITools(tools) {
         {
             functionDeclarations: tools.map((tool) => {
                 if ((0, function_calling_1.isLangChainTool)(tool)) {
-                    const jsonSchema = (0, zod_to_genai_parameters_js_1.zodToGenerativeAIParameters)(tool.schema);
+                    const jsonSchema = (0, zod_to_genai_parameters_js_1.schemaToGenerativeAIParameters)(tool.schema);
                     if (jsonSchema.type === "object" &&
                         "properties" in jsonSchema &&
                         Object.keys(jsonSchema.properties).length === 0) {

package/dist/utils/common.js

@@ -3,7 +3,7 @@ import { ChatGenerationChunk, } from "@langchain/core/outputs";
 import { isLangChainTool } from "@langchain/core/utils/function_calling";
 import { isOpenAITool } from "@langchain/core/language_models/base";
 import { v4 as uuidv4 } from "uuid";
-import { jsonSchemaToGeminiParameters, zodToGenerativeAIParameters, } from "./zod_to_genai_parameters.js";
+import { jsonSchemaToGeminiParameters, schemaToGenerativeAIParameters, } from "./zod_to_genai_parameters.js";
 export function getMessageAuthor(message) {
     const type = message._getType();
     if (ChatMessage.isInstance(message)) {
@@ -26,6 +26,7 @@ export function convertAuthorToRole(author) {
          *  Note: Gemini currently is not supporting system messages
          *  we will convert them to human messages and merge with following
          * */
+        case "supervisor":
         case "ai":
         case "model": // getMessageAuthor returns message.name. code ex.: return message.name ?? type;
             return "model";
@@ -380,7 +381,7 @@ export function convertToGenerativeAITools(tools) {
         {
             functionDeclarations: tools.map((tool) => {
                 if (isLangChainTool(tool)) {
-                    const jsonSchema = zodToGenerativeAIParameters(tool.schema);
+                    const jsonSchema = schemaToGenerativeAIParameters(tool.schema);
                     if (jsonSchema.type === "object" &&
                         "properties" in jsonSchema &&
                         Object.keys(jsonSchema.properties).length === 0) {

package/dist/utils/zod_to_genai_parameters.cjs

@@ -1,7 +1,8 @@
 "use strict";
 /* eslint-disable @typescript-eslint/no-unused-vars */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsonSchemaToGeminiParameters = exports.zodToGenerativeAIParameters = exports.removeAdditionalProperties = void 0;
+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");
 function removeAdditionalProperties(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -32,16 +33,14 @@ obj) {
     return obj;
 }
 exports.removeAdditionalProperties = removeAdditionalProperties;
-function zodToGenerativeAIParameters(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-zodObj) {
+function schemaToGenerativeAIParameters(schema) {
     // GenerativeAI doesn't accept either the $schema or additionalProperties
     // attributes, so we need to explicitly remove them.
-    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.zodToGenerativeAIParameters = zodToGenerativeAIParameters;
+exports.schemaToGenerativeAIParameters = schemaToGenerativeAIParameters;
 function jsonSchemaToGeminiParameters(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 schema) {

package/dist/utils/zod_to_genai_parameters.d.ts

@@ -1,5 +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";
 export interface GenerativeAIJsonSchema extends Record<string, unknown> {
     properties?: Record<string, GenerativeAIJsonSchema>;
     type: FunctionDeclarationSchemaType;
@@ -9,5 +10,5 @@ export interface GenerativeAIJsonSchemaDirty extends GenerativeAIJsonSchema {
     additionalProperties?: boolean;
 }
 export declare function removeAdditionalProperties(obj: Record<string, any>): GenerativeAIJsonSchema;
-export declare function zodToGenerativeAIParameters(zodObj: z.ZodType<any>): GenerativeAIFunctionDeclarationSchema;
+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 jsonSchemaToGeminiParameters(schema: Record<string, any>): GenerativeAIFunctionDeclarationSchema;

package/dist/utils/zod_to_genai_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
@@ -28,12 +29,10 @@ obj) {
     }
     return obj;
 }
-export function zodToGenerativeAIParameters(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-zodObj) {
+export function schemaToGenerativeAIParameters(schema) {
     // GenerativeAI doesn't accept either the $schema or additionalProperties
     // attributes, so we need to explicitly remove them.
-    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-genai",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Google Generative AI integration for LangChain.js",
   "type": "module",
   "engines": {
@@ -64,7 +64,7 @@
     "jest": "^29.5.0",
     "jest-environment-node": "^29.6.4",
     "prettier": "^2.8.3",
-    "release-it": "^17.6.0",
+    "release-it": "^18.1.2",
     "rollup": "^4.5.2",
     "ts-jest": "^29.1.0",
     "typescript": "<5.2.0",