@langchain/openai 0.4.1 → 0.4.2

package/dist/chat_models.cjs

@@ -50,138 +50,6 @@ function messageToOpenAIRole(message) {
     }
 }
 exports.messageToOpenAIRole = messageToOpenAIRole;
-function openAIResponseToChatMessage(message, rawResponse, includeRawResponse) {
-    const rawToolCalls = message.tool_calls;
-    switch (message.role) {
-        case "assistant": {
-            const toolCalls = [];
-            const invalidToolCalls = [];
-            for (const rawToolCall of rawToolCalls ?? []) {
-                try {
-                    toolCalls.push((0, openai_tools_1.parseToolCall)(rawToolCall, { returnId: true }));
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                }
-                catch (e) {
-                    invalidToolCalls.push((0, openai_tools_1.makeInvalidToolCall)(rawToolCall, e.message));
-                }
-            }
-            const additional_kwargs = {
-                function_call: message.function_call,
-                tool_calls: rawToolCalls,
-            };
-            if (includeRawResponse !== undefined) {
-                additional_kwargs.__raw_response = rawResponse;
-            }
-            const response_metadata = {
-                model_name: rawResponse.model,
-                ...(rawResponse.system_fingerprint
-                    ? {
-                        usage: { ...rawResponse.usage },
-                        system_fingerprint: rawResponse.system_fingerprint,
-                    }
-                    : {}),
-            };
-            if (message.audio) {
-                additional_kwargs.audio = message.audio;
-            }
-            return new messages_1.AIMessage({
-                content: message.content || "",
-                tool_calls: toolCalls,
-                invalid_tool_calls: invalidToolCalls,
-                additional_kwargs,
-                response_metadata,
-                id: rawResponse.id,
-            });
-        }
-        default:
-            return new messages_1.ChatMessage(message.content || "", message.role ?? "unknown");
-    }
-}
-function _convertDeltaToMessageChunk(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-delta, rawResponse, defaultRole, includeRawResponse) {
-    const role = delta.role ?? defaultRole;
-    const content = delta.content ?? "";
-    let additional_kwargs;
-    if (delta.function_call) {
-        additional_kwargs = {
-            function_call: delta.function_call,
-        };
-    }
-    else if (delta.tool_calls) {
-        additional_kwargs = {
-            tool_calls: delta.tool_calls,
-        };
-    }
-    else {
-        additional_kwargs = {};
-    }
-    if (includeRawResponse) {
-        additional_kwargs.__raw_response = rawResponse;
-    }
-    if (delta.audio) {
-        additional_kwargs.audio = {
-            ...delta.audio,
-            index: rawResponse.choices[0].index,
-        };
-    }
-    const response_metadata = { usage: { ...rawResponse.usage } };
-    if (role === "user") {
-        return new messages_1.HumanMessageChunk({ content, response_metadata });
-    }
-    else if (role === "assistant") {
-        const toolCallChunks = [];
-        if (Array.isArray(delta.tool_calls)) {
-            for (const rawToolCall of delta.tool_calls) {
-                toolCallChunks.push({
-                    name: rawToolCall.function?.name,
-                    args: rawToolCall.function?.arguments,
-                    id: rawToolCall.id,
-                    index: rawToolCall.index,
-                    type: "tool_call_chunk",
-                });
-            }
-        }
-        return new messages_1.AIMessageChunk({
-            content,
-            tool_call_chunks: toolCallChunks,
-            additional_kwargs,
-            id: rawResponse.id,
-            response_metadata,
-        });
-    }
-    else if (role === "system") {
-        return new messages_1.SystemMessageChunk({ content, response_metadata });
-    }
-    else if (role === "developer") {
-        return new messages_1.SystemMessageChunk({
-            content,
-            response_metadata,
-            additional_kwargs: {
-                __openai_role__: "developer",
-            },
-        });
-    }
-    else if (role === "function") {
-        return new messages_1.FunctionMessageChunk({
-            content,
-            additional_kwargs,
-            name: delta.name,
-            response_metadata,
-        });
-    }
-    else if (role === "tool") {
-        return new messages_1.ToolMessageChunk({
-            content,
-            additional_kwargs,
-            tool_call_id: delta.tool_call_id,
-            response_metadata,
-        });
-    }
-    else {
-        return new messages_1.ChatMessageChunk({ content, role, response_metadata });
-    }
-}
 // Used in LangSmith, export is important here
 function _convertMessagesToOpenAIParams(messages, model) {
     // TODO: Function messages do not support array content, fix cast
@@ -1136,6 +1004,138 @@ class ChatOpenAI extends chat_models_1.BaseChatModel {
         }
         return params;
     }
