@langchain/anthropic 0.2.1 → 0.2.2

package/dist/chat_models.cjs

@@ -6,6 +6,7 @@ const messages_1 = require("@langchain/core/messages");
 const outputs_1 = require("@langchain/core/outputs");
 const env_1 = require("@langchain/core/utils/env");
 const chat_models_1 = require("@langchain/core/language_models/chat_models");
+const base_1 = require("@langchain/core/language_models/base");
 const zod_to_json_schema_1 = require("zod-to-json-schema");
 const runnables_1 = require("@langchain/core/runnables");
 const types_1 = require("@langchain/core/utils/types");
@@ -380,6 +381,12 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "streamUsage", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
         this.anthropicApiKey =
             fields?.apiKey ??
                 fields?.anthropicApiKey ??
@@ -403,11 +410,12 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
         this.stopSequences = fields?.stopSequences ?? this.stopSequences;
         this.streaming = fields?.streaming ?? false;
         this.clientOptions = fields?.clientOptions ?? {};
+        this.streamUsage = fields?.streamUsage ?? this.streamUsage;
     }
     getLsParams(options) {
         const params = this.invocationParams(options);
         return {
-            ls_provider: "openai",
+            ls_provider: "anthropic",
             ls_model_name: this.model,
             ls_model_type: "chat",
             ls_temperature: params.temperature ?? undefined,
@@ -432,8 +440,17 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
             return tools;
         }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if (tools.every((tool) => (0, base_1.isOpenAITool)(tool))) {
+            // Formatted as OpenAI tool, convert to Anthropic tool
+            return tools.map((tc) => ({
+                name: tc.function.name,
+                description: tc.function.description,
+                input_schema: tc.function.parameters,
+            }));
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         if (tools.some((tool) => isAnthropicTool(tool))) {
-            throw new Error(`Can not pass in a mix of AnthropicTools and StructuredTools`);
+            throw new Error(`Can not pass in a mix of tool schemas to ChatAnthropic`);
         }
         return tools.map((tool) => ({
             name: tool.name,
@@ -542,19 +559,37 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
                         }
                     }
                     usageData = usage;
+                    let usageMetadata;
+                    if (this.streamUsage || options.streamUsage) {
+                        usageMetadata = {
+                            input_tokens: usage.input_tokens,
+                            output_tokens: usage.output_tokens,
+                            total_tokens: usage.input_tokens + usage.output_tokens,
+                        };
+                    }
                     yield new outputs_1.ChatGenerationChunk({
                         message: new messages_1.AIMessageChunk({
                             content: "",
                             additional_kwargs: filteredAdditionalKwargs,
+                            usage_metadata: usageMetadata,
                         }),
                         text: "",
                     });
                 }
                 else if (data.type === "message_delta") {
+                    let usageMetadata;
+                    if (this.streamUsage || options.streamUsage) {
+                        usageMetadata = {
+                            input_tokens: data.usage.output_tokens,
+                            output_tokens: 0,
+                            total_tokens: data.usage.output_tokens,
+                        };
+                    }
                     yield new outputs_1.ChatGenerationChunk({
                         message: new messages_1.AIMessageChunk({
                             content: "",
                             additional_kwargs: { ...data.delta },
+                            usage_metadata: usageMetadata,
                         }),
                         text: "",
                     });
@@ -562,7 +597,8 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
                         usageData.output_tokens += data.usage.output_tokens;
                     }
                 }
-                else if (data.type === "content_block_delta") {
+                else if (data.type === "content_block_delta" &&
+                    data.delta.type === "text_delta") {
                     const content = data.delta?.text;
                     if (content !== undefined) {
                         yield new outputs_1.ChatGenerationChunk({
@@ -576,10 +612,19 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
                     }
                 }
             }
+            let usageMetadata;
+            if (this.streamUsage || options.streamUsage) {
+                usageMetadata = {
+                    input_tokens: usageData.input_tokens,
+                    output_tokens: usageData.output_tokens,
+                    total_tokens: usageData.input_tokens + usageData.output_tokens,
+                };
+            }
             yield new outputs_1.ChatGenerationChunk({
                 message: new messages_1.AIMessageChunk({
                     content: "",
                     additional_kwargs: { usage: usageData },
+                    usage_metadata: usageMetadata,
                 }),
                 text: "",
             });

package/dist/chat_models.d.ts

@@ -4,20 +4,13 @@ import { CallbackManagerForLLMRun } from "@langchain/core/callbacks/manager";
 import { AIMessageChunk, type BaseMessage } from "@langchain/core/messages";
 import { ChatGeneration, ChatGenerationChunk, type ChatResult } from "@langchain/core/outputs";
 import { BaseChatModel, LangSmithParams, type BaseChatModelParams } from "@langchain/core/language_models/chat_models";
-import { StructuredOutputMethodOptions, type BaseLanguageModelCallOptions, BaseLanguageModelInput } from "@langchain/core/language_models/base";
+import { type StructuredOutputMethodOptions, type BaseLanguageModelCallOptions, type BaseLanguageModelInput, type ToolDefinition } from "@langchain/core/language_models/base";
 import { StructuredToolInterface } from "@langchain/core/tools";
 import { Runnable } from "@langchain/core/runnables";
 import { ToolCall } from "@langchain/core/messages/tool";
 import { z } from "zod";
+import type { Tool as AnthropicTool } from "@anthropic-ai/sdk/resources/index.mjs";
 import { AnthropicToolResponse } from "./types.js";
-type AnthropicTool = {
-    name: string;
-    description: string;
-    /**
-     * JSON schema.
-     */
-    input_schema: Record<string, unknown>;
-};
 type AnthropicMessageCreateParams = Anthropic.MessageCreateParamsNonStreaming;
 type AnthropicStreamingMessageCreateParams = Anthropic.MessageCreateParamsStreaming;
 type AnthropicMessageStreamEvent = Anthropic.MessageStreamEvent;
@@ -26,8 +19,8 @@ type AnthropicToolChoice = {
     type: "tool";
     name: string;
 } | "any" | "auto";
-export interface ChatAnthropicCallOptions extends BaseLanguageModelCallOptions {
-    tools?: (StructuredToolInterface | AnthropicTool)[];
+export interface ChatAnthropicCallOptions extends BaseLanguageModelCallOptions, Pick<AnthropicInput, "streamUsage"> {
+    tools?: (StructuredToolInterface | AnthropicTool | Record<string, unknown> | ToolDefinition)[];
     /**
      * Whether or not to specify what tool the model should use
      * @default "auto"
@@ -89,6 +82,11 @@ export interface AnthropicInput {
      * `anthropic.messages`} that are not explicitly specified on this class.
      */
     invocationKwargs?: Kwargs;
+    /**
+     * Whether or not to include token usage data in streamed chunks.
+     * @default true
+     */
+    streamUsage?: boolean;
 }
 /**
  * A type representing additional parameters that can be passed to the
@@ -141,6 +139,7 @@ export declare class ChatAnthropicMessages<CallOptions extends ChatAnthropicCall
     clientOptions: ClientOptions;
     protected batchClient: Anthropic;
     protected streamingClient: Anthropic;
+    streamUsage: boolean;
     constructor(fields?: Partial<AnthropicInput> & BaseChatModelParams);
     getLsParams(options: this["ParsedCallOptions"]): LangSmithParams;
     /**
@@ -151,20 +150,22 @@ export declare class ChatAnthropicMessages<CallOptions extends ChatAnthropicCall
      * @throws {Error} If a mix of AnthropicTools and StructuredTools are passed.
      */
     formatStructuredToolToAnthropic(tools: ChatAnthropicCallOptions["tools"]): AnthropicTool[] | undefined;
-    bindTools(tools: (AnthropicTool | StructuredToolInterface)[], kwargs?: Partial<CallOptions>): Runnable<BaseLanguageModelInput, AIMessageChunk, CallOptions>;
+    bindTools(tools: (AnthropicTool | Record<string, unknown> | StructuredToolInterface | ToolDefinition)[], kwargs?: Partial<CallOptions>): Runnable<BaseLanguageModelInput, AIMessageChunk, CallOptions>;
     /**
      * Get the parameters used to invoke the model
      */
     invocationParams(options?: this["ParsedCallOptions"]): Omit<AnthropicMessageCreateParams | AnthropicStreamingMessageCreateParams, "messages"> & Kwargs;
     /** @ignore */
     _identifyingParams(): {
-        system?: string | undefined;
+        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;
+        temperature?: number | undefined;
+        model: "claude-2.1" | (string & {}) | "claude-3-opus-20240229" | "claude-3-sonnet-20240229" | "claude-3-haiku-20240307" | "claude-2.0" | "claude-instant-1.2";
+        system?: string | undefined;
         stream?: boolean | undefined;
         max_tokens: number;
-        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;
         top_p?: number | undefined;
         model_name: string;
@@ -173,13 +174,15 @@ export declare class ChatAnthropicMessages<CallOptions extends ChatAnthropicCall
      * Get the identifying parameters for the model
      */
     identifyingParams(): {
-        system?: string | undefined;
+        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;
+        temperature?: number | undefined;
+        model: "claude-2.1" | (string & {}) | "claude-3-opus-20240229" | "claude-3-sonnet-20240229" | "claude-3-haiku-20240307" | "claude-2.0" | "claude-instant-1.2";
+        system?: string | undefined;
         stream?: boolean | undefined;
         max_tokens: number;
-        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;
         top_p?: number | undefined;
         model_name: string;
@@ -191,7 +194,7 @@ export declare class ChatAnthropicMessages<CallOptions extends ChatAnthropicCall
         llmOutput: {
             id: string;
             model: string;
-            stop_reason: "max_tokens" | "stop_sequence" | "end_turn" | null;
+            stop_reason: "tool_use" | "max_tokens" | "stop_sequence" | "end_turn" | null;
             stop_sequence: string | null;
             usage: Anthropic.Messages.Usage;
         };

package/dist/chat_models.js

@@ -3,6 +3,7 @@ import { AIMessage, AIMessageChunk, HumanMessage, isAIMessage, } from "@langchai
 import { ChatGenerationChunk, } from "@langchain/core/outputs";
 import { getEnvironmentVariable } from "@langchain/core/utils/env";
 import { BaseChatModel, } from "@langchain/core/language_models/chat_models";
+import { isOpenAITool, } from "@langchain/core/language_models/base";
 import { zodToJsonSchema } from "zod-to-json-schema";
 import { RunnablePassthrough, RunnableSequence, } from "@langchain/core/runnables";
 import { isZodSchema } from "@langchain/core/utils/types";
@@ -376,6 +377,12 @@ export class ChatAnthropicMessages extends BaseChatModel {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "streamUsage", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
         this.anthropicApiKey =
             fields?.apiKey ??
                 fields?.anthropicApiKey ??
@@ -399,11 +406,12 @@ export class ChatAnthropicMessages extends BaseChatModel {
         this.stopSequences = fields?.stopSequences ?? this.stopSequences;
         this.streaming = fields?.streaming ?? false;
         this.clientOptions = fields?.clientOptions ?? {};
+        this.streamUsage = fields?.streamUsage ?? this.streamUsage;
     }
     getLsParams(options) {
         const params = this.invocationParams(options);
         return {
-            ls_provider: "openai",
+            ls_provider: "anthropic",
             ls_model_name: this.model,
             ls_model_type: "chat",
             ls_temperature: params.temperature ?? undefined,
@@ -428,8 +436,17 @@ export class ChatAnthropicMessages extends BaseChatModel {
             return tools;
         }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if (tools.every((tool) => isOpenAITool(tool))) {
+            // Formatted as OpenAI tool, convert to Anthropic tool
+            return tools.map((tc) => ({
+                name: tc.function.name,
+                description: tc.function.description,
+                input_schema: tc.function.parameters,
+            }));
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         if (tools.some((tool) => isAnthropicTool(tool))) {
-            throw new Error(`Can not pass in a mix of AnthropicTools and StructuredTools`);
+            throw new Error(`Can not pass in a mix of tool schemas to ChatAnthropic`);
         }
         return tools.map((tool) => ({
             name: tool.name,
@@ -538,19 +555,37 @@ export class ChatAnthropicMessages extends BaseChatModel {
                         }
                     }
                     usageData = usage;
+                    let usageMetadata;
+                    if (this.streamUsage || options.streamUsage) {
+                        usageMetadata = {
+                            input_tokens: usage.input_tokens,
+                            output_tokens: usage.output_tokens,
+                            total_tokens: usage.input_tokens + usage.output_tokens,
+                        };
+                    }
                     yield new ChatGenerationChunk({
                         message: new AIMessageChunk({
                             content: "",
                             additional_kwargs: filteredAdditionalKwargs,
+                            usage_metadata: usageMetadata,
                         }),
                         text: "",
                     });
                 }
                 else if (data.type === "message_delta") {
+                    let usageMetadata;
+                    if (this.streamUsage || options.streamUsage) {
+                        usageMetadata = {
+                            input_tokens: data.usage.output_tokens,
+                            output_tokens: 0,
+                            total_tokens: data.usage.output_tokens,
+                        };
+                    }
                     yield new ChatGenerationChunk({
                         message: new AIMessageChunk({
                             content: "",
                             additional_kwargs: { ...data.delta },
+                            usage_metadata: usageMetadata,
                         }),
                         text: "",
                     });
@@ -558,7 +593,8 @@ export class ChatAnthropicMessages extends BaseChatModel {
                         usageData.output_tokens += data.usage.output_tokens;
                     }
                 }
-                else if (data.type === "content_block_delta") {
+                else if (data.type === "content_block_delta" &&
+                    data.delta.type === "text_delta") {
                     const content = data.delta?.text;
                     if (content !== undefined) {
                         yield new ChatGenerationChunk({
@@ -572,10 +608,19 @@ export class ChatAnthropicMessages extends BaseChatModel {
                     }
                 }
             }
+            let usageMetadata;
+            if (this.streamUsage || options.streamUsage) {
+                usageMetadata = {
+                    input_tokens: usageData.input_tokens,
+                    output_tokens: usageData.output_tokens,
+                    total_tokens: usageData.input_tokens + usageData.output_tokens,
+                };
+            }
             yield new ChatGenerationChunk({
                 message: new AIMessageChunk({
                     content: "",
                     additional_kwargs: { usage: usageData },
+                    usage_metadata: usageMetadata,
                 }),
                 text: "",
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/anthropic",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Anthropic integrations for LangChain.js",
   "type": "module",
   "engines": {
@@ -35,8 +35,8 @@
   "author": "LangChain",
   "license": "MIT",
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.21.0",
-    "@langchain/core": ">=0.2.5 <0.3.0",
+    "@anthropic-ai/sdk": "^0.22.0",
+    "@langchain/core": ">=0.2.9 <0.3.0",
     "fast-xml-parser": "^4.3.5",
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.22.4"
@@ -45,7 +45,7 @@
     "@jest/globals": "^29.5.0",
     "@langchain/community": "workspace:*",
     "@langchain/scripts": "~0.0.14",
-    "@langchain/standard-tests": "workspace:*",
+    "@langchain/standard-tests": "0.0.0",
     "@swc/core": "^1.3.90",
     "@swc/jest": "^0.2.29",
     "dpdm": "^3.12.0",
@@ -61,6 +61,7 @@
     "prettier": "^2.8.3",
     "release-it": "^15.10.1",
     "rimraf": "^5.0.1",
+    "ts-jest": "^29.1.0",
     "typescript": "~5.1.6"
   },
   "publishConfig": {