@langchain/anthropic 0.1.3 → 0.1.4

package/dist/experimental/tests/tool_calling.int.test.js

@@ -190,12 +190,11 @@ test("Test ChatAnthropic withStructuredOutput", async () => {
     const runnable = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         maxRetries: 0,
-    }).withStructuredOutput({
-        schema: z.object({
-            name: z.string().describe("The name of a person"),
-            height: z.number().describe("The person's height"),
-            hairColor: z.optional(z.string()).describe("The person's hair color"),
-        }),
+    }).withStructuredOutput(z.object({
+        name: z.string().describe("The name of a person"),
+        height: z.number().describe("The person's height"),
+        hairColor: z.optional(z.string()).describe("The person's hair color"),
+    }), {
         name: "person",
     });
     const message = new HumanMessage("Alex is 5 feet tall. Alex is blonde.");
@@ -207,15 +206,13 @@ test("Test ChatAnthropic withStructuredOutput on a single array item", async ()
     const runnable = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         maxRetries: 0,
-    }).withStructuredOutput({
-        schema: z.object({
-            people: z.array(z.object({
-                name: z.string().describe("The name of a person"),
-                height: z.number().describe("The person's height"),
-                hairColor: z.optional(z.string()).describe("The person's hair color"),
-            })),
-        }),
-    });
+    }).withStructuredOutput(z.object({
+        people: z.array(z.object({
+            name: z.string().describe("The name of a person"),
+            height: z.number().describe("The person's height"),
+            hairColor: z.optional(z.string()).describe("The person's hair color"),
+        })),
+    }));
     const message = new HumanMessage("Alex is 5 feet tall. Alex is blonde.");
     const res = await runnable.invoke([message]);
     console.log(JSON.stringify(res, null, 2));
