langchain 0.0.197-rc.0 → 0.0.197-rc.1

package/dist/experimental/openai_assistant/index.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIAssistantRunnable = void 0;
-const openai_1 = require("openai");
+const openai_1 = require("@langchain/openai");
 const base_js_1 = require("../../schema/runnable/base.cjs");
 const time_js_1 = require("../../util/time.cjs");
 const base_js_2 = require("../../tools/base.cjs");
@@ -39,7 +39,7 @@ class OpenAIAssistantRunnable extends base_js_1.Runnable {
             writable: true,
             value: void 0
         });
-        this.client = fields.client ?? new openai_1.OpenAI(fields?.clientOptions);
+        this.client = fields.client ?? new openai_1.OpenAIClient(fields?.clientOptions);
         this.assistantId = fields.assistantId;
         this.asAgent = fields.asAgent ?? this.asAgent;
     }
@@ -51,7 +51,7 @@ class OpenAIAssistantRunnable extends base_js_1.Runnable {
             }
             return tool;
         }) ?? [];
-        const oaiClient = client ?? new openai_1.OpenAI(clientOptions);
+        const oaiClient = client ?? new openai_1.OpenAIClient(clientOptions);
         const assistant = await oaiClient.beta.assistants.create({
             name,
             instructions,

package/dist/experimental/openai_assistant/index.d.ts

@@ -1,4 +1,4 @@
-import { type ClientOptions, OpenAI as OpenAIClient } from "openai";
+import { type ClientOptions, OpenAIClient } from "@langchain/openai";
 import { Runnable } from "../../schema/runnable/base.js";
 import type { RunnableConfig } from "../../schema/runnable/config.js";
 import type { OpenAIAssistantFinish, OpenAIAssistantAction, OpenAIToolType } from "./schema.js";

package/dist/experimental/openai_assistant/index.js

@@ -1,4 +1,4 @@
-import { OpenAI as OpenAIClient } from "openai";
+import { OpenAIClient } from "@langchain/openai";
 import { Runnable } from "../../schema/runnable/base.js";
 import { sleep } from "../../util/time.js";
 import { StructuredTool } from "../../tools/base.js";

package/dist/experimental/openai_assistant/schema.d.ts

@@ -1,4 +1,4 @@
-import type { OpenAI as OpenAIClient } from "openai";
+import type { OpenAIClient } from "@langchain/openai";
 import type { AgentFinish, AgentAction } from "../../schema/index.js";
 export type OpenAIAssistantFinish = AgentFinish & {
     runId: string;

package/dist/experimental/openai_files/index.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIFiles = void 0;
-const openai_1 = require("openai");
+const openai_1 = require("@langchain/openai");
 const serializable_js_1 = require("../../load/serializable.cjs");
 class OpenAIFiles extends serializable_js_1.Serializable {
     constructor(fields) {
@@ -18,7 +18,7 @@ class OpenAIFiles extends serializable_js_1.Serializable {
             writable: true,
             value: void 0
         });
-        this.oaiClient = fields?.client ?? new openai_1.OpenAI(fields?.clientOptions);
+        this.oaiClient = fields?.client ?? new openai_1.OpenAIClient(fields?.clientOptions);
     }
     /**
      * Upload file

package/dist/experimental/openai_files/index.d.ts

@@ -1,4 +1,4 @@
-import { ClientOptions, OpenAI as OpenAIClient } from "openai";
+import { OpenAIClient, type ClientOptions } from "@langchain/openai";
 import { Serializable } from "../../load/serializable.js";
 export type OpenAIFilesInput = {
     client?: OpenAIClient;

package/dist/experimental/openai_files/index.js

@@ -1,4 +1,4 @@
-import { OpenAI as OpenAIClient } from "openai";
+import { OpenAIClient } from "@langchain/openai";
 import { Serializable } from "../../load/serializable.js";
 export class OpenAIFiles extends Serializable {
     constructor(fields) {

package/dist/experimental/plan_and_execute/prompt.d.ts

@@ -10,4 +10,4 @@ export declare const DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE = "Previo
  * @param tools the tools available to the `planner`
  * @returns
  */
-export declare const getPlannerChatPrompt: (tools: Tool[] | DynamicStructuredTool[]) => Promise<ChatPromptTemplate<import("langchain-core/utils/types").InputValues<string>, any>>;
+export declare const getPlannerChatPrompt: (tools: Tool[] | DynamicStructuredTool[]) => Promise<ChatPromptTemplate<import("@langchain/core/utils/types").InputValues<string>, any>>;

package/dist/llms/base.cjs

@@ -14,4 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("langchain-core/language_models/llms"), exports);
+__exportStar(require("@langchain/core/language_models/llms"), exports);

package/dist/llms/base.d.ts

@@ -1 +1 @@
-export * from "langchain-core/language_models/llms";
+export * from "@langchain/core/language_models/llms";

package/dist/llms/base.js

@@ -1 +1 @@
-export * from "langchain-core/language_models/llms";
+export * from "@langchain/core/language_models/llms";

package/dist/llms/fireworks.d.ts

@@ -1,4 +1,4 @@
-import type { OpenAI as OpenAIClient } from "openai";
+import type { OpenAIClient } from "@langchain/openai";
 import type { BaseLLMParams } from "./base.js";
 import type { OpenAICallOptions, OpenAIInput } from "./openai.js";
 import type { OpenAICoreRequestOptions } from "../types/openai-types.js";
@@ -26,7 +26,7 @@ export declare class Fireworks extends OpenAI<FireworksCallOptions> {
     constructor(fields?: Partial<Omit<OpenAIInput, "openAIApiKey" | FireworksUnsupportedArgs>> & BaseLLMParams & {
         fireworksApiKey?: string;
     });
-    toJSON(): import("langchain-core/load/serializable").Serialized;
+    toJSON(): import("@langchain/core/load/serializable").Serialized;
     completionWithRetry(request: OpenAIClient.CompletionCreateParamsStreaming, options?: OpenAICoreRequestOptions): Promise<AsyncIterable<OpenAIClient.Completion>>;
     completionWithRetry(request: OpenAIClient.CompletionCreateParamsNonStreaming, options?: OpenAICoreRequestOptions): Promise<OpenAIClient.Completions.Completion>;
 }

package/dist/llms/openai-chat.cjs

@@ -1,456 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromptLayerOpenAIChat = exports.OpenAIChat = void 0;
-const openai_1 = require("openai");
-const index_js_1 = require("../schema/index.cjs");
-const azure_js_1 = require("../util/azure.cjs");
+const openai_1 = require("@langchain/openai");
+Object.defineProperty(exports, "OpenAIChat", { enumerable: true, get: function () { return openai_1.OpenAIChat; } });
 const env_js_1 = require("../util/env.cjs");
 const prompt_layer_js_1 = require("../util/prompt-layer.cjs");
-const base_js_1 = require("./base.cjs");
-const openai_js_1 = require("../util/openai.cjs");
-/**
- * Wrapper around OpenAI large language models that use the Chat endpoint.
- *
- * To use you should have the `openai` package installed, with the
- * `OPENAI_API_KEY` environment variable set.
- *
- * To use with Azure you should have the `openai` package installed, with the
- * `AZURE_OPENAI_API_KEY`,
- * `AZURE_OPENAI_API_INSTANCE_NAME`,
- * `AZURE_OPENAI_API_DEPLOYMENT_NAME`
- * and `AZURE_OPENAI_API_VERSION` environment variable set.
- *
- * @remarks
- * Any parameters that are valid to be passed to {@link
- * https://platform.openai.com/docs/api-reference/chat/create |
- * `openai.createCompletion`} can be passed through {@link modelKwargs}, even
- * if not explicitly available on this class.
- *
- * @augments BaseLLM
- * @augments OpenAIInput
- * @augments AzureOpenAIChatInput
- * @example
- * ```typescript
- * const model = new OpenAIChat({
- *   prefixMessages: [
- *     {
- *       role: "system",
- *       content: "You are a helpful assistant that answers in pirate language",
- *     },
- *   ],
- *   maxTokens: 50,
- * });
- *
- * const res = await model.call(
- *   "What would be a good company name for a company that makes colorful socks?"
- * );
- * console.log({ res });
- * ```
- */
-class OpenAIChat extends base_js_1.LLM {
-    static lc_name() {
-        return "OpenAIChat";
-    }
-    get callKeys() {
-        return [...super.callKeys, "options", "promptIndex"];
-    }
-    get lc_secrets() {
-        return {
-            openAIApiKey: "OPENAI_API_KEY",
-            azureOpenAIApiKey: "AZURE_OPENAI_API_KEY",
-            organization: "OPENAI_ORGANIZATION",
-        };
-    }
-    get lc_aliases() {
-        return {
-            modelName: "model",
-            openAIApiKey: "openai_api_key",
-            azureOpenAIApiVersion: "azure_openai_api_version",
-            azureOpenAIApiKey: "azure_openai_api_key",
-            azureOpenAIApiInstanceName: "azure_openai_api_instance_name",
-            azureOpenAIApiDeploymentName: "azure_openai_api_deployment_name",
-        };
-    }
-    constructor(fields, 
-    /** @deprecated */
-    configuration) {
-        super(fields ?? {});
-        Object.defineProperty(this, "lc_serializable", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: true
-        });
-        Object.defineProperty(this, "temperature", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 1
-        });
-        Object.defineProperty(this, "topP", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 1
-        });
-        Object.defineProperty(this, "frequencyPenalty", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 0
-        });
-        Object.defineProperty(this, "presencePenalty", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 0
-        });
-        Object.defineProperty(this, "n", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 1
-        });
-        Object.defineProperty(this, "logitBias", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "maxTokens", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "modelName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: "gpt-3.5-turbo"
-        });
-        Object.defineProperty(this, "prefixMessages", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "modelKwargs", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "timeout", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "stop", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "user", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "streaming", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        Object.defineProperty(this, "openAIApiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "azureOpenAIApiVersion", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "azureOpenAIApiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "azureOpenAIApiInstanceName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "azureOpenAIApiDeploymentName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "azureOpenAIBasePath", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "organization", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "client", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "clientConfig", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.openAIApiKey =
-            fields?.openAIApiKey ?? (0, env_js_1.getEnvironmentVariable)("OPENAI_API_KEY");
-        this.azureOpenAIApiKey =
-            fields?.azureOpenAIApiKey ??
-                (0, env_js_1.getEnvironmentVariable)("AZURE_OPENAI_API_KEY");
-        if (!this.azureOpenAIApiKey && !this.openAIApiKey) {
-            throw new Error("OpenAI or Azure OpenAI API key not found");
-        }
-        this.azureOpenAIApiInstanceName =
-            fields?.azureOpenAIApiInstanceName ??
-                (0, env_js_1.getEnvironmentVariable)("AZURE_OPENAI_API_INSTANCE_NAME");
-        this.azureOpenAIApiDeploymentName =
-            (fields?.azureOpenAIApiCompletionsDeploymentName ||
-                fields?.azureOpenAIApiDeploymentName) ??
-                ((0, env_js_1.getEnvironmentVariable)("AZURE_OPENAI_API_COMPLETIONS_DEPLOYMENT_NAME") ||
-                    (0, env_js_1.getEnvironmentVariable)("AZURE_OPENAI_API_DEPLOYMENT_NAME"));
-        this.azureOpenAIApiVersion =
-            fields?.azureOpenAIApiVersion ??
-                (0, env_js_1.getEnvironmentVariable)("AZURE_OPENAI_API_VERSION");
-        this.azureOpenAIBasePath =
-            fields?.azureOpenAIBasePath ??
-                (0, env_js_1.getEnvironmentVariable)("AZURE_OPENAI_BASE_PATH");
-        this.organization =
-            fields?.configuration?.organization ??
-                (0, env_js_1.getEnvironmentVariable)("OPENAI_ORGANIZATION");
-        this.modelName = fields?.modelName ?? this.modelName;
-        this.prefixMessages = fields?.prefixMessages ?? this.prefixMessages;
-        this.modelKwargs = fields?.modelKwargs ?? {};
-        this.timeout = fields?.timeout;
-        this.temperature = fields?.temperature ?? this.temperature;
-        this.topP = fields?.topP ?? this.topP;
-        this.frequencyPenalty = fields?.frequencyPenalty ?? this.frequencyPenalty;
-        this.presencePenalty = fields?.presencePenalty ?? this.presencePenalty;
-        this.n = fields?.n ?? this.n;
-        this.logitBias = fields?.logitBias;
-        this.maxTokens = fields?.maxTokens;
-        this.stop = fields?.stop;
-        this.user = fields?.user;
-        this.streaming = fields?.streaming ?? false;
-        if (this.n > 1) {
-            throw new Error("Cannot use n > 1 in OpenAIChat LLM. Use ChatOpenAI Chat Model instead.");
-        }
-        if (this.azureOpenAIApiKey) {
-            if (!this.azureOpenAIApiInstanceName && !this.azureOpenAIBasePath) {
-                throw new Error("Azure OpenAI API instance name not found");
-            }
-            if (!this.azureOpenAIApiDeploymentName) {
-                throw new Error("Azure OpenAI API deployment name not found");
-            }
-            if (!this.azureOpenAIApiVersion) {
-                throw new Error("Azure OpenAI API version not found");
-            }
-            this.openAIApiKey = this.openAIApiKey ?? "";
-        }
-        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,
-        };
-    }
-    /**
-     * Get the parameters used to invoke the model
-     */
-    invocationParams(options) {
-        return {
-            model: this.modelName,
-            temperature: this.temperature,
-            top_p: this.topP,
-            frequency_penalty: this.frequencyPenalty,
-            presence_penalty: this.presencePenalty,
-            n: this.n,
-            logit_bias: this.logitBias,
-            max_tokens: this.maxTokens === -1 ? undefined : this.maxTokens,
-            stop: options?.stop ?? this.stop,
-            user: this.user,
-            stream: this.streaming,
-            ...this.modelKwargs,
-        };
-    }
-    /** @ignore */
-    _identifyingParams() {
-        return {
-            model_name: this.modelName,
-            ...this.invocationParams(),
-            ...this.clientConfig,
-        };
-    }
-    /**
-     * Get the identifying parameters for the model
-     */
-    identifyingParams() {
-        return {
-            model_name: this.modelName,
-            ...this.invocationParams(),
-            ...this.clientConfig,
-        };
-    }
-    /**
-     * Formats the messages for the OpenAI API.
-     * @param prompt The prompt to be formatted.
-     * @returns Array of formatted messages.
-     */
-    formatMessages(prompt) {
-        const message = {
-            role: "user",
-            content: prompt,
-        };
-        return this.prefixMessages ? [...this.prefixMessages, message] : [message];
-    }
-    async *_streamResponseChunks(prompt, options, runManager) {
-        const params = {
-            ...this.invocationParams(options),
-            messages: this.formatMessages(prompt),
-            stream: true,
-        };
-        const stream = await this.completionWithRetry(params, options);
-        for await (const data of stream) {
-            const choice = data?.choices[0];
-            if (!choice) {
-                continue;
-            }
-            const { delta } = choice;
-            const generationChunk = new index_js_1.GenerationChunk({
-                text: delta.content ?? "",
-            });
-            yield generationChunk;
-            const newTokenIndices = {
-                prompt: options.promptIndex ?? 0,
-                completion: choice.index ?? 0,
-            };
-            // eslint-disable-next-line no-void
-            void runManager?.handleLLMNewToken(generationChunk.text ?? "", newTokenIndices);
-        }
-        if (options.signal?.aborted) {
-            throw new Error("AbortError");
-        }
-    }
-    /** @ignore */
-    async _call(prompt, options, runManager) {
-        const params = this.invocationParams(options);
-        if (params.stream) {
-            const stream = await this._streamResponseChunks(prompt, options, runManager);
-            let finalChunk;
-            for await (const chunk of stream) {
-                if (finalChunk === undefined) {
-                    finalChunk = chunk;
-                }
-                else {
-                    finalChunk = finalChunk.concat(chunk);
-                }
-            }
-            return finalChunk?.text ?? "";
-        }
-        else {
-            const response = await this.completionWithRetry({
-                ...params,
-                stream: false,
-                messages: this.formatMessages(prompt),
-            }, {
-                signal: options.signal,
-                ...options.options,
-            });
-            return response?.choices[0]?.message?.content ?? "";
-        }
-    }
-    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;
-            }
-        });
-    }
-    /** @ignore */
-    _getClientOptions(options) {
-        if (!this.client) {
-            const openAIEndpointConfig = {
-                azureOpenAIApiDeploymentName: this.azureOpenAIApiDeploymentName,
-                azureOpenAIApiInstanceName: this.azureOpenAIApiInstanceName,
-                azureOpenAIApiKey: this.azureOpenAIApiKey,
-                azureOpenAIBasePath: this.azureOpenAIBasePath,
-                baseURL: this.clientConfig.baseURL,
-            };
-            const endpoint = (0, azure_js_1.getEndpoint)(openAIEndpointConfig);
-            const params = {
-                ...this.clientConfig,
-                baseURL: endpoint,
-                timeout: this.timeout,
-                maxRetries: 0,
-            };
-            if (!params.baseURL) {
-                delete params.baseURL;
-            }
-            this.client = new openai_1.OpenAI(params);
-        }
-        const requestOptions = {
-            ...this.clientConfig,
-            ...options,
-        };
-        if (this.azureOpenAIApiKey) {
-            requestOptions.headers = {
-                "api-key": this.azureOpenAIApiKey,
-                ...requestOptions.headers,
-            };
-            requestOptions.query = {
-                "api-version": this.azureOpenAIApiVersion,
-                ...requestOptions.query,
-            };
-        }
-        return requestOptions;
-    }
-    _llmType() {
-        return "openai";
-    }
-}
-exports.OpenAIChat = OpenAIChat;
 /**
  * PromptLayer wrapper to OpenAIChat
  */
-class PromptLayerOpenAIChat extends OpenAIChat {
+class PromptLayerOpenAIChat extends openai_1.OpenAIChat {
     get lc_secrets() {
         return {
             promptLayerApiKey: "PROMPTLAYER_API_KEY",