langchain 0.0.140 → 0.0.141

package/dist/chains/openai_moderation.cjs

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIModerationChain = void 0;
 const openai_1 = require("openai");
 const base_js_1 = require("./base.cjs");
-const axios_fetch_adapter_js_1 = __importDefault(require("../util/axios-fetch-adapter.cjs"));
 const async_caller_js_1 = require("../util/async_caller.cjs");
 const env_js_1 = require("../util/env.cjs");
 /**
@@ -80,16 +76,12 @@ class OpenAIModerationChain extends base_js_1.BaseChain {
             throw new Error("OpenAI API key not found");
         }
         this.openAIOrganization = fields?.openAIOrganization;
-        this.clientConfig = new openai_1.Configuration({
+        this.clientConfig = {
             ...fields?.configuration,
             apiKey: this.openAIApiKey,
             organization: this.openAIOrganization,
-            baseOptions: {
-                adapter: axios_fetch_adapter_js_1.default,
-                ...fields?.configuration?.baseOptions,
-            },
-        });
-        this.client = new openai_1.OpenAIApi(this.clientConfig);
+        };
+        this.client = new openai_1.OpenAI(this.clientConfig);
         this.caller = new async_caller_js_1.AsyncCaller(fields ?? {});
     }
     _moderate(text, results) {
@@ -111,7 +103,7 @@ class OpenAIModerationChain extends base_js_1.BaseChain {
         };
         let mod;
         try {
-            mod = await this.caller.call(() => this.client.createModeration(moderationRequest));
+            mod = await this.caller.call(() => this.client.moderations.create(moderationRequest));
         }
         catch (error) {
             // eslint-disable-next-line no-instanceof/no-instanceof
@@ -122,7 +114,7 @@ class OpenAIModerationChain extends base_js_1.BaseChain {
                 throw new Error(error);
             }
         }
-        const output = this._moderate(text, mod.data.results[0]);
+        const output = this._moderate(text, mod.results[0]);
         return {
             [this.outputKey]: output,
         };

package/dist/chains/openai_moderation.d.ts

@@ -1,4 +1,4 @@
-import { Configuration, OpenAIApi, ConfigurationParameters, CreateModerationResponseResultsInner } from "openai";
+import { type ClientOptions, OpenAI as OpenAIClient } from "openai";
 import { BaseChain, ChainInputs } from "./base.js";
 import { ChainValues } from "../schema/index.js";
 import { AsyncCaller, AsyncCallerParams } from "../util/async_caller.js";
@@ -9,7 +9,7 @@ export interface OpenAIModerationChainInput extends ChainInputs, AsyncCallerPara
     openAIApiKey?: string;
     openAIOrganization?: string;
     throwError?: boolean;
-    configuration?: ConfigurationParameters;
+    configuration?: ClientOptions;
 }
 /**
  * Class representing a chain for moderating text using the OpenAI
@@ -25,12 +25,12 @@ export declare class OpenAIModerationChain extends BaseChain implements OpenAIMo
     outputKey: string;
     openAIApiKey?: string;
     openAIOrganization?: string;
-    clientConfig: Configuration;
-    client: OpenAIApi;
+    clientConfig: ClientOptions;
+    client: OpenAIClient;
     throwError: boolean;
     caller: AsyncCaller;
     constructor(fields?: OpenAIModerationChainInput);
-    _moderate(text: string, results: CreateModerationResponseResultsInner): string;
+    _moderate(text: string, results: OpenAIClient.Moderation): string;
     _call(values: ChainValues): Promise<ChainValues>;
     _chainType(): string;
     get inputKeys(): string[];

package/dist/chains/openai_moderation.js

@@ -1,6 +1,5 @@
-import { Configuration, OpenAIApi, } from "openai";
+import { OpenAI as OpenAIClient } from "openai";
 import { BaseChain } from "./base.js";
-import fetchAdapter from "../util/axios-fetch-adapter.js";
 import { AsyncCaller } from "../util/async_caller.js";
 import { getEnvironmentVariable } from "../util/env.js";
 /**
@@ -74,16 +73,12 @@ export class OpenAIModerationChain extends BaseChain {
             throw new Error("OpenAI API key not found");
         }
         this.openAIOrganization = fields?.openAIOrganization;
-        this.clientConfig = new Configuration({
+        this.clientConfig = {
             ...fields?.configuration,
             apiKey: this.openAIApiKey,
             organization: this.openAIOrganization,
-            baseOptions: {
-                adapter: fetchAdapter,
-                ...fields?.configuration?.baseOptions,
-            },
-        });
-        this.client = new OpenAIApi(this.clientConfig);
+        };
+        this.client = new OpenAIClient(this.clientConfig);
         this.caller = new AsyncCaller(fields ?? {});
     }
     _moderate(text, results) {
@@ -105,7 +100,7 @@ export class OpenAIModerationChain extends BaseChain {
         };
         let mod;
         try {
-            mod = await this.caller.call(() => this.client.createModeration(moderationRequest));
+            mod = await this.caller.call(() => this.client.moderations.create(moderationRequest));
         }
         catch (error) {
             // eslint-disable-next-line no-instanceof/no-instanceof
@@ -116,7 +111,7 @@ export class OpenAIModerationChain extends BaseChain {
                 throw new Error(error);
             }
         }
-        const output = this._moderate(text, mod.data.results[0]);
+        const output = this._moderate(text, mod.results[0]);
         return {
             [this.outputKey]: output,
         };

package/dist/chat_models/anthropic.d.ts

@@ -100,7 +100,7 @@ export declare class ChatAnthropic<CallOptions extends BaseLanguageModelCallOpti
     _identifyingParams(): {
         metadata?: Anthropic.Completions.CompletionCreateParams.Metadata | undefined;
         stream?: boolean | undefined;
-        model: "claude-2" | (string & {}) | "claude-instant-1";
+        model: (string & {}) | "claude-2" | "claude-instant-1";
         temperature?: number | undefined;
         top_p?: number | undefined;
         max_tokens_to_sample: number;
@@ -114,7 +114,7 @@ export declare class ChatAnthropic<CallOptions extends BaseLanguageModelCallOpti
     identifyingParams(): {
         metadata?: Anthropic.Completions.CompletionCreateParams.Metadata | undefined;
         stream?: boolean | undefined;
-        model: "claude-2" | (string & {}) | "claude-instant-1";
+        model: (string & {}) | "claude-2" | "claude-instant-1";
         temperature?: number | undefined;
         top_p?: number | undefined;
         max_tokens_to_sample: number;

package/dist/chat_models/openai.cjs

@@ -1,19 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromptLayerChatOpenAI = exports.ChatOpenAI = void 0;
 const openai_1 = require("openai");
 const count_tokens_js_1 = require("../base_language/count_tokens.cjs");
 const index_js_1 = require("../schema/index.cjs");
 const convert_to_openai_js_1 = require("../tools/convert_to_openai.cjs");
-const axios_fetch_adapter_js_1 = __importDefault(require("../util/axios-fetch-adapter.cjs"));
 const azure_js_1 = require("../util/azure.cjs");
 const env_js_1 = require("../util/env.cjs");
 const prompt_layer_js_1 = require("../util/prompt-layer.cjs");
-const stream_js_1 = require("../util/stream.cjs");
 const base_js_1 = require("./base.cjs");
+const openai_js_1 = require("../util/openai.cjs");
 function extractGenericMessageCustomRole(message) {
     if (message.role !== "system" &&
         message.role !== "assistant" &&
@@ -333,6 +329,12 @@ class ChatOpenAI extends base_js_1.BaseChatModel {
         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,
         };
@@ -369,8 +371,6 @@ class ChatOpenAI extends base_js_1.BaseChatModel {
             ...this.clientConfig,
         };
     }
-    // TODO(jacoblee): Refactor with _generate(..., {stream: true}) implementation
-    // when we integrate OpenAI's new SDK.
     async *_streamResponseChunks(messages, options, runManager) {
         const messagesMapped = messages.map((message) => ({
             role: messageToOpenAIRole(message),
@@ -384,79 +384,32 @@ class ChatOpenAI extends base_js_1.BaseChatModel {
             messages: messagesMapped,
             stream: true,
         };
-        let defaultRole = "assistant";
-        const streamIterable = this.startStream(params, options);
-        for await (const streamedResponse of streamIterable) {
-            const data = JSON.parse(streamedResponse);
-            const choice = data.choices?.[0];
+        let defaultRole;
+        const streamIterable = await this.completionWithRetry(params, options);
+        for await (const data of streamIterable) {
+            const choice = data.choices[0];
             if (!choice) {
                 continue;
             }
             const { delta } = choice;
             const chunk = _convertDeltaToMessageChunk(delta, defaultRole);
-            defaultRole = (delta.role ??
-                defaultRole);
+            defaultRole = delta.role ?? defaultRole;
+            const newTokenIndices = {
+                prompt: options.promptIndex ?? 0,
+                completion: choice.index ?? 0,
+            };
             const generationChunk = new index_js_1.ChatGenerationChunk({
                 message: chunk,
                 text: chunk.content,
+                generationInfo: newTokenIndices,
             });
             yield generationChunk;
             // eslint-disable-next-line no-void
-            void runManager?.handleLLMNewToken(generationChunk.text ?? "", {
-                prompt: 0,
-                completion: choice.index,
-            }, undefined, undefined, undefined, { chunk: generationChunk });
+            void runManager?.handleLLMNewToken(generationChunk.text ?? "", newTokenIndices, undefined, undefined, undefined, { chunk: generationChunk });
+        }
+        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 = (0, stream_js_1.readableStreamToAsyncIterable)(stream.readable);
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let err;
-        this.completionWithRetry(request, {
-            ...options,
-            adapter: axios_fetch_adapter_js_1.default,
-            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();
-            }
-        });
-        return {
-            async next() {
-                const chunk = await iterable.next();
-                if (err) {
-                    throw err;
-                }
-                return chunk;
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-        };
     }
     /**
      * Get the identifying parameters for the model
@@ -475,139 +428,60 @@ class ChatOpenAI extends base_js_1.BaseChatModel {
             function_call: message.additional_kwargs
                 .function_call,
         }));
-        const data = params.stream
-            ? await new Promise((resolve, reject) => {
-                let response;
-                let rejected = false;
-                let resolved = false;
-                this.completionWithRetry({
-                    ...params,
-                    messages: messagesMapped,
-                }, {
-                    signal: options?.signal,
-                    ...options?.options,
-                    adapter: axios_fetch_adapter_js_1.default,
-                    responseType: "stream",
-                    onmessage: (event) => {
-                        if (event.data?.trim?.() === "[DONE]") {
-                            if (resolved || rejected) {
-                                return;
-                            }
-                            resolved = true;
-                            resolve(response);
-                        }
-                        else {
-                            const data = JSON.parse(event.data);
-                            if (!data.id)
-                                return;
-                            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,
-                                    choices: [],
-                                };
-                            }
-                            // on all messages, update choice
-                            for (const part of message.choices ?? []) {
-                                if (part != null) {
-                                    let choice = response.choices.find((c) => c.index === part.index);
-                                    if (!choice) {
-                                        choice = {
-                                            index: part.index,
-                                            finish_reason: part.finish_reason ?? undefined,
-                                        };
-                                        response.choices[part.index] = choice;
-                                    }
-                                    if (!choice.message) {
-                                        choice.message = {
-                                            role: part.delta
-                                                ?.role,
-                                            content: "",
-                                        };
-                                    }
-                                    if (part.delta.function_call &&
-                                        !choice.message.function_call) {
-                                        choice.message.function_call = {
-                                            name: "",
-                                            arguments: "",
-                                        };
-                                    }
-                                    choice.message.content += part.delta?.content ?? "";
-                                    if (choice.message.function_call) {
-                                        choice.message.function_call.name +=
-                                            part.delta?.function_call?.name ?? "";
-                                        choice.message.function_call.arguments +=
-                                            part.delta?.function_call?.arguments ?? "";
-                                    }
-                                    const chunk = _convertDeltaToMessageChunk(part.delta, "assistant");
-                                    const generationChunk = new index_js_1.ChatGenerationChunk({
-                                        message: chunk,
-                                        text: chunk.content,
-                                    });
-                                    void runManager?.handleLLMNewToken(part.delta?.content ?? "", {
-                                        prompt: options.promptIndex ?? 0,
-                                        completion: part.index,
-                                    }, undefined, undefined, undefined, { chunk: generationChunk });
-                                }
-                            }
-                            // when all messages are finished, resolve
-                            if (!resolved &&
-                                !rejected &&
-                                message.choices?.every((c) => c.finish_reason != null)) {
-                                resolved = true;
-                                resolve(response);
-                            }
-                        }
-                    },
-                }).catch((error) => {
-                    if (!rejected) {
-                        rejected = true;
-                        reject(error);
-                    }
-                });
-            })
-            : await this.completionWithRetry({
+        if (params.stream) {
+            const stream = await this._streamResponseChunks(messages, options, runManager);
+            const finalChunks = {};
+            for await (const chunk of stream) {
+                const index = chunk.generationInfo?.completion ?? 0;
+                if (finalChunks[index] === undefined) {
+                    finalChunks[index] = chunk;
+                }
+                else {
+                    finalChunks[index] = finalChunks[index].concat(chunk);
+                }
+            }
+            const generations = Object.entries(finalChunks)
+                .sort(([aKey], [bKey]) => parseInt(aKey, 10) - parseInt(bKey, 10))
+                .map(([_, value]) => value);
+            return { generations };
+        }
+        else {
+            const data = await this.completionWithRetry({
                 ...params,
+                stream: false,
                 messages: messagesMapped,
             }, {
                 signal: options?.signal,
                 ...options?.options,
             });
-        const { completion_tokens: completionTokens, prompt_tokens: promptTokens, total_tokens: totalTokens, } = data.usage ?? {};
-        if (completionTokens) {
-            tokenUsage.completionTokens =
-                (tokenUsage.completionTokens ?? 0) + completionTokens;
-        }
-        if (promptTokens) {
-            tokenUsage.promptTokens = (tokenUsage.promptTokens ?? 0) + promptTokens;
-        }
-        if (totalTokens) {
-            tokenUsage.totalTokens = (tokenUsage.totalTokens ?? 0) + totalTokens;
-        }
-        const generations = [];
-        for (const part of data.choices) {
-            const text = part.message?.content ?? "";
-            generations.push({
-                text,
-                message: openAIResponseToChatMessage(part.message ?? { role: "assistant" }),
-            });
+            const { completion_tokens: completionTokens, prompt_tokens: promptTokens, total_tokens: totalTokens, } = data?.usage ?? {};
+            if (completionTokens) {
+                tokenUsage.completionTokens =
+                    (tokenUsage.completionTokens ?? 0) + completionTokens;
+            }
+            if (promptTokens) {
+                tokenUsage.promptTokens = (tokenUsage.promptTokens ?? 0) + promptTokens;
+            }
+            if (totalTokens) {
+                tokenUsage.totalTokens = (tokenUsage.totalTokens ?? 0) + totalTokens;
+            }
+            const generations = [];
+            for (const part of data?.choices ?? []) {
+                const text = part.message?.content ?? "";
+                const generation = {
+                    text,
+                    message: openAIResponseToChatMessage(part.message ?? { role: "assistant" }),
+                };
+                if (part.finish_reason) {
+                    generation.generationInfo = { finish_reason: part.finish_reason };
+                }
+                generations.push(generation);
+            }
+            return {
+                generations,
+                llmOutput: { tokenUsage },
+            };
         }
-        return {
-            generations,
-            llmOutput: { tokenUsage },
-        };
     }
     async getNumTokensFromMessages(messages) {
         let totalCount = 0;
@@ -635,45 +509,55 @@ class ChatOpenAI extends base_js_1.BaseChatModel {
         totalCount += 3; // every reply is primed with <|start|>assistant<|message|>
         return { totalCount, countPerMessage };
     }
-    /** @ignore */
     async completionWithRetry(request, options) {
+        const requestOptions = this._getClientOptions(options);
+        return this.caller.call(async () => {
+            try {
+                const res = await this.client.chat.completions.create(request, requestOptions);
+                return res;
+            }
+            catch (e) {
+                const error = (0, openai_js_1.wrapOpenAIClientError)(e);
+                throw error;
+            }
+        });
+    }
+    _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 = (0, azure_js_1.getEndpoint)(openAIEndpointConfig);
-            const clientConfig = new openai_1.Configuration({
+            const params = {
                 ...this.clientConfig,
-                basePath: endpoint,
-                baseOptions: {
-                    timeout: this.timeout,
-                    ...this.clientConfig.baseOptions,
-                },
-            });
-            this.client = new openai_1.OpenAIApi(clientConfig);
+                baseURL: endpoint,
+                timeout: this.timeout,
+                maxRetries: 0,
+            };
+            if (!params.baseURL) {
+                delete params.baseURL;
+            }
+            this.client = new openai_1.OpenAI(params);
         }
