langchain 0.0.140 → 0.0.142

package/dist/llms/openai.js

@@ -1,14 +1,13 @@
-import { Configuration, OpenAIApi, } from "openai";
+import { OpenAI as OpenAIClient } from "openai";
 import { calculateMaxTokens } from "../base_language/count_tokens.js";
 import { GenerationChunk } from "../schema/index.js";
-import fetchAdapter from "../util/axios-fetch-adapter.js";
 import { getEndpoint } from "../util/azure.js";
 import { chunkArray } from "../util/chunk.js";
-import { getEnvironmentVariable, isNode } from "../util/env.js";
+import { getEnvironmentVariable } from "../util/env.js";
 import { promptLayerTrackRequest } from "../util/prompt-layer.js";
-import { readableStreamToAsyncIterable } from "../util/stream.js";
 import { BaseLLM } from "./base.js";
 import { OpenAIChat } from "./openai-chat.js";
+import { wrapOpenAIClientError } from "../util/openai.js";
 /**
  * Wrapper around OpenAI large language models.
  *
@@ -268,6 +267,12 @@ export class OpenAI extends BaseLLM {
         this.clientConfig = {
             apiKey: this.openAIApiKey,
             organization: this.organization,
+            baseURL: configuration?.basePath ?? fields?.configuration?.basePath,
+            dangerouslyAllowBrowser: true,
+            defaultHeaders: configuration?.baseOptions?.headers ??
+                fields?.configuration?.baseOptions?.headers,
+            defaultQuery: configuration?.baseOptions?.params ??
+                fields?.configuration?.baseOptions?.params,
             ...configuration,
             ...fields?.configuration,
         };
@@ -292,6 +297,7 @@ export class OpenAI extends BaseLLM {
             ...this.modelKwargs,
         };
     }
+    /** @ignore */
     _identifyingParams() {
         return {
             model_name: this.modelName,
@@ -338,94 +344,62 @@ export class OpenAI extends BaseLLM {
         }
         for (let i = 0; i < subPrompts.length; i += 1) {
             const data = params.stream
-                ? await new Promise((resolve, reject) => {
+                ? await (async () => {
                     const choices = [];
                     let response;
-                    let rejected = false;
-                    let resolved = false;
-                    this.completionWithRetry({
+                    const stream = await this.completionWithRetry({
                         ...params,
+                        stream: true,
                         prompt: subPrompts[i],
-                    }, {
-                        signal: options.signal,
-                        ...options.options,
-                        adapter: fetchAdapter,
-                        responseType: "stream",
-                        onmessage: (event) => {
-                            if (event.data?.trim?.() === "[DONE]") {
-                                if (resolved || rejected) {
-                                    return;
-                                }
-                                resolved = true;
-                                resolve({
-                                    ...response,
-                                    choices,
-                                });
+                    }, options);
+                    for await (const message of stream) {
+                        // on the first message set the response properties
+                        if (!response) {
+                            response = {
+                                id: message.id,
+                                object: message.object,
+                                created: message.created,
+                                model: message.model,
+                            };
+                        }
+                        // on all messages, update choice
+                        for (const part of message.choices) {
+                            if (!choices[part.index]) {
+                                choices[part.index] = part;
                             }
                             else {
-                                const data = JSON.parse(event.data);
-                                if (data?.error) {
-                                    if (rejected) {
-                                        return;
-                                    }
-                                    rejected = true;
-                                    reject(data.error);
-                                    return;
-                                }
-                                const message = data;
-                                // on the first message set the response properties
-                                if (!response) {
-                                    response = {
-                                        id: message.id,
-                                        object: message.object,
-                                        created: message.created,
-                                        model: message.model,
-                                    };
-                                }
-                                // on all messages, update choice
-                                for (const part of message.choices) {
-                                    if (part != null && part.index != null) {
-                                        if (!choices[part.index])
-                                            choices[part.index] = {};
-                                        const choice = choices[part.index];
-                                        choice.text = (choice.text ?? "") + (part.text ?? "");
-                                        choice.finish_reason = part.finish_reason;
-                                        choice.logprobs = part.logprobs;
-                                        // eslint-disable-next-line no-void
-                                        void runManager?.handleLLMNewToken(part.text ?? "", {
-                                            prompt: Math.floor(part.index / this.n),
-                                            completion: part.index % this.n,
-                                        });
-                                    }
-                                }
-                                // when all messages are finished, resolve
-                                if (!resolved &&
-                                    !rejected &&
-                                    choices.every((c) => c.finish_reason != null)) {
-                                    resolved = true;
-                                    resolve({
-                                        ...response,
-                                        choices,
-                                    });
-                                }
+                                const choice = choices[part.index];
+                                choice.text += part.text;
+                                choice.finish_reason = part.finish_reason;
+                                choice.logprobs = part.logprobs;
                             }
-                        },
-                    }).catch((error) => {
-                        if (!rejected) {
-                            rejected = true;
-                            reject(error);
+                            void runManager?.handleLLMNewToken(part.text, {
+                                prompt: Math.floor(part.index / this.n),
+                                completion: part.index % this.n,
+                            });
                         }
-                    });
-                })
+                    }
+                    if (options.signal?.aborted) {
+                        throw new Error("AbortError");
+                    }
+                    return { ...response, choices };
+                })()
                 : await this.completionWithRetry({
                     ...params,
+                    stream: false,
                     prompt: subPrompts[i],
                 }, {
                     signal: options.signal,
                     ...options.options,
                 });
             choices.push(...data.choices);
-            const { completion_tokens: completionTokens, prompt_tokens: promptTokens, total_tokens: totalTokens, } = data.usage ?? {};
+            const { completion_tokens: completionTokens, prompt_tokens: promptTokens, total_tokens: totalTokens, } = data.usage
+                ? data.usage
+                : {
+                    completion_tokens: undefined,
+                    prompt_tokens: undefined,
+                    total_tokens: undefined,
+                };
             if (completionTokens) {
                 tokenUsage.completionTokens =
                     (tokenUsage.completionTokens ?? 0) + completionTokens;
@@ -449,18 +423,16 @@ export class OpenAI extends BaseLLM {
             llmOutput: { tokenUsage },
         };
     }
-    // TODO(jacoblee): Refactor with _generate(..., {stream: true}) implementation
-    // when we integrate OpenAI's new SDK.
+    // TODO(jacoblee): Refactor with _generate(..., {stream: true}) implementation?
     async *_streamResponseChunks(input, options, runManager) {
         const params = {
             ...this.invocationParams(options),
             prompt: input,
             stream: true,
         };
-        const streamIterable = this.startStream(params, options);
-        for await (const streamedResponse of streamIterable) {
-            const data = JSON.parse(streamedResponse);
-            const choice = data.choices?.[0];
+        const stream = await this.completionWithRetry(params, options);
+        for await (const data of stream) {
+            const choice = data.choices[0];
             if (!choice) {
                 continue;
             }
@@ -468,103 +440,71 @@ export class OpenAI extends BaseLLM {
                 text: choice.text,
                 generationInfo: {
                     finishReason: choice.finish_reason,
-                    logprobs: choice.logprobs,
                 },
             });
             yield chunk;
             // eslint-disable-next-line no-void
             void runManager?.handleLLMNewToken(chunk.text ?? "");
         }
+        if (options.signal?.aborted) {
+            throw new Error("AbortError");
+        }
     }
-    startStream(request, options) {
-        let done = false;
-        const stream = new TransformStream();
-        const writer = stream.writable.getWriter();
-        const iterable = readableStreamToAsyncIterable(stream.readable);
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let err;
-        this.completionWithRetry(request, {
-            ...options,
-            adapter: fetchAdapter,
-            responseType: "stream",
-            onmessage: (event) => {
-                if (done)
-                    return;
-                if (event.data?.trim?.() === "[DONE]") {
-                    done = true;
-                    // eslint-disable-next-line no-void
-                    void writer.close();
-                }
-                else {
-                    const data = JSON.parse(event.data);
-                    if (data.error) {
-                        done = true;
-                        throw data.error;
-                    }
-                    // eslint-disable-next-line no-void
-                    void writer.write(event.data);
-                }
-            },
-        }).catch((error) => {
-            if (!done) {
-                err = error;
-                done = true;
-                // eslint-disable-next-line no-void
-                void writer.close();
+    async completionWithRetry(request, options) {
+        const requestOptions = this._getClientOptions(options);
+        return this.caller.call(async () => {
+            try {
+                const res = await this.client.completions.create(request, requestOptions);
+                return res;
+            }
+            catch (e) {
+                const error = wrapOpenAIClientError(e);
+                throw error;
             }
         });
-        return {
-            async next() {
-                const chunk = await iterable.next();
-                if (err) {
-                    throw err;
-                }
-                return chunk;
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-        };
     }
-    /** @ignore */
-    async completionWithRetry(request, options) {
+    /**
+     * Calls the OpenAI API with retry logic in case of failures.
+     * @param request The request to send to the OpenAI API.
+     * @param options Optional configuration for the API call.
+     * @returns The response from the OpenAI API.
+     */
+    _getClientOptions(options) {
         if (!this.client) {
             const openAIEndpointConfig = {
                 azureOpenAIApiDeploymentName: this.azureOpenAIApiDeploymentName,
                 azureOpenAIApiInstanceName: this.azureOpenAIApiInstanceName,
                 azureOpenAIApiKey: this.azureOpenAIApiKey,
                 azureOpenAIBasePath: this.azureOpenAIBasePath,
-                basePath: this.clientConfig.basePath,
+                baseURL: this.clientConfig.baseURL,
             };
             const endpoint = getEndpoint(openAIEndpointConfig);
-            const clientConfig = new Configuration({
+            const params = {
                 ...this.clientConfig,
-                basePath: endpoint,
-                baseOptions: {
-                    timeout: this.timeout,
-                    ...this.clientConfig.baseOptions,
-                },
-            });
-            this.client = new OpenAIApi(clientConfig);
+                baseURL: endpoint,
+                timeout: this.timeout,
+                maxRetries: 0,
+            };
+            if (!params.baseURL) {
+                delete params.baseURL;
+            }
+            this.client = new OpenAIClient(params);
         }
-        const axiosOptions = {
-            adapter: isNode() ? undefined : fetchAdapter,
-            ...this.clientConfig.baseOptions,
+        const requestOptions = {
+            ...this.clientConfig,
             ...options,
         };
         if (this.azureOpenAIApiKey) {
-            axiosOptions.headers = {
+            requestOptions.headers = {
                 "api-key": this.azureOpenAIApiKey,
-                ...axiosOptions.headers,
+                ...requestOptions.headers,
             };
-            axiosOptions.params = {
+            requestOptions.query = {
                 "api-version": this.azureOpenAIApiVersion,
-                ...axiosOptions.params,
+                ...requestOptions.query,
             };
         }
-        return this.caller
-            .call(this.client.createCompletion.bind(this.client), request, axiosOptions)
-            .then((res) => res.data);
+        return requestOptions;
     }
     _llmType() {
         return "openai";
@@ -615,19 +555,6 @@ export class PromptLayerOpenAI extends OpenAI {
             throw new Error("Missing PromptLayer API key");
         }
     }
-    /**
-     * Calls the OpenAI API with retry logic in case of failures.
-     * @param request The request to send to the OpenAI API.
-     * @param options Optional configuration for the API call.
-     * @returns The response from the OpenAI API.
-     */
-    async completionWithRetry(request, options) {
-        if (request.stream) {
-            return super.completionWithRetry(request, options);
-        }
-        const response = await super.completionWithRetry(request);
-        return response;
-    }
     async _generate(prompts, options, runManager) {
         const requestStartTime = Date.now();
         const generations = await super._generate(prompts, options, runManager);
@@ -637,7 +564,9 @@ export class PromptLayerOpenAI extends OpenAI {
                 text: generations.generations[i][0].text,
                 llm_output: generations.llmOutput,
             };
-            const promptLayerRespBody = await promptLayerTrackRequest(this.caller, "langchain.PromptLayerOpenAI", [prompts[i]], this._identifyingParams(), this.plTags, parsedResp, requestStartTime, requestEndTime, this.promptLayerApiKey);
+            const promptLayerRespBody = await promptLayerTrackRequest(this.caller, "langchain.PromptLayerOpenAI", 
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            { ...this._identifyingParams(), prompt: prompts[i] }, this.plTags, parsedResp, requestStartTime, requestEndTime, this.promptLayerApiKey);
             let promptLayerRequestId;
             if (this.returnPromptLayerId === true) {
                 if (promptLayerRespBody && promptLayerRespBody.success === true) {

package/dist/load/import_map.cjs

@@ -24,8 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.retrievers__parent_document = exports.retrievers__multi_vector = exports.retrievers__document_compressors = exports.retrievers__contextual_compression = exports.retrievers__databerry = exports.retrievers__remote = exports.output_parsers = exports.callbacks = exports.schema__storage = exports.schema__runnable = exports.schema__retriever = exports.schema__query_constructor = exports.schema__output_parser = exports.schema = exports.chat_models__minimax = exports.chat_models__ollama = exports.chat_models__baiduwenxin = exports.chat_models__anthropic = exports.chat_models__openai = exports.chat_models__base = exports.document_transformers__openai_functions = exports.document_loaders__web__sort_xyz_blockchain = exports.document_loaders__web__serpapi = exports.document_loaders__base = exports.document = exports.memory = exports.text_splitter = exports.vectorstores__xata = exports.vectorstores__vectara = exports.vectorstores__prisma = exports.vectorstores__memory = exports.vectorstores__base = exports.prompts = exports.llms__ollama = exports.llms__aleph_alpha = exports.llms__ai21 = exports.llms__openai = exports.llms__base = exports.embeddings__minimax = exports.embeddings__openai = exports.embeddings__fake = exports.embeddings__cache_backed = exports.embeddings__base = exports.chains__openai_functions = exports.chains = exports.tools = exports.base_language = exports.agents__toolkits = exports.agents = exports.load__serializable = void 0;
-exports.evaluation = exports.experimental__plan_and_execute = exports.experimental__generative_agents = exports.experimental__babyagi = exports.experimental__autogpt = exports.util__math = exports.storage__in_memory = exports.stores__message__in_memory = exports.stores__file__in_memory = exports.stores__doc__in_memory = exports.cache = exports.retrievers__vespa = exports.retrievers__score_threshold = exports.retrievers__hyde = exports.retrievers__document_compressors__chain_extract = exports.retrievers__time_weighted = void 0;
+exports.retrievers__multi_vector = exports.retrievers__document_compressors = exports.retrievers__contextual_compression = exports.retrievers__databerry = exports.retrievers__remote = exports.output_parsers = exports.callbacks = exports.schema__storage = exports.schema__runnable = exports.schema__retriever = exports.schema__query_constructor = exports.schema__output_parser = exports.schema__document = exports.schema = exports.chat_models__minimax = exports.chat_models__ollama = exports.chat_models__baiduwenxin = exports.chat_models__anthropic = exports.chat_models__openai = exports.chat_models__base = exports.document_transformers__openai_functions = exports.document_loaders__web__sort_xyz_blockchain = exports.document_loaders__web__serpapi = exports.document_loaders__base = exports.document = exports.memory = exports.text_splitter = exports.vectorstores__xata = exports.vectorstores__vectara = exports.vectorstores__prisma = exports.vectorstores__memory = exports.vectorstores__base = exports.prompts = exports.llms__ollama = exports.llms__aleph_alpha = exports.llms__ai21 = exports.llms__openai = exports.llms__base = exports.embeddings__minimax = exports.embeddings__openai = exports.embeddings__fake = exports.embeddings__cache_backed = exports.embeddings__base = exports.chains__openai_functions = exports.chains = exports.tools = exports.base_language = exports.agents__toolkits = exports.agents = exports.load__serializable = void 0;
+exports.evaluation = exports.experimental__plan_and_execute = exports.experimental__generative_agents = exports.experimental__babyagi = exports.experimental__autogpt = exports.util__math = exports.storage__in_memory = exports.stores__message__in_memory = exports.stores__file__in_memory = exports.stores__doc__in_memory = exports.cache = exports.retrievers__vespa = exports.retrievers__score_threshold = exports.retrievers__hyde = exports.retrievers__document_compressors__chain_extract = exports.retrievers__time_weighted = exports.retrievers__parent_document = void 0;
 exports.load__serializable = __importStar(require("../load/serializable.cjs"));
 exports.agents = __importStar(require("../agents/index.cjs"));
 exports.agents__toolkits = __importStar(require("../agents/toolkits/index.cjs"));
@@ -63,6 +63,7 @@ exports.chat_models__baiduwenxin = __importStar(require("../chat_models/baiduwen
 exports.chat_models__ollama = __importStar(require("../chat_models/ollama.cjs"));
 exports.chat_models__minimax = __importStar(require("../chat_models/minimax.cjs"));
 exports.schema = __importStar(require("../schema/index.cjs"));
+exports.schema__document = __importStar(require("../schema/document.cjs"));
 exports.schema__output_parser = __importStar(require("../schema/output_parser.cjs"));
 exports.schema__query_constructor = __importStar(require("../schema/query_constructor.cjs"));
 exports.schema__retriever = __importStar(require("../schema/retriever.cjs"));

package/dist/load/import_map.d.ts

@@ -35,6 +35,7 @@ export * as chat_models__baiduwenxin from "../chat_models/baiduwenxin.js";
 export * as chat_models__ollama from "../chat_models/ollama.js";
 export * as chat_models__minimax from "../chat_models/minimax.js";
 export * as schema from "../schema/index.js";
+export * as schema__document from "../schema/document.js";
 export * as schema__output_parser from "../schema/output_parser.js";
 export * as schema__query_constructor from "../schema/query_constructor.js";
 export * as schema__retriever from "../schema/retriever.js";

package/dist/load/import_map.js

@@ -36,6 +36,7 @@ export * as chat_models__baiduwenxin from "../chat_models/baiduwenxin.js";
 export * as chat_models__ollama from "../chat_models/ollama.js";
 export * as chat_models__minimax from "../chat_models/minimax.js";
 export * as schema from "../schema/index.js";
+export * as schema__document from "../schema/document.js";
 export * as schema__output_parser from "../schema/output_parser.js";
 export * as schema__query_constructor from "../schema/query_constructor.js";
 export * as schema__retriever from "../schema/retriever.js";

package/dist/prompts/chat.cjs

@@ -265,6 +265,9 @@ class ChatPromptTemplate extends BaseChatPromptTemplate {
         if (this.validateTemplate) {
             const inputVariablesMessages = new Set();
             for (const promptMessage of this.promptMessages) {
+                // eslint-disable-next-line no-instanceof/no-instanceof
+                if (promptMessage instanceof index_js_1.BaseMessage)
+                    continue;
                 for (const inputVariable of promptMessage.inputVariables) {
                     inputVariablesMessages.add(inputVariable);
                 }
@@ -294,15 +297,21 @@ class ChatPromptTemplate extends BaseChatPromptTemplate {
         const allValues = await this.mergePartialAndUserVariables(values);
         let resultMessages = [];
         for (const promptMessage of this.promptMessages) {
-            const inputValues = promptMessage.inputVariables.reduce((acc, inputVariable) => {
-                if (!(inputVariable in allValues)) {
-                    throw new Error(`Missing value for input variable \`${inputVariable.toString()}\``);
-                }
-                acc[inputVariable] = allValues[inputVariable];
-                return acc;
-            }, {});
-            const message = await promptMessage.formatMessages(inputValues);
-            resultMessages = resultMessages.concat(message);
+            // eslint-disable-next-line no-instanceof/no-instanceof
+            if (promptMessage instanceof index_js_1.BaseMessage) {
+                resultMessages.push(promptMessage);
+            }
+            else {
+                const inputValues = promptMessage.inputVariables.reduce((acc, inputVariable) => {
+                    if (!(inputVariable in allValues)) {
+                        throw new Error(`Missing value for input variable \`${inputVariable.toString()}\``);
+                    }
+                    acc[inputVariable] = allValues[inputVariable];
+                    return acc;
+                }, {});
+                const message = await promptMessage.formatMessages(inputValues);
+                resultMessages = resultMessages.concat(message);
+            }
         }
         return resultMessages;
     }
@@ -335,6 +344,9 @@ class ChatPromptTemplate extends BaseChatPromptTemplate {
             : acc, Object.create(null));
         const inputVariables = new Set();
         for (const promptMessage of flattenedMessages) {
+            // eslint-disable-next-line no-instanceof/no-instanceof
+            if (promptMessage instanceof index_js_1.BaseMessage)
+                continue;
             for (const inputVariable of promptMessage.inputVariables) {
                 if (inputVariable in flattenedPartialVariables) {
                     continue;

package/dist/prompts/chat.d.ts

@@ -144,7 +144,7 @@ export interface ChatPromptTemplateInput<RunInput extends InputValues = any, Par
     /**
      * The prompt messages
      */
-    promptMessages: BaseMessagePromptTemplate[];
+    promptMessages: Array<BaseMessagePromptTemplate | BaseMessage>;
     /**
      * Whether to try validating the template on initialization
      *
@@ -162,11 +162,11 @@ export declare class ChatPromptTemplate<RunInput extends InputValues = any, Part
     get lc_aliases(): {
         promptMessages: string;
     };
-    promptMessages: BaseMessagePromptTemplate[];
+    promptMessages: Array<BaseMessagePromptTemplate | BaseMessage>;
     validateTemplate: boolean;
     constructor(input: ChatPromptTemplateInput<RunInput, PartialVariableName>);
     _getPromptType(): "chat";
     formatMessages(values: TypedPromptInputValues<RunInput>): Promise<BaseMessage[]>;
     partial<NewPartialVariableName extends string>(values: PartialValues<NewPartialVariableName>): Promise<ChatPromptTemplate<InputValues<Exclude<Extract<keyof RunInput, string>, NewPartialVariableName>>, any>>;
-    static fromPromptMessages<RunInput extends InputValues = any>(promptMessages: (BaseMessagePromptTemplate<InputValues> | ChatPromptTemplate<InputValues, string>)[]): ChatPromptTemplate<RunInput>;
+    static fromPromptMessages<RunInput extends InputValues = any>(promptMessages: (BaseMessagePromptTemplate<InputValues> | ChatPromptTemplate<InputValues, string> | BaseMessage)[]): ChatPromptTemplate<RunInput>;
 }

package/dist/prompts/chat.js

@@ -1,6 +1,6 @@
 // Default generic "any" values are for backwards compatibility.
 // Replace with "string" when we are comfortable with a breaking change.
-import { AIMessage, BasePromptValue, ChatMessage, HumanMessage, SystemMessage, } from "../schema/index.js";
+import { AIMessage, BaseMessage, BasePromptValue, ChatMessage, HumanMessage, SystemMessage, } from "../schema/index.js";
 import { Runnable } from "../schema/runnable.js";
 import { BasePromptTemplate, } from "./base.js";
 import { PromptTemplate } from "./prompt.js";
@@ -253,6 +253,9 @@ export class ChatPromptTemplate extends BaseChatPromptTemplate {
         if (this.validateTemplate) {
             const inputVariablesMessages = new Set();
             for (const promptMessage of this.promptMessages) {
+                // eslint-disable-next-line no-instanceof/no-instanceof
+                if (promptMessage instanceof BaseMessage)
+                    continue;
                 for (const inputVariable of promptMessage.inputVariables) {
                     inputVariablesMessages.add(inputVariable);
                 }
@@ -282,15 +285,21 @@ export class ChatPromptTemplate extends BaseChatPromptTemplate {
         const allValues = await this.mergePartialAndUserVariables(values);
         let resultMessages = [];
         for (const promptMessage of this.promptMessages) {
-            const inputValues = promptMessage.inputVariables.reduce((acc, inputVariable) => {
-                if (!(inputVariable in allValues)) {
-                    throw new Error(`Missing value for input variable \`${inputVariable.toString()}\``);
-                }
-                acc[inputVariable] = allValues[inputVariable];
-                return acc;
-            }, {});
-            const message = await promptMessage.formatMessages(inputValues);
-            resultMessages = resultMessages.concat(message);
+            // eslint-disable-next-line no-instanceof/no-instanceof
+            if (promptMessage instanceof BaseMessage) {
+                resultMessages.push(promptMessage);
+            }
+            else {
+                const inputValues = promptMessage.inputVariables.reduce((acc, inputVariable) => {
+                    if (!(inputVariable in allValues)) {
+                        throw new Error(`Missing value for input variable \`${inputVariable.toString()}\``);
+                    }
+                    acc[inputVariable] = allValues[inputVariable];
+                    return acc;
+                }, {});
+                const message = await promptMessage.formatMessages(inputValues);
+                resultMessages = resultMessages.concat(message);
+            }
         }
         return resultMessages;
     }
@@ -323,6 +332,9 @@ export class ChatPromptTemplate extends BaseChatPromptTemplate {
             : acc, Object.create(null));
         const inputVariables = new Set();
         for (const promptMessage of flattenedMessages) {
+            // eslint-disable-next-line no-instanceof/no-instanceof
+            if (promptMessage instanceof BaseMessage)
+                continue;
             for (const inputVariable of promptMessage.inputVariables) {
                 if (inputVariable in flattenedPartialVariables) {
                     continue;

package/dist/schema/index.d.ts

@@ -1,4 +1,4 @@
-import { ChatCompletionRequestMessageFunctionCall } from "openai";
+import type { OpenAI as OpenAIClient } from "openai";
 import { Document } from "../document.js";
 import { Serializable } from "../load/serializable.js";
 export declare const RUN_KEY = "__run";
@@ -64,7 +64,7 @@ export interface BaseMessageFields {
     content: string;
     name?: string;
     additional_kwargs?: {
-        function_call?: ChatCompletionRequestMessageFunctionCall;
+        function_call?: OpenAIClient.Chat.ChatCompletionMessage.FunctionCall;
         [key: string]: unknown;
     };
 }

package/dist/schema/runnable.cjs

@@ -552,6 +552,9 @@ class RunnableBinding extends Runnable {
             : { ...options, ...this.kwargs };
         return this.bound.batch(inputs, mergedOptions, batchOptions);
     }
+    async *_streamIterator(input, options) {
+        yield* this.bound._streamIterator(input, { ...options, ...this.kwargs });
+    }
     async stream(input, options) {
         return this.bound.stream(input, { ...options, ...this.kwargs });
     }

package/dist/schema/runnable.d.ts

@@ -166,6 +166,7 @@ export declare class RunnableBinding<RunInput, RunOutput, CallOptions extends Ba
     batch(inputs: RunInput[], options?: Partial<CallOptions> | Partial<CallOptions>[], batchOptions?: {
         maxConcurrency?: number;
     }): Promise<RunOutput[]>;
+    _streamIterator(input: RunInput, options?: Partial<CallOptions> | undefined): AsyncGenerator<Awaited<RunOutput>, void, unknown>;
     stream(input: RunInput, options?: Partial<CallOptions> | undefined): Promise<IterableReadableStream<RunOutput>>;
 }
 export type RouterInput = {

package/dist/schema/runnable.js

@@ -544,6 +544,9 @@ export class RunnableBinding extends Runnable {
             : { ...options, ...this.kwargs };
         return this.bound.batch(inputs, mergedOptions, batchOptions);
     }
+    async *_streamIterator(input, options) {
+        yield* this.bound._streamIterator(input, { ...options, ...this.kwargs });
+    }
     async stream(input, options) {
         return this.bound.stream(input, { ...options, ...this.kwargs });
     }

package/dist/tools/convert_to_openai.d.ts

@@ -1,4 +1,4 @@
-import { ChatCompletionFunctions } from "openai";
+import type { OpenAI as OpenAIClient } from "openai";
 import { StructuredTool } from "./base.js";
 /**
  * Formats a `StructuredTool` instance into a format that is compatible
@@ -6,4 +6,4 @@ import { StructuredTool } from "./base.js";
  * function to convert the schema of the `StructuredTool` into a JSON
  * schema, which is then used as the parameters for the OpenAI function.
  */
-export declare function formatToOpenAIFunction(tool: StructuredTool): ChatCompletionFunctions;
+export declare function formatToOpenAIFunction(tool: StructuredTool): OpenAIClient.Chat.ChatCompletionCreateParams.Function;