@langchain/core 0.2.30 → 0.2.31

package/dist/language_models/chat_models.cjs

@@ -90,6 +90,11 @@ class BaseChatModel extends base_js_1.BaseLanguageModel {
             let generationChunk;
             try {
                 for await (const chunk of this._streamResponseChunks(messages, callOptions, runManagers?.[0])) {
+                    if (chunk.message.id == null) {
+                        const runId = runManagers?.at(0)?.runId;
+                        if (runId != null)
+                            chunk.message._updateId(`run-${runId}`);
+                    }
                     chunk.message.response_metadata = {
                         ...chunk.generationInfo,
                         ...chunk.message.response_metadata,
@@ -150,6 +155,11 @@ class BaseChatModel extends base_js_1.BaseLanguageModel {
                 const stream = await this._streamResponseChunks(baseMessages[0], parsedOptions, runManagers?.[0]);
                 let aggregated;
                 for await (const chunk of stream) {
+                    if (chunk.message.id == null) {
+                        const runId = runManagers?.at(0)?.runId;
+                        if (runId != null)
+                            chunk.message._updateId(`run-${runId}`);
+                    }
                     if (aggregated === undefined) {
                         aggregated = chunk;
                     }
@@ -179,6 +189,11 @@ class BaseChatModel extends base_js_1.BaseLanguageModel {
                 if (pResult.status === "fulfilled") {
                     const result = pResult.value;
                     for (const generation of result.generations) {
+                        if (generation.message.id == null) {
+                            const runId = runManagers?.at(0)?.runId;
+                            if (runId != null)
+                                generation.message._updateId(`run-${runId}`);
+                        }
                         generation.message.response_metadata = {
                             ...generation.generationInfo,
                             ...generation.message.response_metadata,

package/dist/language_models/chat_models.js

@@ -86,6 +86,11 @@ export class BaseChatModel extends BaseLanguageModel {
             let generationChunk;
             try {
                 for await (const chunk of this._streamResponseChunks(messages, callOptions, runManagers?.[0])) {
+                    if (chunk.message.id == null) {
+                        const runId = runManagers?.at(0)?.runId;
+                        if (runId != null)
+                            chunk.message._updateId(`run-${runId}`);
+                    }
                     chunk.message.response_metadata = {
                         ...chunk.generationInfo,
                         ...chunk.message.response_metadata,
@@ -146,6 +151,11 @@ export class BaseChatModel extends BaseLanguageModel {
                 const stream = await this._streamResponseChunks(baseMessages[0], parsedOptions, runManagers?.[0]);
                 let aggregated;
                 for await (const chunk of stream) {
+                    if (chunk.message.id == null) {
+                        const runId = runManagers?.at(0)?.runId;
+                        if (runId != null)
+                            chunk.message._updateId(`run-${runId}`);
+                    }
                     if (aggregated === undefined) {
                         aggregated = chunk;
                     }
@@ -175,6 +185,11 @@ export class BaseChatModel extends BaseLanguageModel {
                 if (pResult.status === "fulfilled") {
                     const result = pResult.value;
                     for (const generation of result.generations) {
+                        if (generation.message.id == null) {
+                            const runId = runManagers?.at(0)?.runId;
+                            if (runId != null)
+                                generation.message._updateId(`run-${runId}`);
+                        }
                         generation.message.response_metadata = {
                             ...generation.generationInfo,
                             ...generation.message.response_metadata,

package/dist/messages/base.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBaseMessageChunk = exports.isBaseMessage = exports.BaseMessageChunk = exports._mergeObj = exports._mergeLists = exports._mergeDicts = exports.isOpenAIToolCallArray = exports.BaseMessage = exports._mergeStatus = exports.mergeContent = void 0;
+exports.isBaseMessageChunk = exports.isBaseMessage = exports._isMessageFieldWithRole = exports.BaseMessageChunk = exports._mergeObj = exports._mergeLists = exports._mergeDicts = exports.isOpenAIToolCallArray = exports.BaseMessage = exports._mergeStatus = exports.mergeContent = void 0;
 const serializable_js_1 = require("../load/serializable.cjs");
 function mergeContent(firstContent, secondContent) {
     // If first content is a string
@@ -181,6 +181,14 @@ class BaseMessage extends serializable_js_1.Serializable {
             response_metadata: this.response_metadata,
         };
     }
+    // this private method is used to update the ID for the runtime
+    // value as well as in lc_kwargs for serialisation
+    _updateId(value) {
+        this.id = value;
+        // lc_attributes wouldn't work here, because jest compares the
+        // whole object
+        this.lc_kwargs.id = value;
+    }
     get [Symbol.toStringTag]() {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         return this.constructor.lc_name();
@@ -317,6 +325,10 @@ exports._mergeObj = _mergeObj;
 class BaseMessageChunk extends BaseMessage {
 }
 exports.BaseMessageChunk = BaseMessageChunk;
+function _isMessageFieldWithRole(x) {
+    return typeof x.role === "string";
+}
+exports._isMessageFieldWithRole = _isMessageFieldWithRole;
 function isBaseMessage(messageLike) {
     return typeof messageLike?._getType === "function";
 }

package/dist/messages/base.d.ts

@@ -134,6 +134,7 @@ export declare abstract class BaseMessage extends Serializable implements BaseMe
     toDict(): StoredMessage;
     static lc_name(): string;
     get _printableFields(): Record<string, unknown>;
+    _updateId(value: string | undefined): void;
     get [Symbol.toStringTag](): any;
 }
 export type OpenAIToolCall = ToolCall & {
@@ -153,9 +154,15 @@ export declare function _mergeObj<T = any>(left: T | undefined, right: T | undef
 export declare abstract class BaseMessageChunk extends BaseMessage {
     abstract concat(chunk: BaseMessageChunk): BaseMessageChunk;
 }
+export type MessageFieldWithRole = {
+    role: StringWithAutocomplete<"user" | "assistant" | MessageType>;
+    content: MessageContent;
+    name?: string;
+} & Record<string, unknown>;
+export declare function _isMessageFieldWithRole(x: BaseMessageLike): x is MessageFieldWithRole;
 export type BaseMessageLike = BaseMessage | ({
     type: MessageType | "user" | "assistant" | "placeholder";
-} & BaseMessageFields & Record<string, unknown>) | [
+} & BaseMessageFields & Record<string, unknown>) | MessageFieldWithRole | [
     StringWithAutocomplete<MessageType | "user" | "assistant" | "placeholder">,
     MessageContent
 ] | string;

package/dist/messages/base.js

@@ -176,6 +176,14 @@ export class BaseMessage extends Serializable {
             response_metadata: this.response_metadata,
         };
     }
+    // this private method is used to update the ID for the runtime
+    // value as well as in lc_kwargs for serialisation
+    _updateId(value) {
+        this.id = value;
+        // lc_attributes wouldn't work here, because jest compares the
+        // whole object
+        this.lc_kwargs.id = value;
+    }
     get [Symbol.toStringTag]() {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         return this.constructor.lc_name();
@@ -306,6 +314,9 @@ export function _mergeObj(left, right) {
  */
 export class BaseMessageChunk extends BaseMessage {
 }
+export function _isMessageFieldWithRole(x) {
+    return typeof x.role === "string";
+}
 export function isBaseMessage(messageLike) {
     return typeof messageLike?._getType === "function";
 }

package/dist/messages/utils.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToChunk = exports.mapChatMessagesToStoredMessages = exports.mapStoredMessagesToChatMessages = exports.mapStoredMessageToChatMessage = exports.getBufferString = exports.coerceMessageLikeToMessage = void 0;
+const utils_js_1 = require("../tools/utils.cjs");
 const ai_js_1 = require("./ai.cjs");
 const base_js_1 = require("./base.cjs");
 const chat_js_1 = require("./chat.cjs");
@@ -8,13 +9,43 @@ const function_js_1 = require("./function.cjs");
 const human_js_1 = require("./human.cjs");
 const system_js_1 = require("./system.cjs");
 const tool_js_1 = require("./tool.cjs");
+function _coerceToolCall(toolCall) {
+    if ((0, utils_js_1._isToolCall)(toolCall)) {
+        return toolCall;
+    }
+    else if (typeof toolCall.id === "string" &&
+        toolCall.type === "function" &&
+        typeof toolCall.function === "object" &&
+        toolCall.function !== null &&
+        "arguments" in toolCall.function &&
+        typeof toolCall.function.arguments === "string" &&
+        "name" in toolCall.function &&
+        typeof toolCall.function.name === "string") {
+        // Handle OpenAI tool call format
+        return {
+            id: toolCall.id,
+            args: JSON.parse(toolCall.function.arguments),
+            name: toolCall.function.name,
+            type: "tool_call",
+        };
+    }
+    else {
+        // TODO: Throw an error?
+        return toolCall;
+    }
+}
 function _constructMessageFromParams(params) {
     const { type, ...rest } = params;
     if (type === "human" || type === "user") {
         return new human_js_1.HumanMessage(rest);
     }
     else if (type === "ai" || type === "assistant") {
-        return new ai_js_1.AIMessage(rest);
+        const { tool_calls: rawToolCalls, ...other } = rest;
+        if (!Array.isArray(rawToolCalls)) {
+            return new ai_js_1.AIMessage(rest);
+        }
+        const tool_calls = rawToolCalls.map(_coerceToolCall);
+        return new ai_js_1.AIMessage({ ...other, tool_calls });
     }
     else if (type === "system") {
         return new system_js_1.SystemMessage(rest);
@@ -42,6 +73,10 @@ function coerceMessageLikeToMessage(messageLike) {
         const [type, content] = messageLike;
         return _constructMessageFromParams({ type, content });
     }
+    else if ((0, base_js_1._isMessageFieldWithRole)(messageLike)) {
+        const { role: type, ...rest } = messageLike;
+        return _constructMessageFromParams({ ...rest, type });
+    }
     else {
         return _constructMessageFromParams(messageLike);
     }

package/dist/messages/utils.js

@@ -1,17 +1,48 @@
+import { _isToolCall } from "../tools/utils.js";
 import { AIMessage, AIMessageChunk } from "./ai.js";
-import { isBaseMessage, } from "./base.js";
+import { isBaseMessage, _isMessageFieldWithRole, } from "./base.js";
 import { ChatMessage, ChatMessageChunk, } from "./chat.js";
 import { FunctionMessage, FunctionMessageChunk, } from "./function.js";
 import { HumanMessage, HumanMessageChunk } from "./human.js";
 import { SystemMessage, SystemMessageChunk } from "./system.js";
-import { ToolMessage } from "./tool.js";
+import { ToolMessage, } from "./tool.js";
+function _coerceToolCall(toolCall) {
+    if (_isToolCall(toolCall)) {
+        return toolCall;
+    }
+    else if (typeof toolCall.id === "string" &&
+        toolCall.type === "function" &&
+        typeof toolCall.function === "object" &&
+        toolCall.function !== null &&
+        "arguments" in toolCall.function &&
+        typeof toolCall.function.arguments === "string" &&
+        "name" in toolCall.function &&
+        typeof toolCall.function.name === "string") {
+        // Handle OpenAI tool call format
+        return {
+            id: toolCall.id,
+            args: JSON.parse(toolCall.function.arguments),
+            name: toolCall.function.name,
+            type: "tool_call",
+        };
+    }
+    else {
+        // TODO: Throw an error?
+        return toolCall;
+    }
+}
 function _constructMessageFromParams(params) {
     const { type, ...rest } = params;
     if (type === "human" || type === "user") {
         return new HumanMessage(rest);
     }
     else if (type === "ai" || type === "assistant") {
-        return new AIMessage(rest);
+        const { tool_calls: rawToolCalls, ...other } = rest;
+        if (!Array.isArray(rawToolCalls)) {
+            return new AIMessage(rest);
+        }
+        const tool_calls = rawToolCalls.map(_coerceToolCall);
+        return new AIMessage({ ...other, tool_calls });
     }
     else if (type === "system") {
         return new SystemMessage(rest);
@@ -39,6 +70,10 @@ export function coerceMessageLikeToMessage(messageLike) {
         const [type, content] = messageLike;
         return _constructMessageFromParams({ type, content });
     }
+    else if (_isMessageFieldWithRole(messageLike)) {
+        const { role: type, ...rest } = messageLike;
+        return _constructMessageFromParams({ ...rest, type });
+    }
     else {
         return _constructMessageFromParams(messageLike);
     }

package/dist/tracers/event_stream.cjs

@@ -279,7 +279,7 @@ class EventStreamCallbackHandler extends base_js_1.BaseTracer {
         if (runInfo.runType === "chat_model") {
             eventName = "on_chat_model_stream";
             if (kwargs?.chunk === undefined) {
-                chunk = new ai_js_1.AIMessageChunk({ content: token });
+                chunk = new ai_js_1.AIMessageChunk({ content: token, id: `run-${run.id}` });
             }
             else {
                 chunk = kwargs.chunk.message;

package/dist/tracers/event_stream.js

@@ -275,7 +275,7 @@ export class EventStreamCallbackHandler extends BaseTracer {
         if (runInfo.runType === "chat_model") {
             eventName = "on_chat_model_stream";
             if (kwargs?.chunk === undefined) {
-                chunk = new AIMessageChunk({ content: token });
+                chunk = new AIMessageChunk({ content: token, id: `run-${run.id}` });
             }
             else {
                 chunk = kwargs.chunk.message;

package/dist/tracers/log_stream.cjs

@@ -401,7 +401,10 @@ class LogStreamCallbackHandler extends base_js_1.BaseTracer {
                 streamedOutputValue = kwargs?.chunk;
             }
             else {
-                streamedOutputValue = new ai_js_1.AIMessageChunk(token);
+                streamedOutputValue = new ai_js_1.AIMessageChunk({
+                    id: `run-${run.id}`,
+                    content: token,
+                });
             }
         }
         else {

package/dist/tracers/log_stream.js

@@ -395,7 +395,10 @@ export class LogStreamCallbackHandler extends BaseTracer {
                 streamedOutputValue = kwargs?.chunk;
             }
             else {
-                streamedOutputValue = new AIMessageChunk(token);
+                streamedOutputValue = new AIMessageChunk({
+                    id: `run-${run.id}`,
+                    content: token,
+                });
             }
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/core",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "description": "Core LangChain.js abstractions and schemas",
   "type": "module",
   "engines": {