@langchain/openai 0.5.4 → 0.5.5

package/dist/utils/openai.cjs

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatToOpenAIToolChoice = exports.formatToOpenAIAssistantTool = exports.formatToOpenAITool = exports.formatToOpenAIFunction = exports.wrapOpenAIClientError = void 0;
 const openai_1 = require("openai");
-const zod_to_json_schema_1 = require("zod-to-json-schema");
 const function_calling_1 = require("@langchain/core/utils/function_calling");
 Object.defineProperty(exports, "formatToOpenAIFunction", { enumerable: true, get: function () { return function_calling_1.convertToOpenAIFunction; } });
 Object.defineProperty(exports, "formatToOpenAITool", { enumerable: true, get: function () { return function_calling_1.convertToOpenAITool; } });
+const zod_to_json_schema_1 = require("zod-to-json-schema");
+const types_1 = require("@langchain/core/utils/types");
 const errors_js_1 = require("./errors.cjs");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function wrapOpenAIClientError(e) {
@@ -42,7 +43,9 @@ function formatToOpenAIAssistantTool(tool) {
         function: {
             name: tool.name,
             description: tool.description,
-            parameters: (0, zod_to_json_schema_1.zodToJsonSchema)(tool.schema),
+            parameters: (0, types_1.isZodSchema)(tool.schema)
+                ? (0, zod_to_json_schema_1.zodToJsonSchema)(tool.schema)
+                : tool.schema,
         },
     };
 }

package/dist/utils/openai.d.ts

@@ -1,20 +1,9 @@
 import { OpenAI as OpenAIClient } from "openai";
 import type { StructuredToolInterface } from "@langchain/core/tools";
 import { convertToOpenAIFunction, convertToOpenAITool } from "@langchain/core/utils/function_calling";
+import { ToolDefinition } from "@langchain/core/language_models/base";
 export declare function wrapOpenAIClientError(e: any): any;
 export { convertToOpenAIFunction as formatToOpenAIFunction, convertToOpenAITool as formatToOpenAITool, };
-export declare function formatToOpenAIAssistantTool(tool: StructuredToolInterface): {
-    type: string;
-    function: {
-        name: string;
-        description: string;
-        parameters: import("zod-to-json-schema").JsonSchema7Type & {
-            $schema?: string | undefined;
-            definitions?: {
-                [key: string]: import("zod-to-json-schema").JsonSchema7Type;
-            } | undefined;
-        };
-    };
-};
+export declare function formatToOpenAIAssistantTool(tool: StructuredToolInterface): ToolDefinition;
 export type OpenAIToolChoice = OpenAIClient.ChatCompletionToolChoiceOption | "any" | string;
 export declare function formatToOpenAIToolChoice(toolChoice?: OpenAIToolChoice): OpenAIClient.ChatCompletionToolChoiceOption | undefined;

package/dist/utils/openai.js

@@ -1,6 +1,7 @@
 import { APIConnectionTimeoutError, APIUserAbortError, } from "openai";
-import { zodToJsonSchema } from "zod-to-json-schema";
 import { convertToOpenAIFunction, convertToOpenAITool, } from "@langchain/core/utils/function_calling";
+import { zodToJsonSchema } from "zod-to-json-schema";
+import { isZodSchema } from "@langchain/core/utils/types";
 import { addLangChainErrorFields } from "./errors.js";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function wrapOpenAIClientError(e) {
@@ -37,7 +38,9 @@ export function formatToOpenAIAssistantTool(tool) {
         function: {
             name: tool.name,
             description: tool.description,
-            parameters: zodToJsonSchema(tool.schema),
+            parameters: isZodSchema(tool.schema)
+                ? zodToJsonSchema(tool.schema)
+                : tool.schema,
         },
     };
 }

package/dist/utils/tools.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._convertToOpenAITool = void 0;
 const function_calling_1 = require("@langchain/core/utils/function_calling");
-const zod_1 = require("openai/helpers/zod");
+const openai_js_1 = require("./openai.cjs");
 /**
  * Formats a tool in either OpenAI format, or LangChain structured tool format
  * into an OpenAI tool format. If the tool is already in OpenAI format, return without
@@ -19,29 +19,7 @@ function _convertToOpenAITool(
 tool, fields) {
     let toolDef;
     if ((0, function_calling_1.isLangChainTool)(tool)) {
-        const oaiToolDef = (0, zod_1.zodFunction)({
-            name: tool.name,
-            parameters: tool.schema,
-            description: tool.description,
-        });
-        if (!oaiToolDef.function.parameters) {
-            // Fallback to the `convertToOpenAIFunction` util if the parameters are not defined.
-            toolDef = {
-                type: "function",
-                function: (0, function_calling_1.convertToOpenAIFunction)(tool, fields),
-            };
-        }
-        else {
-            toolDef = {
-                type: oaiToolDef.type,
-                function: {
-                    name: oaiToolDef.function.name,
-                    description: oaiToolDef.function.description,
-                    parameters: oaiToolDef.function.parameters,
-                    ...(fields?.strict !== undefined ? { strict: fields.strict } : {}),
-                },
-            };
-        }
+        toolDef = (0, openai_js_1.formatToOpenAITool)(tool);
     }
     else {
         toolDef = tool;

package/dist/utils/tools.js

@@ -1,5 +1,5 @@
-import { convertToOpenAIFunction, isLangChainTool, } from "@langchain/core/utils/function_calling";
-import { zodFunction } from "openai/helpers/zod";
+import { isLangChainTool } from "@langchain/core/utils/function_calling";
+import { formatToOpenAITool } from "./openai.js";
 /**
  * Formats a tool in either OpenAI format, or LangChain structured tool format
  * into an OpenAI tool format. If the tool is already in OpenAI format, return without
@@ -16,29 +16,7 @@ export function _convertToOpenAITool(
 tool, fields) {
     let toolDef;
     if (isLangChainTool(tool)) {
-        const oaiToolDef = zodFunction({
-            name: tool.name,
-            parameters: tool.schema,
-            description: tool.description,
-        });
-        if (!oaiToolDef.function.parameters) {
-            // Fallback to the `convertToOpenAIFunction` util if the parameters are not defined.
-            toolDef = {
-                type: "function",
-                function: convertToOpenAIFunction(tool, fields),
-            };
-        }
-        else {
-            toolDef = {
-                type: oaiToolDef.type,
-                function: {
-                    name: oaiToolDef.function.name,
-                    description: oaiToolDef.function.description,
-                    parameters: oaiToolDef.function.parameters,
-                    ...(fields?.strict !== undefined ? { strict: fields.strict } : {}),
-                },
-            };
-        }
+        toolDef = formatToOpenAITool(tool);
     }
     else {
         toolDef = tool;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/openai",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "OpenAI integrations for LangChain.js",
   "type": "module",
   "engines": {