@langchain/anthropic 0.1.10 → 0.1.12-rc.0

package/dist/chat_models.cjs

@@ -400,7 +400,7 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
                     content: message.content,
                 };
             }
-            else if ("type" in message.content) {
+            else {
                 const contentBlocks = message.content.map((contentPart) => {
                     if (contentPart.type === "image_url") {
                         let source;
@@ -422,6 +422,14 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
                             text: contentPart.text,
                         };
                     }
+                    else if (contentPart.type === "tool_use" ||
+                        contentPart.type === "tool_result") {
+                        // TODO: Fix when SDK types are fixed
+                        return {
+                            ...contentPart,
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        };
+                    }
                     else {
                         throw new Error("Unsupported message content format");
                     }
@@ -431,9 +439,6 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
                     content: contentBlocks,
                 };
             }
-            else {
-                throw new Error("Unsupported message content format");
-            }
         });
         return {
             messages: formattedMessages,

package/dist/chat_models.d.ts

@@ -144,7 +144,7 @@ export declare class ChatAnthropicMessages<CallOptions extends ChatAnthropicCall
         metadata?: Anthropic.Messages.MessageCreateParams.Metadata | undefined;
         stream?: boolean | undefined;
         max_tokens: number;
-        model: (string & {}) | "claude-3-opus-20240229" | "claude-3-sonnet-20240229" | "claude-2.1'" | "claude-2.0" | "claude-instant-1.2";
+        model: "claude-2.1" | (string & {}) | "claude-3-opus-20240229" | "claude-3-sonnet-20240229" | "claude-3-haiku-20240307" | "claude-2.0" | "claude-instant-1.2";
         stop_sequences?: string[] | undefined;
         temperature?: number | undefined;
         top_k?: number | undefined;
@@ -159,7 +159,7 @@ export declare class ChatAnthropicMessages<CallOptions extends ChatAnthropicCall
         metadata?: Anthropic.Messages.MessageCreateParams.Metadata | undefined;
         stream?: boolean | undefined;
         max_tokens: number;
-        model: (string & {}) | "claude-3-opus-20240229" | "claude-3-sonnet-20240229" | "claude-2.1'" | "claude-2.0" | "claude-instant-1.2";
+        model: "claude-2.1" | (string & {}) | "claude-3-opus-20240229" | "claude-3-sonnet-20240229" | "claude-3-haiku-20240307" | "claude-2.0" | "claude-instant-1.2";
         stop_sequences?: string[] | undefined;
         temperature?: number | undefined;
         top_k?: number | undefined;

package/dist/chat_models.js

@@ -397,7 +397,7 @@ export class ChatAnthropicMessages extends BaseChatModel {
                     content: message.content,
                 };
             }
