@langchain/anthropic 0.3.10 → 0.3.11

package/dist/chat_models.d.ts

@@ -520,8 +520,8 @@ export declare class ChatAnthropicMessages<CallOptions extends ChatAnthropicCall
         model: Anthropic.Messages.Model;
         max_tokens: number;
         tools?: Anthropic.Messages.Tool[] | undefined;
-        tool_choice?: Anthropic.Messages.MessageCreateParams.ToolChoiceAuto | Anthropic.Messages.MessageCreateParams.ToolChoiceAny | Anthropic.Messages.MessageCreateParams.ToolChoiceTool | undefined;
-        metadata?: Anthropic.Messages.MessageCreateParams.Metadata | undefined;
+        tool_choice?: Anthropic.Messages.ToolChoice | undefined;
+        metadata?: Anthropic.Messages.Metadata | undefined;
         temperature?: number | undefined;
         stream?: boolean | undefined;
         stop_sequences?: string[] | undefined;
@@ -537,8 +537,8 @@ export declare class ChatAnthropicMessages<CallOptions extends ChatAnthropicCall
         model: Anthropic.Messages.Model;
         max_tokens: number;
         tools?: Anthropic.Messages.Tool[] | undefined;
-        tool_choice?: Anthropic.Messages.MessageCreateParams.ToolChoiceAuto | Anthropic.Messages.MessageCreateParams.ToolChoiceAny | Anthropic.Messages.MessageCreateParams.ToolChoiceTool | undefined;
-        metadata?: Anthropic.Messages.MessageCreateParams.Metadata | undefined;
+        tool_choice?: Anthropic.Messages.ToolChoice | undefined;
+        metadata?: Anthropic.Messages.Metadata | undefined;
         temperature?: number | undefined;
         stream?: boolean | undefined;
         stop_sequences?: string[] | undefined;
@@ -554,7 +554,6 @@ export declare class ChatAnthropicMessages<CallOptions extends ChatAnthropicCall
             id: string;
             model: Anthropic.Messages.Model;
             stop_reason: "tool_use" | "stop_sequence" | "end_turn" | "max_tokens" | null;
-            /** Anthropic API key */
             stop_sequence: string | null;
             usage: Anthropic.Messages.Usage;
         };

package/dist/types.d.ts

@@ -18,3 +18,7 @@ export type AnthropicToolChoice = {
     name: string;
 } | "any" | "auto" | "none" | string;
 export type ChatAnthropicToolType = AnthropicTool | BindToolsInput;
+export type AnthropicTextBlockParam = Anthropic.Messages.TextBlockParam;
+export type AnthropicImageBlockParam = Anthropic.Messages.ImageBlockParam;
+export type AnthropicToolUseBlockParam = Anthropic.Messages.ToolUseBlockParam;
+export type AnthropicToolResultBlockParam = Anthropic.Messages.ToolResultBlockParam;

package/dist/utils/message_inputs.cjs

@@ -218,8 +218,55 @@ function _convertMessagesToAnthropicPayload(messages) {
         }
     });
     return {
-        messages: formattedMessages,
+        messages: mergeMessages(formattedMessages),
         system,
     };
 }
 exports._convertMessagesToAnthropicPayload = _convertMessagesToAnthropicPayload;
+function mergeMessages(messages) {
+    if (!messages || messages.length <= 1) {
+        return messages;
+    }
+    const result = [];
+    let currentMessage = messages[0];
+    const normalizeContent = (content) => {
+        if (typeof content === "string") {
+            return [
+                {
+                    type: "text",
+                    text: content,
+                },
+            ];
+        }
+        return content;
+    };
+    const isToolResultMessage = (msg) => {
+        if (msg.role !== "user")
+            return false;
+        if (typeof msg.content === "string") {
+            return false;
+        }
+        return (Array.isArray(msg.content) &&
+            msg.content.every((item) => item.type === "tool_result"));
+    };
+    for (let i = 1; i < messages.length; i += 1) {
+        const nextMessage = messages[i];
+        if (isToolResultMessage(currentMessage) &&
+            isToolResultMessage(nextMessage)) {
+            // Merge the messages by combining their content arrays
+            currentMessage = {
+                ...currentMessage,
+                content: [
+                    ...normalizeContent(currentMessage.content),
+                    ...normalizeContent(nextMessage.content),
+                ],
+            };
+        }
+        else {
+            result.push(currentMessage);
+            currentMessage = nextMessage;
+        }
+    }
+    result.push(currentMessage);
+    return result;
+}

package/dist/utils/message_inputs.js

@@ -214,7 +214,54 @@ export function _convertMessagesToAnthropicPayload(messages) {
         }
     });
     return {
-        messages: formattedMessages,
+        messages: mergeMessages(formattedMessages),
         system,
     };
 }