-        const axiosOptions = {
-            adapter: (0, env_js_1.isNode)() ? undefined : axios_fetch_adapter_js_1.default,
-            ...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.createChatCompletion.bind(this.client), request, axiosOptions)
-            .then((res) => res.data);
+        return requestOptions;
     }
     _llmType() {
         return "openai";
@@ -794,7 +678,7 @@ class PromptLayerChatOpenAI extends ChatOpenAI {
                     role: messageToOpenAIRole(generation.message),
                 },
             ];
-            const promptLayerRespBody = await (0, prompt_layer_js_1.promptLayerTrackRequest)(this.caller, "langchain.PromptLayerChatOpenAI", messageDicts, this._identifyingParams(), this.plTags, parsedResp, requestStartTime, requestEndTime, this.promptLayerApiKey);
+            const promptLayerRespBody = await (0, prompt_layer_js_1.promptLayerTrackRequest)(this.caller, "langchain.PromptLayerChatOpenAI", { ...this._identifyingParams(), messages: messageDicts, stream: false }, this.plTags, parsedResp, requestStartTime, requestEndTime, this.promptLayerApiKey);
             if (this.returnPromptLayerId === true) {
                 if (promptLayerRespBody.success === true) {
                     promptLayerRequestId = promptLayerRespBody.request_id;