-            else if ("type" in message.content) {
+            else {
                 const contentBlocks = message.content.map((contentPart) => {
                     if (contentPart.type === "image_url") {
                         let source;
@@ -419,6 +419,14 @@ export class ChatAnthropicMessages extends BaseChatModel {
                             text: contentPart.text,
                         };
                     }
+                    else if (contentPart.type === "tool_use" ||
+                        contentPart.type === "tool_result") {
+                        // TODO: Fix when SDK types are fixed
+                        return {
+                            ...contentPart,
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        };
+                    }
                     else {
                         throw new Error("Unsupported message content format");
                     }
@@ -428,9 +436,6 @@ export class ChatAnthropicMessages extends BaseChatModel {
                     content: contentBlocks,
                 };
             }
-            else {
-                throw new Error("Unsupported message content format");
-            }
         });
         return {
             messages: formattedMessages,

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

@@ -6,7 +6,7 @@ import { zodToJsonSchema } from "zod-to-json-schema";
 import { HumanMessage } from "@langchain/core/messages";
 import { ChatPromptTemplate } from "@langchain/core/prompts";
 import { ChatAnthropicTools } from "../tool_calling.js";
-test("Test ChatAnthropicTools", async () => {
+test.skip("Test ChatAnthropicTools", async () => {
     const chat = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         maxRetries: 0,
@@ -15,7 +15,7 @@ test("Test ChatAnthropicTools", async () => {
     const res = await chat.invoke([message]);
     console.log(JSON.stringify(res));
 });
-test("Test ChatAnthropicTools streaming", async () => {
+test.skip("Test ChatAnthropicTools streaming", async () => {
     const chat = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         maxRetries: 0,
@@ -29,7 +29,7 @@ test("Test ChatAnthropicTools streaming", async () => {
     }
     expect(chunks.length).toBeGreaterThan(1);
 });
-test("Test ChatAnthropicTools with tools", async () => {
+test.skip("Test ChatAnthropicTools with tools", async () => {
     const chat = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         temperature: 0.1,
@@ -65,7 +65,7 @@ test("Test ChatAnthropicTools with tools", async () => {
     expect(res.additional_kwargs.tool_calls).toBeDefined();
     expect(res.additional_kwargs.tool_calls?.[0].function.name).toEqual("get_current_weather");
 });
-test("Test ChatAnthropicTools with a forced function call", async () => {
+test.skip("Test ChatAnthropicTools with a forced function call", async () => {
     const chat = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         temperature: 0.1,
@@ -106,7 +106,7 @@ test("Test ChatAnthropicTools with a forced function call", async () => {
     expect(res.additional_kwargs.tool_calls).toBeDefined();
     expect(res.additional_kwargs.tool_calls?.[0]?.function.name).toEqual("extract_data");
 });
-test("ChatAnthropicTools with Zod schema", async () => {
+test.skip("ChatAnthropicTools with Zod schema", async () => {
     const schema = z.object({
         people: z.array(z.object({
             name: z.string().describe("The name of a person"),
@@ -148,7 +148,7 @@ test("ChatAnthropicTools with Zod schema", async () => {
         ]),
     });
 });
-test("ChatAnthropicTools with parallel tool calling", async () => {
+test.skip("ChatAnthropicTools with parallel tool calling", async () => {
     const schema = z.object({
         name: z.string().describe("The name of a person"),
         height: z.number().describe("The person's height"),
@@ -186,7 +186,7 @@ test("ChatAnthropicTools with parallel tool calling", async () => {
         { name: "Claudia", height: 6, hairColor: "brunette" },
     ]));
 });
-test("Test ChatAnthropic withStructuredOutput", async () => {
+test.skip("Test ChatAnthropic withStructuredOutput", async () => {
     const runnable = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         maxRetries: 0,
@@ -202,7 +202,7 @@ test("Test ChatAnthropic withStructuredOutput", async () => {
     console.log(JSON.stringify(res, null, 2));
     expect(res).toEqual({ name: "Alex", height: 5, hairColor: "blonde" });
 });
-test("Test ChatAnthropic withStructuredOutput on a single array item", async () => {
+test.skip("Test ChatAnthropic withStructuredOutput on a single array item", async () => {
     const runnable = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         maxRetries: 0,
@@ -220,7 +220,7 @@ test("Test ChatAnthropic withStructuredOutput on a single array item", async ()
         people: [{ hairColor: "blonde", height: 5, name: "Alex" }],
     });
 });
-test("Test ChatAnthropic withStructuredOutput on a single array item", async () => {
+test.skip("Test ChatAnthropic withStructuredOutput on a single array item", async () => {
     const runnable = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         maxRetries: 0,
@@ -262,7 +262,7 @@ test("Test ChatAnthropic withStructuredOutput on a single array item", async ()
         tone: "positive",
     });
 });
-test("Test ChatAnthropicTools", async () => {
+test.skip("Test ChatAnthropicTools", async () => {
     const chat = new ChatAnthropicTools({
         modelName: "claude-3-sonnet-20240229",
         maxRetries: 0,

package/dist/output_parsers.cjs

@@ -34,8 +34,27 @@ class AnthropicToolsOutputParser extends output_parsers_1.BaseLLMOutputParser {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "zodSchema", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.keyName = params.keyName;
         this.returnSingle = params.returnSingle ?? this.returnSingle;
+        this.zodSchema = params.zodSchema;
+    }
+    async _validateResult(result) {
+        if (this.zodSchema === undefined) {
+            return result;
+        }
+        const zodParsedResult = await this.zodSchema.safeParseAsync(result);
+        if (zodParsedResult.success) {
+            return zodParsedResult.data;
+        }
+        else {
+            throw new output_parsers_1.OutputParserException(`Failed to parse. Text: "${JSON.stringify(result, null, 2)}". Error: ${JSON.stringify(zodParsedResult.error.errors)}`, JSON.stringify(result, null, 2));
+        }
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async parseResult(generations) {
@@ -50,11 +69,12 @@ class AnthropicToolsOutputParser extends output_parsers_1.BaseLLMOutputParser {
             const tool = message.content.find((item) => item.type === "tool_use");
             return tool;
         });
-        if (tools.length === 0 || !tools[0]) {
-            throw new Error("No tools provided to AnthropicToolsOutputParser.");
+        if (tools[0] === undefined) {
+            throw new Error("No parseable tool calls provided to AnthropicToolsOutputParser.");
         }
         const [tool] = tools;
-        return tool.input;
+        const validatedResult = await this._validateResult(tool.input);
+        return validatedResult;
     }
 }
 exports.AnthropicToolsOutputParser = AnthropicToolsOutputParser;

package/dist/output_parsers.d.ts

@@ -1,7 +1,8 @@
+import { z } from "zod";
 import { BaseLLMOutputParser } from "@langchain/core/output_parsers";
 import { JsonOutputKeyToolsParserParams } from "@langchain/core/output_parsers/openai_tools";
 import { ChatGeneration } from "@langchain/core/outputs";
-interface AnthropicToolsOutputParserParams extends JsonOutputKeyToolsParserParams {
+interface AnthropicToolsOutputParserParams<T extends Record<string, any>> extends JsonOutputKeyToolsParserParams<T> {
 }
 export declare class AnthropicToolsOutputParser<T extends Record<string, any> = Record<string, any>> extends BaseLLMOutputParser<T> {
     static lc_name(): string;
@@ -11,7 +12,9 @@ export declare class AnthropicToolsOutputParser<T extends Record<string, any> =
     keyName: string;
     /** Whether to return only the first tool call. */
     returnSingle: boolean;
-    constructor(params: AnthropicToolsOutputParserParams);
+    zodSchema?: z.ZodType<T>;
+    constructor(params: AnthropicToolsOutputParserParams<T>);
+    protected _validateResult(result: unknown): Promise<T>;
     parseResult(generations: ChatGeneration[]): Promise<T>;
 }
 export {};

package/dist/output_parsers.js

@@ -1,4 +1,4 @@
-import { BaseLLMOutputParser } from "@langchain/core/output_parsers";
+import { BaseLLMOutputParser, OutputParserException, } from "@langchain/core/output_parsers";
 export class AnthropicToolsOutputParser extends BaseLLMOutputParser {
     static lc_name() {
         return "AnthropicToolsOutputParser";
@@ -31,8 +31,27 @@ export class AnthropicToolsOutputParser extends BaseLLMOutputParser {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "zodSchema", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.keyName = params.keyName;
         this.returnSingle = params.returnSingle ?? this.returnSingle;
+        this.zodSchema = params.zodSchema;
+    }
+    async _validateResult(result) {
+        if (this.zodSchema === undefined) {
+            return result;
+        }
+        const zodParsedResult = await this.zodSchema.safeParseAsync(result);
+        if (zodParsedResult.success) {
+            return zodParsedResult.data;
+        }
+        else {
+            throw new OutputParserException(`Failed to parse. Text: "${JSON.stringify(result, null, 2)}". Error: ${JSON.stringify(zodParsedResult.error.errors)}`, JSON.stringify(result, null, 2));
+        }
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async parseResult(generations) {
@@ -47,10 +66,11 @@ export class AnthropicToolsOutputParser extends BaseLLMOutputParser {
             const tool = message.content.find((item) => item.type === "tool_use");
             return tool;
         });
-        if (tools.length === 0 || !tools[0]) {
-            throw new Error("No tools provided to AnthropicToolsOutputParser.");
+        if (tools[0] === undefined) {
+            throw new Error("No parseable tool calls provided to AnthropicToolsOutputParser.");
         }
         const [tool] = tools;
-        return tool.input;
+        const validatedResult = await this._validateResult(tool.input);
+        return validatedResult;
     }
 }

package/dist/tests/chat_models.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/chat_models.test.js

@@ -0,0 +1,88 @@
+import { jest, test } from "@jest/globals";
+import { AIMessage } from "@langchain/core/messages";
+import { z } from "zod";
+import { OutputParserException } from "@langchain/core/output_parsers";
+import { ChatAnthropic } from "../chat_models.js";
+test("withStructuredOutput with output validation", async () => {
+    const model = new ChatAnthropic({
+        modelName: "claude-3-haiku-20240307",
+        temperature: 0,
+        anthropicApiKey: "testing",
+    });
+    jest
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        .spyOn(model, "invoke")
+        .mockResolvedValue(new AIMessage({
+        content: [
+            {
+                type: "tool_use",
+                id: "notreal",
+                name: "Extractor",
+                input: "Incorrect string tool call input",
+            },
+        ],
+    }));
+    const schema = z.object({
+        alerts: z
+            .array(z.object({
+            description: z.string().describe("A description of the alert."),
+            severity: z
+                .enum(["HIGH", "MEDIUM", "LOW"])
+                .describe("How severe the alert is."),
+        }))
+            .describe("Important security or infrastructure alerts present in the given text."),
+    });
+    const modelWithStructuredOutput = model.withStructuredOutput(schema, {
+        name: "Extractor",
+    });
+    await expect(async () => {
+        await modelWithStructuredOutput.invoke(`
+      Enumeration of Kernel Modules via Proc
+      Prompt for Credentials with OSASCRIPT
+      User Login
+      Modification of Standard Authentication Module
+      Suspicious Automator Workflows Execution
+    `);
+    }).rejects.toThrowError(OutputParserException);
+});
+test("withStructuredOutput with proper output", async () => {
+    const model = new ChatAnthropic({
+        modelName: "claude-3-haiku-20240307",
+        temperature: 0,
+        anthropicApiKey: "testing",
+    });
+    jest
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        .spyOn(model, "invoke")
+        .mockResolvedValue(new AIMessage({
+        content: [
+            {
+                type: "tool_use",
+                id: "notreal",
+                name: "Extractor",
+                input: { alerts: [{ description: "test", severity: "LOW" }] },
+            },
+        ],
+    }));
+    const schema = z.object({
+        alerts: z
+            .array(z.object({
+            description: z.string().describe("A description of the alert."),
+            severity: z
+                .enum(["HIGH", "MEDIUM", "LOW"])
+                .describe("How severe the alert is."),
+        }))
+            .describe("Important security or infrastructure alerts present in the given text."),
+    });
+    const modelWithStructuredOutput = model.withStructuredOutput(schema, {
+        name: "Extractor",
+    });
+    const result = await modelWithStructuredOutput.invoke(`
+    Enumeration of Kernel Modules via Proc
+    Prompt for Credentials with OSASCRIPT
+    User Login
+    Modification of Standard Authentication Module
+    Suspicious Automator Workflows Execution
+  `);
+    console.log(result);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/anthropic",
-  "version": "0.1.10",
+  "version": "0.1.12-rc.0",
   "description": "Anthropic integrations for LangChain.js",
   "type": "module",
   "engines": {
@@ -39,7 +39,7 @@
   "author": "LangChain",
   "license": "MIT",
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.17.2",
+    "@anthropic-ai/sdk": "^0.20.1",
     "@langchain/core": "~0.1.54",
     "fast-xml-parser": "^4.3.5",
     "zod": "^3.22.4",