+function mergeMessages(messages) {
+    if (!messages || messages.length <= 1) {
+        return messages;
+    }
+    const result = [];
+    let currentMessage = messages[0];
+    const normalizeContent = (content) => {
+        if (typeof content === "string") {
+            return [
+                {
+                    type: "text",
+                    text: content,
+                },
+            ];
+        }
+        return content;
+    };
+    const isToolResultMessage = (msg) => {
+        if (msg.role !== "user")
+            return false;
+        if (typeof msg.content === "string") {
+            return false;
+        }
+        return (Array.isArray(msg.content) &&
+            msg.content.every((item) => item.type === "tool_result"));
+    };
+    for (let i = 1; i < messages.length; i += 1) {
+        const nextMessage = messages[i];
+        if (isToolResultMessage(currentMessage) &&
+            isToolResultMessage(nextMessage)) {
+            // Merge the messages by combining their content arrays
+            currentMessage = {
+                ...currentMessage,
+                content: [
+                    ...normalizeContent(currentMessage.content),
+                    ...normalizeContent(nextMessage.content),
+                ],
+            };
+        }
+        else {
+            result.push(currentMessage);
+            currentMessage = nextMessage;
+        }
+    }
+    result.push(currentMessage);
+    return result;
+}

package/dist/utils/message_outputs.cjs

@@ -14,11 +14,16 @@ function _makeMessageChunkFromAnthropicEvent(data, fields) {
                 filteredAdditionalKwargs[key] = value;
             }
         }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const { input_tokens, output_tokens, ...rest } = usage ?? {};
         const usageMetadata = {
             input_tokens,
             output_tokens,
             total_tokens: input_tokens + output_tokens,
+            input_token_details: {
+                cache_creation: rest.cache_creation_input_tokens,
+                cache_read: rest.cache_read_input_tokens,
+            },
         };
         return {
             chunk: new messages_1.AIMessageChunk({
@@ -39,6 +44,12 @@ function _makeMessageChunkFromAnthropicEvent(data, fields) {
             input_tokens: 0,
             output_tokens: data.usage.output_tokens,
             total_tokens: data.usage.output_tokens,
+            input_token_details: {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                cache_creation: data.usage.cache_creation_input_tokens,
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                cache_read: data.usage.cache_read_input_tokens,
+            },
         };
         return {
             chunk: new messages_1.AIMessageChunk({
@@ -145,6 +156,10 @@ function anthropicResponseToChatMessages(messages, additionalKwargs) {
             input_tokens: usage.input_tokens ?? 0,
             output_tokens: usage.output_tokens ?? 0,
             total_tokens: (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0),
+            input_token_details: {
+                cache_creation: usage.cache_creation_input_tokens,
+                cache_read: usage.cache_read_input_tokens,
+            },
         }
         : undefined;
     if (messages.length === 1 && messages[0].type === "text") {

package/dist/utils/message_outputs.js

@@ -11,11 +11,16 @@ export function _makeMessageChunkFromAnthropicEvent(data, fields) {
                 filteredAdditionalKwargs[key] = value;
             }
         }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const { input_tokens, output_tokens, ...rest } = usage ?? {};
         const usageMetadata = {
             input_tokens,
             output_tokens,
             total_tokens: input_tokens + output_tokens,
+            input_token_details: {
+                cache_creation: rest.cache_creation_input_tokens,
+                cache_read: rest.cache_read_input_tokens,
+            },
         };
         return {
             chunk: new AIMessageChunk({
@@ -36,6 +41,12 @@ export function _makeMessageChunkFromAnthropicEvent(data, fields) {
             input_tokens: 0,
             output_tokens: data.usage.output_tokens,
             total_tokens: data.usage.output_tokens,
+            input_token_details: {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                cache_creation: data.usage.cache_creation_input_tokens,
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                cache_read: data.usage.cache_read_input_tokens,
+            },
         };
         return {
             chunk: new AIMessageChunk({
@@ -141,6 +152,10 @@ export function anthropicResponseToChatMessages(messages, additionalKwargs) {
             input_tokens: usage.input_tokens ?? 0,
             output_tokens: usage.output_tokens ?? 0,
             total_tokens: (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0),
+            input_token_details: {
+                cache_creation: usage.cache_creation_input_tokens,
+                cache_read: usage.cache_read_input_tokens,
+            },
         }
         : undefined;
     if (messages.length === 1 && messages[0].type === "text") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/anthropic",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "Anthropic integrations for LangChain.js",
   "type": "module",
   "engines": {
@@ -35,7 +35,7 @@
   "author": "LangChain",
   "license": "MIT",
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.27.3",
+    "@anthropic-ai/sdk": "^0.32.1",
     "fast-xml-parser": "^4.4.1",
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.22.4"