langchain 0.0.74 → 0.0.76

package/dist/llms/base.cjs

@@ -5,6 +5,7 @@ const index_js_1 = require("../cache/index.cjs");
 const index_js_2 = require("../schema/index.cjs");
 const index_js_3 = require("../base_language/index.cjs");
 const manager_js_1 = require("../callbacks/manager.cjs");
+const base_js_1 = require("../memory/base.cjs");
 /**
  * LLM Wrapper. Provides an {@link call} (an {@link generate}) function that takes in a prompt (or prompts) and returns a string.
  */
@@ -27,17 +28,25 @@ class BaseLLM extends index_js_3.BaseLanguageModel {
             this.cache = undefined;
         }
     }
-    async generatePrompt(promptValues, stop, callbacks) {
+    async generatePrompt(promptValues, options, callbacks) {
         const prompts = promptValues.map((promptValue) => promptValue.toString());
-        return this.generate(prompts, stop, callbacks);
+        return this.generate(prompts, options, callbacks);
+    }
+    /**
+     * Get the parameters used to invoke the model
+     */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    invocationParams() {
+        return {};
     }
     /** @ignore */
-    async _generateUncached(prompts, stop, callbacks) {
+    async _generateUncached(prompts, options, callbacks) {
         const callbackManager_ = await manager_js_1.CallbackManager.configure(callbacks, this.callbacks, { verbose: this.verbose });
-        const runManager = await callbackManager_?.handleLLMStart({ name: this._llmType() }, prompts);
+        const invocationParams = { invocation_params: this?.invocationParams() };
+        const runManager = await callbackManager_?.handleLLMStart({ name: this._llmType() }, prompts, undefined, undefined, invocationParams);
         let output;
         try {
-            output = await this._generate(prompts, stop, runManager);
+            output = await this._generate(prompts, options, runManager);
         }
         catch (err) {
             await runManager?.handleLLMError(err);
@@ -56,16 +65,29 @@ class BaseLLM extends index_js_3.BaseLanguageModel {
     /**
      * Run the LLM on the given propmts an input, handling caching.
      */
-    async generate(prompts, stop, callbacks) {
+    async generate(prompts, options, callbacks) {
         if (!Array.isArray(prompts)) {
             throw new Error("Argument 'prompts' is expected to be a string[]");
         }
+        let parsedOptions;
+        if (Array.isArray(options)) {
+            parsedOptions = { stop: options };
+        }
+        else if (options?.timeout && !options.signal) {
+            parsedOptions = {
+                ...options,
+                signal: AbortSignal.timeout(options.timeout),
+            };
+        }
+        else {
+            parsedOptions = options ?? {};
+        }
         if (!this.cache) {
-            return this._generateUncached(prompts, stop, callbacks);
+            return this._generateUncached(prompts, parsedOptions, callbacks);
         }
         const { cache } = this;
         const params = this.serialize();
-        params.stop = stop;
+        params.stop = parsedOptions.stop ?? params.stop;
         const llmStringKey = `${Object.entries(params).sort()}`;
         const missingPromptIndices = [];
         const generations = await Promise.all(prompts.map(async (prompt, index) => {
@@ -77,7 +99,7 @@ class BaseLLM extends index_js_3.BaseLanguageModel {
         }));
         let llmOutput = {};
         if (missingPromptIndices.length > 0) {
-            const results = await this._generateUncached(missingPromptIndices.map((i) => prompts[i]), stop, callbacks);
+            const results = await this._generateUncached(missingPromptIndices.map((i) => prompts[i]), parsedOptions, callbacks);
             await Promise.all(results.generations.map(async (generation, index) => {
                 const promptIndex = missingPromptIndices[index];
                 generations[promptIndex] = generation;
@@ -90,10 +112,18 @@ class BaseLLM extends index_js_3.BaseLanguageModel {
     /**
      * Convenience wrapper for {@link generate} that takes in a single string prompt and returns a single string output.
      */
-    async call(prompt, stop, callbacks) {
-        const { generations } = await this.generate([prompt], stop, callbacks);
+    async call(prompt, options, callbacks) {
+        const { generations } = await this.generate([prompt], options ?? {}, callbacks);
         return generations[0][0].text;
     }
+    async predict(text, options, callbacks) {
+        return this.call(text, options, callbacks);
+    }
+    async predictMessages(messages, options, callbacks) {
+        const text = (0, base_js_1.getBufferString)(messages);
+        const prediction = await this.call(text, options, callbacks);
+        return new index_js_2.AIChatMessage(prediction);
+    }
     /**
      * Get the identifying parameters of the LLM.
      */
@@ -140,12 +170,8 @@ exports.BaseLLM = BaseLLM;
  * @augments BaseLLM
  */
 class LLM extends BaseLLM {
-    async _generate(prompts, stop, runManager) {
-        const generations = [];
-        for (let i = 0; i < prompts.length; i += 1) {
-            const text = await this._call(prompts[i], stop, runManager);
-            generations.push([{ text }]);
-        }
+    async _generate(prompts, options, runManager) {
+        const generations = await Promise.all(prompts.map((prompt) => this._call(prompt, options, runManager).then((text) => [{ text }])));
         return { generations };
     }
 }

package/dist/llms/base.d.ts

@@ -1,4 +1,4 @@
-import { BaseCache, BasePromptValue, LLMResult } from "../schema/index.js";
+import { BaseCache, BaseChatMessage, BasePromptValue, LLMResult } from "../schema/index.js";
 import { BaseLanguageModel, BaseLanguageModelCallOptions, BaseLanguageModelParams } from "../base_language/index.js";
 import { CallbackManagerForLLMRun, Callbacks } from "../callbacks/manager.js";
 export type SerializedLLM = {
@@ -18,24 +18,31 @@ export interface BaseLLMCallOptions extends BaseLanguageModelCallOptions {
  * LLM Wrapper. Provides an {@link call} (an {@link generate}) function that takes in a prompt (or prompts) and returns a string.
  */
 export declare abstract class BaseLLM extends BaseLanguageModel {
-    CallOptions: BaseLanguageModelCallOptions;
+    CallOptions: BaseLLMCallOptions;
+    ParsedCallOptions: Omit<this["CallOptions"], "timeout">;
     cache?: BaseCache;
     constructor({ cache, concurrency, ...rest }: BaseLLMParams);
-    generatePrompt(promptValues: BasePromptValue[], stop?: string[] | this["CallOptions"], callbacks?: Callbacks): Promise<LLMResult>;
+    generatePrompt(promptValues: BasePromptValue[], options?: string[] | this["CallOptions"], callbacks?: Callbacks): Promise<LLMResult>;
     /**
      * Run the LLM on the given prompts and input.
      */
-    abstract _generate(prompts: string[], stop?: string[] | this["CallOptions"], runManager?: CallbackManagerForLLMRun): Promise<LLMResult>;
+    abstract _generate(prompts: string[], options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): Promise<LLMResult>;
+    /**
+     * Get the parameters used to invoke the model
+     */
+    invocationParams(): any;
     /** @ignore */
-    _generateUncached(prompts: string[], stop?: string[] | this["CallOptions"], callbacks?: Callbacks): Promise<LLMResult>;
+    _generateUncached(prompts: string[], options: this["CallOptions"], callbacks?: Callbacks): Promise<LLMResult>;
     /**
      * Run the LLM on the given propmts an input, handling caching.
      */
-    generate(prompts: string[], stop?: string[] | this["CallOptions"], callbacks?: Callbacks): Promise<LLMResult>;
+    generate(prompts: string[], options?: string[] | this["CallOptions"], callbacks?: Callbacks): Promise<LLMResult>;
     /**
      * Convenience wrapper for {@link generate} that takes in a single string prompt and returns a single string output.
      */
-    call(prompt: string, stop?: string[] | this["CallOptions"], callbacks?: Callbacks): Promise<string>;
+    call(prompt: string, options?: string[] | this["CallOptions"], callbacks?: Callbacks): Promise<string>;
+    predict(text: string, options?: string[] | this["CallOptions"], callbacks?: Callbacks): Promise<string>;
+    predictMessages(messages: BaseChatMessage[], options?: string[] | this["CallOptions"], callbacks?: Callbacks): Promise<BaseChatMessage>;
     /**
      * Get the identifying parameters of the LLM.
      */
@@ -65,6 +72,6 @@ export declare abstract class LLM extends BaseLLM {
     /**
      * Run the LLM on the given prompt and input.
      */
-    abstract _call(prompt: string, stop?: string[] | this["CallOptions"], runManager?: CallbackManagerForLLMRun): Promise<string>;
-    _generate(prompts: string[], stop?: string[] | this["CallOptions"], runManager?: CallbackManagerForLLMRun): Promise<LLMResult>;
+    abstract _call(prompt: string, options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): Promise<string>;
+    _generate(prompts: string[], options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): Promise<LLMResult>;
 }

package/dist/llms/base.js

@@ -1,7 +1,8 @@
 import { InMemoryCache } from "../cache/index.js";
-import { RUN_KEY, } from "../schema/index.js";
+import { AIChatMessage, RUN_KEY, } from "../schema/index.js";
 import { BaseLanguageModel, } from "../base_language/index.js";
 import { CallbackManager, } from "../callbacks/manager.js";
+import { getBufferString } from "../memory/base.js";
 /**
  * LLM Wrapper. Provides an {@link call} (an {@link generate}) function that takes in a prompt (or prompts) and returns a string.
  */
@@ -24,17 +25,25 @@ export class BaseLLM extends BaseLanguageModel {
             this.cache = undefined;
         }
     }
-    async generatePrompt(promptValues, stop, callbacks) {
+    async generatePrompt(promptValues, options, callbacks) {
         const prompts = promptValues.map((promptValue) => promptValue.toString());
-        return this.generate(prompts, stop, callbacks);
+        return this.generate(prompts, options, callbacks);
+    }
+    /**
+     * Get the parameters used to invoke the model
+     */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    invocationParams() {
+        return {};
     }
     /** @ignore */
-    async _generateUncached(prompts, stop, callbacks) {
+    async _generateUncached(prompts, options, callbacks) {
         const callbackManager_ = await CallbackManager.configure(callbacks, this.callbacks, { verbose: this.verbose });
-        const runManager = await callbackManager_?.handleLLMStart({ name: this._llmType() }, prompts);
+        const invocationParams = { invocation_params: this?.invocationParams() };
+        const runManager = await callbackManager_?.handleLLMStart({ name: this._llmType() }, prompts, undefined, undefined, invocationParams);
         let output;
         try {
-            output = await this._generate(prompts, stop, runManager);
+            output = await this._generate(prompts, options, runManager);
         }
         catch (err) {
             await runManager?.handleLLMError(err);
@@ -53,16 +62,29 @@ export class BaseLLM extends BaseLanguageModel {
     /**
      * Run the LLM on the given propmts an input, handling caching.
      */
-    async generate(prompts, stop, callbacks) {
+    async generate(prompts, options, callbacks) {
         if (!Array.isArray(prompts)) {
             throw new Error("Argument 'prompts' is expected to be a string[]");
         }
+        let parsedOptions;
+        if (Array.isArray(options)) {
+            parsedOptions = { stop: options };
+        }
+        else if (options?.timeout && !options.signal) {
+            parsedOptions = {
+                ...options,
+                signal: AbortSignal.timeout(options.timeout),
+            };
+        }
+        else {
+            parsedOptions = options ?? {};
+        }
         if (!this.cache) {
-            return this._generateUncached(prompts, stop, callbacks);
+            return this._generateUncached(prompts, parsedOptions, callbacks);
         }
         const { cache } = this;
         const params = this.serialize();
-        params.stop = stop;
+        params.stop = parsedOptions.stop ?? params.stop;
         const llmStringKey = `${Object.entries(params).sort()}`;
         const missingPromptIndices = [];
         const generations = await Promise.all(prompts.map(async (prompt, index) => {
@@ -74,7 +96,7 @@ export class BaseLLM extends BaseLanguageModel {
         }));
         let llmOutput = {};
         if (missingPromptIndices.length > 0) {
-            const results = await this._generateUncached(missingPromptIndices.map((i) => prompts[i]), stop, callbacks);
+            const results = await this._generateUncached(missingPromptIndices.map((i) => prompts[i]), parsedOptions, callbacks);
             await Promise.all(results.generations.map(async (generation, index) => {
                 const promptIndex = missingPromptIndices[index];
                 generations[promptIndex] = generation;
@@ -87,10 +109,18 @@ export class BaseLLM extends BaseLanguageModel {
     /**
      * Convenience wrapper for {@link generate} that takes in a single string prompt and returns a single string output.
      */
-    async call(prompt, stop, callbacks) {
-        const { generations } = await this.generate([prompt], stop, callbacks);
+    async call(prompt, options, callbacks) {
+        const { generations } = await this.generate([prompt], options ?? {}, callbacks);
         return generations[0][0].text;
     }
+    async predict(text, options, callbacks) {
+        return this.call(text, options, callbacks);
+    }
+    async predictMessages(messages, options, callbacks) {
+        const text = getBufferString(messages);
+        const prediction = await this.call(text, options, callbacks);
+        return new AIChatMessage(prediction);
+    }
     /**
      * Get the identifying parameters of the LLM.
      */
@@ -136,12 +166,8 @@ export class BaseLLM extends BaseLanguageModel {
  * @augments BaseLLM
  */
 export class LLM extends BaseLLM {
-    async _generate(prompts, stop, runManager) {
-        const generations = [];
-        for (let i = 0; i < prompts.length; i += 1) {
-            const text = await this._call(prompts[i], stop, runManager);
-            generations.push([{ text }]);
-        }
+    async _generate(prompts, options, runManager) {
+        const generations = await Promise.all(prompts.map((prompt) => this._call(prompt, options, runManager).then((text) => [{ text }])));
         return { generations };
     }
 }

package/dist/llms/cohere.cjs

@@ -45,15 +45,16 @@ class Cohere extends base_js_1.LLM {
         return "cohere";
     }
     /** @ignore */
-    async _call(prompt, _stop) {
+    async _call(prompt, options) {
         const { cohere } = await Cohere.imports();
         cohere.init(this.apiKey);
         // Hit the `generate` endpoint on the `large` model
-        const generateResponse = await this.caller.call(cohere.generate.bind(cohere), {
+        const generateResponse = await this.caller.callWithOptions({ signal: options.signal }, cohere.generate.bind(cohere), {
             prompt,
             model: this.model,
             max_tokens: this.maxTokens,
             temperature: this.temperature,
+            end_sequences: options.stop,
         });
         try {
             return generateResponse.body.generations[0].text;

package/dist/llms/cohere.d.ts

@@ -18,7 +18,7 @@ export declare class Cohere extends LLM implements CohereInput {
     constructor(fields?: CohereInput);
     _llmType(): string;
     /** @ignore */
-    _call(prompt: string, _stop?: string[]): Promise<string>;
+    _call(prompt: string, options: this["ParsedCallOptions"]): Promise<string>;
     /** @ignore */
     static imports(): Promise<{
         cohere: typeof import("cohere-ai");

package/dist/llms/cohere.js

@@ -42,15 +42,16 @@ export class Cohere extends LLM {
         return "cohere";
     }
     /** @ignore */
-    async _call(prompt, _stop) {
+    async _call(prompt, options) {
         const { cohere } = await Cohere.imports();
         cohere.init(this.apiKey);
         // Hit the `generate` endpoint on the `large` model
-        const generateResponse = await this.caller.call(cohere.generate.bind(cohere), {
+        const generateResponse = await this.caller.callWithOptions({ signal: options.signal }, cohere.generate.bind(cohere), {
             prompt,
             model: this.model,
             max_tokens: this.maxTokens,
             temperature: this.temperature,
+            end_sequences: options.stop,
         });
         try {
             return generateResponse.body.generations[0].text;

package/dist/llms/hf.cjs

@@ -67,10 +67,10 @@ class HuggingFaceInference extends base_js_1.LLM {
         return "huggingface_hub";
     }
     /** @ignore */
-    async _call(prompt, _stop) {
+    async _call(prompt, options) {
         const { HfInference } = await HuggingFaceInference.imports();
         const hf = new HfInference(this.apiKey);
-        const res = await this.caller.call(hf.textGeneration.bind(hf), {
+        const res = await this.caller.callWithOptions({ signal: options.signal }, hf.textGeneration.bind(hf), {
             model: this.model,
             parameters: {
                 // make it behave similar to openai, returning only the generated text

package/dist/llms/hf.d.ts

@@ -28,7 +28,7 @@ export declare class HuggingFaceInference extends LLM implements HFInput {
     constructor(fields?: Partial<HFInput> & BaseLLMParams);
     _llmType(): string;
     /** @ignore */
-    _call(prompt: string, _stop?: string[]): Promise<string>;
+    _call(prompt: string, options: this["ParsedCallOptions"]): Promise<string>;
     /** @ignore */
     static imports(): Promise<{
         HfInference: typeof import("@huggingface/inference").HfInference;

package/dist/llms/hf.js

@@ -64,10 +64,10 @@ export class HuggingFaceInference extends LLM {
         return "huggingface_hub";
     }
     /** @ignore */
-    async _call(prompt, _stop) {
+    async _call(prompt, options) {
         const { HfInference } = await HuggingFaceInference.imports();
         const hf = new HfInference(this.apiKey);
-        const res = await this.caller.call(hf.textGeneration.bind(hf), {
+        const res = await this.caller.callWithOptions({ signal: options.signal }, hf.textGeneration.bind(hf), {
             model: this.model,
             parameters: {
                 // make it behave similar to openai, returning only the generated text

package/dist/llms/openai-chat.cjs

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromptLayerOpenAIChat = exports.OpenAIChat = void 0;
-const browser_or_node_1 = require("browser-or-node");
 const openai_1 = require("openai");
+const env_js_1 = require("../util/env.cjs");
 const axios_fetch_adapter_js_1 = __importDefault(require("../util/axios-fetch-adapter.cjs"));
 const base_js_1 = require("./base.cjs");
 /**
@@ -31,6 +31,9 @@ const base_js_1 = require("./base.cjs");
  * @augments AzureOpenAIChatInput
  */
 class OpenAIChat extends base_js_1.LLM {
+    get callKeys() {
+        return ["stop", "signal", "timeout", "options"];
+    }
     constructor(fields, configuration) {
         super(fields ?? {});
         Object.defineProperty(this, "temperature", {
@@ -255,16 +258,8 @@ class OpenAIChat extends base_js_1.LLM {
         return this.prefixMessages ? [...this.prefixMessages, message] : [message];
     }
     /** @ignore */
-    async _call(prompt, stopOrOptions, runManager) {
-        const stop = Array.isArray(stopOrOptions)
-            ? stopOrOptions
-            : stopOrOptions?.stop;
-        const options = Array.isArray(stopOrOptions)
-            ? {}
-            : stopOrOptions?.options ?? {};
-        if (this.stop && stop) {
-            throw new Error("Stop found in input and default params");
-        }
+    async _call(prompt, options, runManager) {
+        const { stop } = options;
         const params = this.invocationParams();
         params.stop = stop ?? params.stop;
         const data = params.stream
@@ -276,7 +271,8 @@ class OpenAIChat extends base_js_1.LLM {
                     ...params,
                     messages: this.formatMessages(prompt),
                 }, {
-                    ...options,
+                    signal: options.signal,
+                    ...options.options,
                     adapter: axios_fetch_adapter_js_1.default,
                     responseType: "stream",
                     onmessage: (event) => {
@@ -340,7 +336,10 @@ class OpenAIChat extends base_js_1.LLM {
             : await this.completionWithRetry({
                 ...params,
                 messages: this.formatMessages(prompt),
-            }, options);
+            }, {
+                signal: options.signal,
+                ...options.options,
+            });
         return data.choices[0].message?.content ?? "";
     }
     /** @ignore */
@@ -360,7 +359,7 @@ class OpenAIChat extends base_js_1.LLM {
             this.client = new openai_1.OpenAIApi(clientConfig);
         }
         const axiosOptions = {
-            adapter: browser_or_node_1.isNode ? undefined : axios_fetch_adapter_js_1.default,
+            adapter: (0, env_js_1.isNode)() ? undefined : axios_fetch_adapter_js_1.default,
             ...this.clientConfig.baseOptions,
             ...options,
         };

package/dist/llms/openai-chat.d.ts

@@ -28,6 +28,7 @@ export { OpenAICallOptions, OpenAIChatInput, AzureOpenAIInput };
  */
 export declare class OpenAIChat extends LLM implements OpenAIChatInput, AzureOpenAIInput {
     CallOptions: OpenAICallOptions;
+    get callKeys(): (keyof OpenAICallOptions)[];
     temperature: number;
     topP: number;
     frequencyPenalty: number;
@@ -104,7 +105,7 @@ export declare class OpenAIChat extends LLM implements OpenAIChatInput, AzureOpe
     };
     private formatMessages;
     /** @ignore */
-    _call(prompt: string, stopOrOptions?: string[] | this["CallOptions"], runManager?: CallbackManagerForLLMRun): Promise<string>;
+    _call(prompt: string, options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): Promise<string>;
     /** @ignore */
     completionWithRetry(request: CreateChatCompletionRequest, options?: StreamingAxiosConfiguration): Promise<CreateChatCompletionResponse>;
     _llmType(): string;

package/dist/llms/openai-chat.js

@@ -1,5 +1,5 @@
-import { isNode } from "browser-or-node";
 import { Configuration, OpenAIApi, } from "openai";
+import { isNode } from "../util/env.js";
 import fetchAdapter from "../util/axios-fetch-adapter.js";
 import { LLM } from "./base.js";
 /**
@@ -25,6 +25,9 @@ import { LLM } from "./base.js";
  * @augments AzureOpenAIChatInput
  */
 export class OpenAIChat extends LLM {
+    get callKeys() {
+        return ["stop", "signal", "timeout", "options"];
+    }
     constructor(fields, configuration) {
         super(fields ?? {});
         Object.defineProperty(this, "temperature", {
@@ -249,16 +252,8 @@ export class OpenAIChat extends LLM {
         return this.prefixMessages ? [...this.prefixMessages, message] : [message];
     }
     /** @ignore */
-    async _call(prompt, stopOrOptions, runManager) {
-        const stop = Array.isArray(stopOrOptions)
-            ? stopOrOptions
-            : stopOrOptions?.stop;
-        const options = Array.isArray(stopOrOptions)
-            ? {}
-            : stopOrOptions?.options ?? {};
-        if (this.stop && stop) {
-            throw new Error("Stop found in input and default params");
-        }
+    async _call(prompt, options, runManager) {
+        const { stop } = options;
         const params = this.invocationParams();
         params.stop = stop ?? params.stop;
         const data = params.stream
@@ -270,7 +265,8 @@ export class OpenAIChat extends LLM {
                     ...params,
                     messages: this.formatMessages(prompt),
                 }, {
-                    ...options,
+                    signal: options.signal,
+                    ...options.options,
                     adapter: fetchAdapter,
                     responseType: "stream",
                     onmessage: (event) => {
@@ -334,7 +330,10 @@ export class OpenAIChat extends LLM {
             : await this.completionWithRetry({
                 ...params,
                 messages: this.formatMessages(prompt),
-            }, options);
+            }, {
+                signal: options.signal,
+                ...options.options,
+            });
         return data.choices[0].message?.content ?? "";
     }
     /** @ignore */
@@ -354,7 +353,7 @@ export class OpenAIChat extends LLM {
             this.client = new OpenAIApi(clientConfig);
         }
         const axiosOptions = {
-            adapter: isNode ? undefined : fetchAdapter,
+            adapter: isNode() ? undefined : fetchAdapter,
             ...this.clientConfig.baseOptions,
             ...options,
         };

package/dist/llms/openai.cjs

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromptLayerOpenAIChat = exports.OpenAIChat = exports.PromptLayerOpenAI = exports.OpenAI = void 0;
-const browser_or_node_1 = require("browser-or-node");
 const openai_1 = require("openai");
+const env_js_1 = require("../util/env.cjs");
 const axios_fetch_adapter_js_1 = __importDefault(require("../util/axios-fetch-adapter.cjs"));
 const chunk_js_1 = require("../util/chunk.cjs");
 const base_js_1 = require("./base.cjs");
@@ -30,6 +30,9 @@ const openai_chat_js_1 = require("./openai-chat.cjs");
  * if not explicitly available on this class.
  */
 class OpenAI extends base_js_1.BaseLLM {
+    get callKeys() {
+        return ["stop", "signal", "timeout", "options"];
+    }
     constructor(fields, configuration) {
         if (fields?.modelName?.startsWith("gpt-3.5-turbo") ||
             fields?.modelName?.startsWith("gpt-4") ||
@@ -264,8 +267,8 @@ class OpenAI extends base_js_1.BaseLLM {
     /**
      * Call out to OpenAI's endpoint with k unique prompts
      *
-     * @param prompts - The prompts to pass into the model.
-     * @param [stop] - Optional list of stop words to use when generating.
+     * @param [prompts] - The prompts to pass into the model.
+     * @param [options] - Optional list of stop words to use when generating.
      * @param [runManager] - Optional callback manager to use when generating.
      *
      * @returns The full LLM output.
@@ -277,13 +280,8 @@ class OpenAI extends base_js_1.BaseLLM {
      * const response = await openai.generate(["Tell me a joke."]);
      * ```
      */
-    async _generate(prompts, stopOrOptions, runManager) {
-        const stop = Array.isArray(stopOrOptions)
-            ? stopOrOptions
-            : stopOrOptions?.stop;
-        const options = Array.isArray(stopOrOptions)
-            ? {}
-            : stopOrOptions?.options ?? {};
+    async _generate(prompts, options, runManager) {
+        const { stop } = options;
         const subPrompts = (0, chunk_js_1.chunkArray)(prompts, this.batchSize);
         const choices = [];
         const tokenUsage = {};
@@ -313,7 +311,8 @@ class OpenAI extends base_js_1.BaseLLM {
                         ...params,
                         prompt: subPrompts[i],
                     }, {
-                        ...options,
+                        signal: options.signal,
+                        ...options.options,
                         adapter: axios_fetch_adapter_js_1.default,
                         responseType: "stream",
                         onmessage: (event) => {
@@ -374,7 +373,10 @@ class OpenAI extends base_js_1.BaseLLM {
                 : await this.completionWithRetry({
                     ...params,
                     prompt: subPrompts[i],
-                }, options);
+                }, {
+                    signal: options.signal,
+                    ...options.options,
+                });
             choices.push(...data.choices);
             const { completion_tokens: completionTokens, prompt_tokens: promptTokens, total_tokens: totalTokens, } = data.usage ?? {};
             if (completionTokens) {
@@ -417,7 +419,7 @@ class OpenAI extends base_js_1.BaseLLM {
             this.client = new openai_1.OpenAIApi(clientConfig);
         }
         const axiosOptions = {
-            adapter: browser_or_node_1.isNode ? undefined : axios_fetch_adapter_js_1.default,
+            adapter: (0, env_js_1.isNode)() ? undefined : axios_fetch_adapter_js_1.default,
             ...this.clientConfig.baseOptions,
             ...options,
         };

package/dist/llms/openai.d.ts

@@ -25,6 +25,7 @@ export { OpenAICallOptions, AzureOpenAIInput, OpenAIInput };
  */
 export declare class OpenAI extends BaseLLM implements OpenAIInput, AzureOpenAIInput {
     CallOptions: OpenAICallOptions;
+    get callKeys(): (keyof OpenAICallOptions)[];
     temperature: number;
     maxTokens: number;
     topP: number;
@@ -112,8 +113,8 @@ export declare class OpenAI extends BaseLLM implements OpenAIInput, AzureOpenAII
     /**
      * Call out to OpenAI's endpoint with k unique prompts
      *
-     * @param prompts - The prompts to pass into the model.
-     * @param [stop] - Optional list of stop words to use when generating.
+     * @param [prompts] - The prompts to pass into the model.
+     * @param [options] - Optional list of stop words to use when generating.
      * @param [runManager] - Optional callback manager to use when generating.
      *
      * @returns The full LLM output.
@@ -125,7 +126,7 @@ export declare class OpenAI extends BaseLLM implements OpenAIInput, AzureOpenAII
      * const response = await openai.generate(["Tell me a joke."]);
      * ```
      */
-    _generate(prompts: string[], stopOrOptions?: string[] | this["CallOptions"], runManager?: CallbackManagerForLLMRun): Promise<LLMResult>;
+    _generate(prompts: string[], options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): Promise<LLMResult>;
     /** @ignore */
     completionWithRetry(request: CreateCompletionRequest, options?: StreamingAxiosConfiguration): Promise<CreateCompletionResponse>;
     _llmType(): string;