@langchain/anthropic 0.1.7 → 0.1.9

package/dist/chat_models.cjs

@@ -203,6 +203,7 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
             ...this.formatMessagesForAnthropic(messages),
             stream: true,
         });
+        let usageData = { input_tokens: 0, output_tokens: 0 };
         for await (const data of stream) {
             if (options.signal?.aborted) {
                 stream.controller.abort();
@@ -210,7 +211,7 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
             }
             if (data.type === "message_start") {
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const { content, ...additionalKwargs } = data.message;
+                const { content, usage, ...additionalKwargs } = data.message;
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const filteredAdditionalKwargs = {};
                 for (const [key, value] of Object.entries(additionalKwargs)) {
@@ -218,6 +219,7 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
                         filteredAdditionalKwargs[key] = value;
                     }
                 }
+                usageData = usage;
                 yield new outputs_1.ChatGenerationChunk({
                     message: new messages_1.AIMessageChunk({
                         content: "",
@@ -234,6 +236,9 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
                     }),
                     text: "",
                 });
+                if (data?.usage !== undefined) {
+                    usageData.output_tokens += data.usage.output_tokens;
+                }
             }
             else if (data.type === "content_block_delta") {
                 const content = data.delta?.text;
@@ -249,6 +254,13 @@ class ChatAnthropicMessages extends chat_models_1.BaseChatModel {
                 }
             }
         }
