@langchain/openai 0.0.20 → 0.0.21

package/dist/chat_models.cjs

@@ -762,7 +762,7 @@ class ChatOpenAI extends chat_models_1.BaseChatModel {
             }
         }
         else {
-            const functionName = name ?? "extract";
+            let functionName = name ?? "extract";
             // Is function calling
             if (isZodSchema(schema)) {
                 const asJsonSchema = (0, zod_to_json_schema_1.zodToJsonSchema)(schema);
@@ -791,15 +791,25 @@ class ChatOpenAI extends chat_models_1.BaseChatModel {
                 });
             }
             else {
+                let openAIFunctionDefinition;
+                if (typeof schema.name === "string" &&
+                    typeof schema.parameters === "object" &&
+                    schema.parameters != null) {
+                    openAIFunctionDefinition = schema;
+                    functionName = schema.name;
+                }
+                else {
+                    openAIFunctionDefinition = {
+                        name: functionName,
+                        description: schema.description ?? "",
+                        parameters: schema,
+                    };
+                }
                 llm = this.bind({
                     tools: [
                         {
                             type: "function",
-                            function: {
-                                name: functionName,
-                                description: schema.description,
-                                parameters: schema,
-                            },
+                            function: openAIFunctionDefinition,
                         },
                     ],
                     tool_choice: {

package/dist/chat_models.js

@@ -758,7 +758,7 @@ export class ChatOpenAI extends BaseChatModel {
             }
         }
         else {
-            const functionName = name ?? "extract";
+            let functionName = name ?? "extract";
             // Is function calling
             if (isZodSchema(schema)) {
                 const asJsonSchema = zodToJsonSchema(schema);
@@ -787,15 +787,25 @@ export class ChatOpenAI extends BaseChatModel {
                 });
             }
             else {
+                let openAIFunctionDefinition;
+                if (typeof schema.name === "string" &&
+                    typeof schema.parameters === "object" &&
+                    schema.parameters != null) {
+                    openAIFunctionDefinition = schema;
+                    functionName = schema.name;
+                }
+                else {
+                    openAIFunctionDefinition = {
+                        name: functionName,
+                        description: schema.description ?? "",
+                        parameters: schema,
+                    };
+                }
                 llm = this.bind({
                     tools: [
                         {
                             type: "function",
-                            function: {
-                                name: functionName,
-                                description: schema.description,
-                                parameters: schema,
-                            },
+                            function: openAIFunctionDefinition,
                         },
                     ],
                     tool_choice: {

package/dist/tests/chat_models_structured_output.int.test.js

@@ -87,6 +87,33 @@ test("withStructuredOutput JSON schema function calling", async () => {
     expect("number1" in result).toBe(true);
     expect("number2" in result).toBe(true);
 });
+test("withStructuredOutput OpenAI function definition function calling", async () => {
+    const model = new ChatOpenAI({
+        temperature: 0,
+        modelName: "gpt-4-turbo-preview",
+    });
+    const calculatorSchema = z.object({
+        operation: z.enum(["add", "subtract", "multiply", "divide"]),
+        number1: z.number(),
+        number2: z.number(),
+    });
+    const modelWithStructuredOutput = model.withStructuredOutput({
+        name: "calculator",
+        parameters: zodToJsonSchema(calculatorSchema),
+    });
+    const prompt = ChatPromptTemplate.fromMessages([
+        "system",
+        `You are VERY bad at math and must always use a calculator.`,
+        "human",
+        "Please help me!! What is 2 + 2?",
+    ]);
+    const chain = prompt.pipe(modelWithStructuredOutput);
+    const result = await chain.invoke({});
+    console.log(result);
+    expect("operation" in result).toBe(true);
+    expect("number1" in result).toBe(true);
+    expect("number2" in result).toBe(true);
+});
 test("withStructuredOutput JSON schema JSON mode", async () => {
     const model = new ChatOpenAI({
         temperature: 0,

package/package.json

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