+    _convertOpenAIChatCompletionMessageToBaseMessage(message, rawResponse) {
+        const rawToolCalls = message.tool_calls;
+        switch (message.role) {
+            case "assistant": {
+                const toolCalls = [];
+                const invalidToolCalls = [];
+                for (const rawToolCall of rawToolCalls ?? []) {
+                    try {
+                        toolCalls.push((0, openai_tools_1.parseToolCall)(rawToolCall, { returnId: true }));
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    }
+                    catch (e) {
+                        invalidToolCalls.push((0, openai_tools_1.makeInvalidToolCall)(rawToolCall, e.message));
+                    }
+                }
+                const additional_kwargs = {
+                    function_call: message.function_call,
+                    tool_calls: rawToolCalls,
+                };
+                if (this.__includeRawResponse !== undefined) {
+                    additional_kwargs.__raw_response = rawResponse;
+                }
+                const response_metadata = {
+                    model_name: rawResponse.model,
+                    ...(rawResponse.system_fingerprint
+                        ? {
+                            usage: { ...rawResponse.usage },
+                            system_fingerprint: rawResponse.system_fingerprint,
+                        }
+                        : {}),
+                };
+                if (message.audio) {
+                    additional_kwargs.audio = message.audio;
+                }
+                return new messages_1.AIMessage({
+                    content: message.content || "",
+                    tool_calls: toolCalls,
+                    invalid_tool_calls: invalidToolCalls,
+                    additional_kwargs,
+                    response_metadata,
+                    id: rawResponse.id,
+                });
+            }
+            default:
+                return new messages_1.ChatMessage(message.content || "", message.role ?? "unknown");
+        }
+    }
+    _convertOpenAIDeltaToBaseMessageChunk(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    delta, rawResponse, defaultRole) {
+        const role = delta.role ?? defaultRole;
+        const content = delta.content ?? "";
+        let additional_kwargs;
+        if (delta.function_call) {
+            additional_kwargs = {
+                function_call: delta.function_call,
+            };
+        }
+        else if (delta.tool_calls) {
+            additional_kwargs = {
+                tool_calls: delta.tool_calls,
+            };
+        }
+        else {
+            additional_kwargs = {};
+        }
+        if (this.__includeRawResponse) {
+            additional_kwargs.__raw_response = rawResponse;
+        }
+        if (delta.audio) {
+            additional_kwargs.audio = {
+                ...delta.audio,
+                index: rawResponse.choices[0].index,
+            };
+        }
+        const response_metadata = { usage: { ...rawResponse.usage } };
+        if (role === "user") {
+            return new messages_1.HumanMessageChunk({ content, response_metadata });
+        }
+        else if (role === "assistant") {
+            const toolCallChunks = [];
+            if (Array.isArray(delta.tool_calls)) {
+                for (const rawToolCall of delta.tool_calls) {
+                    toolCallChunks.push({
+                        name: rawToolCall.function?.name,
+                        args: rawToolCall.function?.arguments,
+                        id: rawToolCall.id,
+                        index: rawToolCall.index,
+                        type: "tool_call_chunk",
+                    });
+                }
+            }
+            return new messages_1.AIMessageChunk({
+                content,
+                tool_call_chunks: toolCallChunks,
+                additional_kwargs,
+                id: rawResponse.id,
+                response_metadata,
+            });
+        }
+        else if (role === "system") {
+            return new messages_1.SystemMessageChunk({ content, response_metadata });
+        }
+        else if (role === "developer") {
+            return new messages_1.SystemMessageChunk({
+                content,
+                response_metadata,
+                additional_kwargs: {
+                    __openai_role__: "developer",
+                },
+            });
+        }
+        else if (role === "function") {
+            return new messages_1.FunctionMessageChunk({
+                content,
+                additional_kwargs,
+                name: delta.name,
+                response_metadata,
+            });
+        }
+        else if (role === "tool") {
+            return new messages_1.ToolMessageChunk({
+                content,
+                additional_kwargs,
+                tool_call_id: delta.tool_call_id,
+                response_metadata,
+            });
+        }
+        else {
+            return new messages_1.ChatMessageChunk({ content, role, response_metadata });
+        }
+    }
     /** @ignore */
     _identifyingParams() {
         return {
@@ -1168,7 +1168,7 @@ class ChatOpenAI extends chat_models_1.BaseChatModel {
             if (!delta) {
                 continue;
             }
-            const chunk = _convertDeltaToMessageChunk(delta, data, defaultRole, this.__includeRawResponse);
+            const chunk = this._convertOpenAIDeltaToBaseMessageChunk(delta, data, defaultRole);
             defaultRole = delta.role ?? defaultRole;
             const newTokenIndices = {
                 prompt: options.promptIndex ?? 0,
@@ -1354,7 +1354,7 @@ class ChatOpenAI extends chat_models_1.BaseChatModel {
                 const text = part.message?.content ?? "";
                 const generation = {
                     text,
-                    message: openAIResponseToChatMessage(part.message ?? { role: "assistant" }, data, this.__includeRawResponse),
+                    message: this._convertOpenAIChatCompletionMessageToBaseMessage(part.message ?? { role: "assistant" }, data),
                 };
                 generation.generationInfo = {
                     ...(part.finish_reason ? { finish_reason: part.finish_reason } : {}),

package/dist/chat_models.d.ts

@@ -1,6 +1,6 @@
 import { type ClientOptions, OpenAI as OpenAIClient } from "openai";
 import { CallbackManagerForLLMRun } from "@langchain/core/callbacks/manager";
-import { AIMessageChunk, type BaseMessage } from "@langchain/core/messages";
+import { AIMessageChunk, type BaseMessage, ChatMessageChunk, FunctionMessageChunk, HumanMessageChunk, SystemMessageChunk, ToolMessageChunk } from "@langchain/core/messages";
 import { ChatGenerationChunk, type ChatResult } from "@langchain/core/outputs";
 import { BaseChatModel, BindToolsInput, LangSmithParams, type BaseChatModelParams } from "@langchain/core/language_models/chat_models";
 import { type BaseFunctionCallOptions, type BaseLanguageModelInput, type StructuredOutputMethodOptions } from "@langchain/core/language_models/base";
@@ -698,6 +698,8 @@ export declare class ChatOpenAI<CallOptions extends ChatOpenAICallOptions = Chat
     invocationParams(options?: this["ParsedCallOptions"], extra?: {
         streaming?: boolean;
     }): Omit<OpenAIClient.Chat.ChatCompletionCreateParams, "messages">;
+    protected _convertOpenAIChatCompletionMessageToBaseMessage(message: OpenAIClient.Chat.Completions.ChatCompletionMessage, rawResponse: OpenAIClient.Chat.Completions.ChatCompletion): BaseMessage;
+    protected _convertOpenAIDeltaToBaseMessageChunk(delta: Record<string, any>, rawResponse: OpenAIClient.Chat.Completions.ChatCompletionChunk, defaultRole?: OpenAIRoleEnum): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
     /** @ignore */
     _identifyingParams(): Omit<OpenAIClient.Chat.ChatCompletionCreateParams, "messages"> & {
         model_name: string;

package/dist/chat_models.js

@@ -46,138 +46,6 @@ export function messageToOpenAIRole(message) {
             throw new Error(`Unknown message type: ${type}`);
     }
 }
-function openAIResponseToChatMessage(message, rawResponse, includeRawResponse) {
-    const rawToolCalls = message.tool_calls;
-    switch (message.role) {
-        case "assistant": {
-            const toolCalls = [];
-            const invalidToolCalls = [];
-            for (const rawToolCall of rawToolCalls ?? []) {
-                try {
-                    toolCalls.push(parseToolCall(rawToolCall, { returnId: true }));
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                }
-                catch (e) {
-                    invalidToolCalls.push(makeInvalidToolCall(rawToolCall, e.message));
-                }
-            }
-            const additional_kwargs = {
-                function_call: message.function_call,
-                tool_calls: rawToolCalls,
-            };
-            if (includeRawResponse !== undefined) {
-                additional_kwargs.__raw_response = rawResponse;
-            }
-            const response_metadata = {
-                model_name: rawResponse.model,
-                ...(rawResponse.system_fingerprint
-                    ? {
-                        usage: { ...rawResponse.usage },
-                        system_fingerprint: rawResponse.system_fingerprint,
-                    }
-                    : {}),
-            };
-            if (message.audio) {
-                additional_kwargs.audio = message.audio;
-            }
-            return new AIMessage({
-                content: message.content || "",
-                tool_calls: toolCalls,
-                invalid_tool_calls: invalidToolCalls,
-                additional_kwargs,
-                response_metadata,
-                id: rawResponse.id,
-            });
-        }
-        default:
-            return new ChatMessage(message.content || "", message.role ?? "unknown");
-    }
-}
-function _convertDeltaToMessageChunk(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-delta, rawResponse, defaultRole, includeRawResponse) {
-    const role = delta.role ?? defaultRole;
-    const content = delta.content ?? "";
-    let additional_kwargs;
-    if (delta.function_call) {
-        additional_kwargs = {
-            function_call: delta.function_call,
-        };
-    }
-    else if (delta.tool_calls) {
-        additional_kwargs = {
-            tool_calls: delta.tool_calls,
-        };
-    }
-    else {
-        additional_kwargs = {};
-    }
-    if (includeRawResponse) {
-        additional_kwargs.__raw_response = rawResponse;
-    }
-    if (delta.audio) {
-        additional_kwargs.audio = {
-            ...delta.audio,
-            index: rawResponse.choices[0].index,
-        };
-    }
-    const response_metadata = { usage: { ...rawResponse.usage } };
-    if (role === "user") {
-        return new HumanMessageChunk({ content, response_metadata });
-    }
-    else if (role === "assistant") {
-        const toolCallChunks = [];
-        if (Array.isArray(delta.tool_calls)) {
-            for (const rawToolCall of delta.tool_calls) {
-                toolCallChunks.push({
-                    name: rawToolCall.function?.name,
-                    args: rawToolCall.function?.arguments,
-                    id: rawToolCall.id,
-                    index: rawToolCall.index,
-                    type: "tool_call_chunk",
-                });
-            }
-        }
-        return new AIMessageChunk({
-            content,
-            tool_call_chunks: toolCallChunks,
-            additional_kwargs,
-            id: rawResponse.id,
-            response_metadata,
-        });
-    }
-    else if (role === "system") {
-        return new SystemMessageChunk({ content, response_metadata });
-    }
-    else if (role === "developer") {
-        return new SystemMessageChunk({
-            content,
-            response_metadata,
-            additional_kwargs: {
-                __openai_role__: "developer",
-            },
-        });
-    }
-    else if (role === "function") {
-        return new FunctionMessageChunk({
-            content,
-            additional_kwargs,
-            name: delta.name,
-            response_metadata,
-        });
-    }
-    else if (role === "tool") {
-        return new ToolMessageChunk({
-            content,
-            additional_kwargs,
-            tool_call_id: delta.tool_call_id,
-            response_metadata,
-        });
-    }
-    else {
-        return new ChatMessageChunk({ content, role, response_metadata });
-    }
-}
 // Used in LangSmith, export is important here
 export function _convertMessagesToOpenAIParams(messages, model) {
     // TODO: Function messages do not support array content, fix cast
@@ -1131,6 +999,138 @@ export class ChatOpenAI extends BaseChatModel {
         }
         return params;
     }
+    _convertOpenAIChatCompletionMessageToBaseMessage(message, rawResponse) {
+        const rawToolCalls = message.tool_calls;
+        switch (message.role) {
+            case "assistant": {
+                const toolCalls = [];
+                const invalidToolCalls = [];
+                for (const rawToolCall of rawToolCalls ?? []) {
+                    try {
+                        toolCalls.push(parseToolCall(rawToolCall, { returnId: true }));
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    }
+                    catch (e) {
+                        invalidToolCalls.push(makeInvalidToolCall(rawToolCall, e.message));
+                    }
+                }
+                const additional_kwargs = {
+                    function_call: message.function_call,
+                    tool_calls: rawToolCalls,
+                };
+                if (this.__includeRawResponse !== undefined) {
+                    additional_kwargs.__raw_response = rawResponse;
+                }
+                const response_metadata = {
+                    model_name: rawResponse.model,
+                    ...(rawResponse.system_fingerprint
+                        ? {
+                            usage: { ...rawResponse.usage },
+                            system_fingerprint: rawResponse.system_fingerprint,
+                        }
+                        : {}),
+                };
+                if (message.audio) {
+                    additional_kwargs.audio = message.audio;
+                }
+                return new AIMessage({
+                    content: message.content || "",
+                    tool_calls: toolCalls,
+                    invalid_tool_calls: invalidToolCalls,
+                    additional_kwargs,
+                    response_metadata,
+                    id: rawResponse.id,
+                });
+            }
+            default:
+                return new ChatMessage(message.content || "", message.role ?? "unknown");
+        }
+    }
+    _convertOpenAIDeltaToBaseMessageChunk(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    delta, rawResponse, defaultRole) {
+        const role = delta.role ?? defaultRole;
+        const content = delta.content ?? "";
+        let additional_kwargs;
+        if (delta.function_call) {
+            additional_kwargs = {
+                function_call: delta.function_call,
+            };
+        }
+        else if (delta.tool_calls) {
+            additional_kwargs = {
+                tool_calls: delta.tool_calls,
+            };
+        }
+        else {
+            additional_kwargs = {};
+        }
+        if (this.__includeRawResponse) {
+            additional_kwargs.__raw_response = rawResponse;
+        }
+        if (delta.audio) {
+            additional_kwargs.audio = {
+                ...delta.audio,
+                index: rawResponse.choices[0].index,
+            };
+        }
+        const response_metadata = { usage: { ...rawResponse.usage } };
+        if (role === "user") {
+            return new HumanMessageChunk({ content, response_metadata });
+        }
+        else if (role === "assistant") {
+            const toolCallChunks = [];
+            if (Array.isArray(delta.tool_calls)) {
+                for (const rawToolCall of delta.tool_calls) {
+                    toolCallChunks.push({
+                        name: rawToolCall.function?.name,
+                        args: rawToolCall.function?.arguments,
+                        id: rawToolCall.id,
+                        index: rawToolCall.index,
+                        type: "tool_call_chunk",
+                    });
+                }
+            }
+            return new AIMessageChunk({
+                content,
+                tool_call_chunks: toolCallChunks,
+                additional_kwargs,
+                id: rawResponse.id,
+                response_metadata,
+            });
+        }
+        else if (role === "system") {
+            return new SystemMessageChunk({ content, response_metadata });
+        }
+        else if (role === "developer") {
+            return new SystemMessageChunk({
+                content,
+                response_metadata,
+                additional_kwargs: {
+                    __openai_role__: "developer",
+                },
+            });
+        }
+        else if (role === "function") {
+            return new FunctionMessageChunk({
+                content,
+                additional_kwargs,
+                name: delta.name,
+                response_metadata,
+            });
+        }
+        else if (role === "tool") {
+            return new ToolMessageChunk({
+                content,
+                additional_kwargs,
+                tool_call_id: delta.tool_call_id,
+                response_metadata,
+            });
+        }
+        else {
+            return new ChatMessageChunk({ content, role, response_metadata });
+        }
+    }
     /** @ignore */
     _identifyingParams() {
         return {
@@ -1163,7 +1163,7 @@ export class ChatOpenAI extends BaseChatModel {
             if (!delta) {
                 continue;
             }
-            const chunk = _convertDeltaToMessageChunk(delta, data, defaultRole, this.__includeRawResponse);
+            const chunk = this._convertOpenAIDeltaToBaseMessageChunk(delta, data, defaultRole);
             defaultRole = delta.role ?? defaultRole;
             const newTokenIndices = {
                 prompt: options.promptIndex ?? 0,
@@ -1349,7 +1349,7 @@ export class ChatOpenAI extends BaseChatModel {
                 const text = part.message?.content ?? "";
                 const generation = {
                     text,
-                    message: openAIResponseToChatMessage(part.message ?? { role: "assistant" }, data, this.__includeRawResponse),
+                    message: this._convertOpenAIChatCompletionMessageToBaseMessage(part.message ?? { role: "assistant" }, data),
                 };
                 generation.generationInfo = {
                     ...(part.finish_reason ? { finish_reason: part.finish_reason } : {}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/openai",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "OpenAI integrations for LangChain.js",
   "type": "module",
   "engines": {