+        yield new outputs_1.ChatGenerationChunk({
+            message: new messages_1.AIMessageChunk({
+                content: "",
+                additional_kwargs: { usage: usageData },
+            }),
+            text: "",
+        });
     }
     /**
      * Formats messages as a prompt for the model.

package/dist/chat_models.js

@@ -200,6 +200,7 @@ export class ChatAnthropicMessages extends BaseChatModel {
             ...this.formatMessagesForAnthropic(messages),
             stream: true,
         });
+        let usageData = { input_tokens: 0, output_tokens: 0 };
         for await (const data of stream) {
             if (options.signal?.aborted) {
                 stream.controller.abort();
@@ -207,7 +208,7 @@ export class ChatAnthropicMessages extends BaseChatModel {
             }
             if (data.type === "message_start") {
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const { content, ...additionalKwargs } = data.message;
+                const { content, usage, ...additionalKwargs } = data.message;
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const filteredAdditionalKwargs = {};
                 for (const [key, value] of Object.entries(additionalKwargs)) {
@@ -215,6 +216,7 @@ export class ChatAnthropicMessages extends BaseChatModel {
                         filteredAdditionalKwargs[key] = value;
                     }
                 }
+                usageData = usage;
                 yield new ChatGenerationChunk({
                     message: new AIMessageChunk({
                         content: "",
@@ -231,6 +233,9 @@ export class ChatAnthropicMessages extends BaseChatModel {
                     }),
                     text: "",
                 });
+                if (data?.usage !== undefined) {
+                    usageData.output_tokens += data.usage.output_tokens;
+                }
             }
             else if (data.type === "content_block_delta") {
                 const content = data.delta?.text;
@@ -246,6 +251,13 @@ export class ChatAnthropicMessages extends BaseChatModel {
                 }
             }
         }
+        yield new ChatGenerationChunk({
+            message: new AIMessageChunk({
+                content: "",
+                additional_kwargs: { usage: usageData },
+            }),
+            text: "",
+        });
     }
     /**
      * Formats messages as a prompt for the model.

package/dist/experimental/tool_calling.cjs

@@ -217,12 +217,12 @@ class ChatAnthropicTools extends chat_models_1.BaseChatModel {
             name = config?.name;
             method = config?.method;
             includeRaw = config?.includeRaw;
-            force = config?.force ?? true;
+            force = config?.force ?? false;
         }
         if (method === "jsonMode") {
             throw new Error(`Anthropic only supports "functionCalling" as a method.`);
         }
-        const functionName = name ?? "extract";
+        let functionName = name ?? "extract";
         let outputParser;
         let tools;
         if (isZodSchema(schema)) {
@@ -244,14 +244,24 @@ class ChatAnthropicTools 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,
+                };
+            }
             tools = [
                 {
                     type: "function",
-                    function: {
-                        name: functionName,
-                        description: schema.description,
-                        parameters: schema,
-                    },
+                    function: openAIFunctionDefinition,
                 },
             ];
             outputParser = new openai_tools_1.JsonOutputKeyToolsParser({

package/dist/experimental/tool_calling.d.ts

@@ -3,7 +3,7 @@ import type { ChatGenerationChunk, ChatResult, LLMResult } from "@langchain/core
 import { BaseChatModel, BaseChatModelParams } from "@langchain/core/language_models/chat_models";
 import { CallbackManagerForLLMRun, Callbacks } from "@langchain/core/callbacks/manager";
 import { BasePromptTemplate } from "@langchain/core/prompts";
-import { BaseLanguageModelCallOptions, BaseLanguageModelInput, StructuredOutputMethodParams, StructuredOutputMethodOptions, ToolDefinition } from "@langchain/core/language_models/base";
+import type { 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";

package/dist/experimental/tool_calling.js

@@ -214,12 +214,12 @@ export class ChatAnthropicTools extends BaseChatModel {
             name = config?.name;
             method = config?.method;
             includeRaw = config?.includeRaw;
-            force = config?.force ?? true;
+            force = config?.force ?? false;
         }
         if (method === "jsonMode") {
             throw new Error(`Anthropic only supports "functionCalling" as a method.`);
         }
-        const functionName = name ?? "extract";
+        let functionName = name ?? "extract";
         let outputParser;
         let tools;
         if (isZodSchema(schema)) {
@@ -241,14 +241,24 @@ export class ChatAnthropicTools 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,
+                };
+            }
             tools = [
                 {
                     type: "function",
-                    function: {
-                        name: functionName,
-                        description: schema.description,
-                        parameters: schema,
-                    },
+                    function: openAIFunctionDefinition,
                 },
             ];
             outputParser = new JsonOutputKeyToolsParser({

package/dist/experimental/utils/tool_calling.cjs

@@ -18,7 +18,9 @@ You may call them like this:
 </function_calls>
 
 Here are the tools available:
-{tools}`);
+{tools}
+
+If the schema above contains a property typed as an enum, you must only return values matching an allowed value for that enum.`);
 function formatAsXMLRepresentation(tool) {
     const builder = new fast_xml_parser_1.XMLBuilder();
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -88,7 +90,12 @@ xmlParameters
         }
         else if (typeof xmlParameters[key] === "object" &&
             xmlParameters[key] !== null) {
-            fixedParameters[key] = fixArrayXMLParameters(schema, xmlParameters[key]);
+            fixedParameters[key] = fixArrayXMLParameters({
+                ...schema.properties[key],
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                definitions: schema.definitions,
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }, xmlParameters[key]);
         }
         else {
             fixedParameters[key] = xmlParameters[key];

package/dist/experimental/utils/tool_calling.d.ts

@@ -1,7 +1,7 @@
 import { JsonSchema7ObjectType } from "zod-to-json-schema";
 import { PromptTemplate } from "@langchain/core/prompts";
 import { ToolDefinition } from "@langchain/core/language_models/base";
-export declare const DEFAULT_TOOL_SYSTEM_PROMPT: PromptTemplate<import("@langchain/core/prompts").ParamsFromFString<"In this environment you have access to a set of tools you can use to answer the user's question.\n\nYou may call them like this:\n<function_calls>\n<invoke>\n<tool_name>$TOOL_NAME</tool_name>\n<parameters>\n<$PARAMETER_NAME>$PARAMETER_VALUE</$PARAMETER_NAME>\n...\n</parameters>\n</invoke>\n</function_calls>\n\nHere are the tools available:\n{tools}">, any>;
+export declare const DEFAULT_TOOL_SYSTEM_PROMPT: PromptTemplate<import("@langchain/core/prompts").ParamsFromFString<"In this environment you have access to a set of tools you can use to answer the user's question.\n\nYou may call them like this:\n<function_calls>\n<invoke>\n<tool_name>$TOOL_NAME</tool_name>\n<parameters>\n<$PARAMETER_NAME>$PARAMETER_VALUE</$PARAMETER_NAME>\n...\n</parameters>\n</invoke>\n</function_calls>\n\nHere are the tools available:\n{tools}\n\nIf the schema above contains a property typed as an enum, you must only return values matching an allowed value for that enum.">, any>;
 export type ToolInvocation = {
     tool_name: string;
     parameters: Record<string, unknown>;

package/dist/experimental/utils/tool_calling.js

@@ -15,7 +15,9 @@ You may call them like this:
 </function_calls>
 
 Here are the tools available:
-{tools}`);
+{tools}
+
+If the schema above contains a property typed as an enum, you must only return values matching an allowed value for that enum.`);
 export function formatAsXMLRepresentation(tool) {
     const builder = new XMLBuilder();
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -84,7 +86,12 @@ xmlParameters
         }
         else if (typeof xmlParameters[key] === "object" &&
             xmlParameters[key] !== null) {
-            fixedParameters[key] = fixArrayXMLParameters(schema, xmlParameters[key]);
+            fixedParameters[key] = fixArrayXMLParameters({
+                ...schema.properties[key],
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                definitions: schema.definitions,
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }, xmlParameters[key]);
         }
         else {
             fixedParameters[key] = xmlParameters[key];

package/package.json

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