@@ -227,25 +224,24 @@ test("Test ChatAnthropic withStructuredOutput on a single array item", async ()
     const runnable = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         maxRetries: 0,
-    }).withStructuredOutput({
-        schema: z.object({
-            sender: z
-                .optional(z.string())
-                .describe("The sender's name, if available"),
-            sender_phone_number: z
-                .optional(z.string())
-                .describe("The sender's phone number, if available"),
-            sender_address: z
-                .optional(z.string())
-                .describe("The sender's address, if available"),
-            action_items: z
-                .array(z.string())
-                .describe("A list of action items requested by the email"),
-            topic: z
-                .string()
-                .describe("High level description of what the email is about"),
-            tone: z.enum(["positive", "negative"]).describe("The tone of the email."),
-        }),
+    }).withStructuredOutput(z.object({
+        sender: z
+            .optional(z.string())
+            .describe("The sender's name, if available"),
+        sender_phone_number: z
+            .optional(z.string())
+            .describe("The sender's phone number, if available"),
+        sender_address: z
+            .optional(z.string())
+            .describe("The sender's address, if available"),
+        action_items: z
+            .array(z.string())
+            .describe("A list of action items requested by the email"),
+        topic: z
+            .string()
+            .describe("High level description of what the email is about"),
+        tone: z.enum(["positive", "negative"]).describe("The tone of the email."),
+    }), {
         name: "Email",
     });
     const prompt = ChatPromptTemplate.fromMessages([

package/dist/experimental/tool_calling.cjs

@@ -184,7 +184,24 @@ class ChatAnthropicTools extends chat_models_1.BaseChatModel {
     _llmType() {
         return "anthropic_tool_calling";
     }
-    withStructuredOutput({ schema, name, method, includeRaw, }) {
+    withStructuredOutput(outputSchema, config) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        let schema;
+        let name;
+        let method;
+        let includeRaw;
+        if (isStructuredOutputMethodParams(outputSchema)) {
+            schema = outputSchema.schema;
+            name = outputSchema.name;
+            method = outputSchema.method;
+            includeRaw = outputSchema.includeRaw;
+        }
+        else {
+            schema = outputSchema;
+            name = config?.name;
+            method = config?.method;
+            includeRaw = config?.includeRaw;
+        }
         if (method === "jsonMode") {
             throw new Error(`Anthropic only supports "functionCalling" as a method.`);
         }
@@ -258,3 +275,11 @@ function isZodSchema(input) {
     // Check for a characteristic method of Zod schemas
     return typeof input?.parse === "function";
 }
+function isStructuredOutputMethodParams(x
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+) {
+    return (x !== undefined &&
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        typeof x.schema ===
+            "object");
+}

package/dist/experimental/tool_calling.d.ts

@@ -3,8 +3,9 @@ import { ChatGenerationChunk, ChatResult } from "@langchain/core/outputs";
 import { BaseChatModel, BaseChatModelParams } from "@langchain/core/language_models/chat_models";
 import { CallbackManagerForLLMRun } from "@langchain/core/callbacks/manager";
 import { BasePromptTemplate } from "@langchain/core/prompts";
-import { BaseLanguageModelCallOptions, BaseLanguageModelInput, StructuredOutputMethodParams, ToolDefinition } from "@langchain/core/language_models/base";
+import { BaseLanguageModelCallOptions, BaseLanguageModelInput, StructuredOutputMethodParams, StructuredOutputMethodOptions, ToolDefinition } from "@langchain/core/language_models/base";
 import { Runnable } from "@langchain/core/runnables";
+import { z } from "zod";
 import { type AnthropicInput } from "../chat_models.js";
 export interface ChatAnthropicToolsCallOptions extends BaseLanguageModelCallOptions {
     tools?: ToolDefinition[];
@@ -43,8 +44,8 @@ export declare class ChatAnthropicTools extends BaseChatModel<ChatAnthropicTools
     }): Promise<ChatResult>;
     _generate(messages: BaseMessage[], options: this["ParsedCallOptions"], _runManager?: CallbackManagerForLLMRun | undefined): Promise<ChatResult>;
     _llmType(): string;
-    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>({ schema, name, method, includeRaw, }: StructuredOutputMethodParams<RunOutput, false>): Runnable<BaseLanguageModelInput, RunOutput>;
-    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>({ schema, name, method, includeRaw, }: StructuredOutputMethodParams<RunOutput, true>): Runnable<BaseLanguageModelInput, {
+    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>(outputSchema: StructuredOutputMethodParams<RunOutput, false> | z.ZodType<RunOutput> | Record<string, any>, config?: StructuredOutputMethodOptions<false>): Runnable<BaseLanguageModelInput, RunOutput>;
+    withStructuredOutput<RunOutput extends Record<string, any> = Record<string, any>>(outputSchema: StructuredOutputMethodParams<RunOutput, true> | z.ZodType<RunOutput> | Record<string, any>, config?: StructuredOutputMethodOptions<true>): Runnable<BaseLanguageModelInput, {
         raw: BaseMessage;
         parsed: RunOutput;
     }>;

package/dist/experimental/tool_calling.js

@@ -181,7 +181,24 @@ export class ChatAnthropicTools extends BaseChatModel {
     _llmType() {
         return "anthropic_tool_calling";
     }
-    withStructuredOutput({ schema, name, method, includeRaw, }) {
+    withStructuredOutput(outputSchema, config) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        let schema;
+        let name;
+        let method;
+        let includeRaw;
+        if (isStructuredOutputMethodParams(outputSchema)) {
+            schema = outputSchema.schema;
+            name = outputSchema.name;
+            method = outputSchema.method;
+            includeRaw = outputSchema.includeRaw;
+        }
+        else {
+            schema = outputSchema;
+            name = config?.name;
+            method = config?.method;
+            includeRaw = config?.includeRaw;
+        }
         if (method === "jsonMode") {
             throw new Error(`Anthropic only supports "functionCalling" as a method.`);
         }
@@ -254,3 +271,11 @@ function isZodSchema(input) {
     // Check for a characteristic method of Zod schemas
     return typeof input?.parse === "function";
 }
+function isStructuredOutputMethodParams(x
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+) {
+    return (x !== undefined &&
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        typeof x.schema ===
+            "object");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/anthropic",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Anthropic integrations for LangChain.js",
   "type": "module",
   "engines": {