langchain 0.0.196 → 0.0.197-rc.1

package/dist/embeddings/openai.d.ts

@@ -1,82 +1 @@
-import { type ClientOptions } from "openai";
-import { AzureOpenAIInput, LegacyOpenAIInput } from "../types/openai-types.js";
-import { Embeddings, EmbeddingsParams } from "./base.js";
-/**
- * Interface for OpenAIEmbeddings parameters. Extends EmbeddingsParams and
- * defines additional parameters specific to the OpenAIEmbeddings class.
- */
-export interface OpenAIEmbeddingsParams extends EmbeddingsParams {
-    /** Model name to use */
-    modelName: string;
-    /**
-     * Timeout to use when making requests to OpenAI.
-     */
-    timeout?: number;
-    /**
-     * The maximum number of documents to embed in a single request. This is
-     * limited by the OpenAI API to a maximum of 2048.
-     */
-    batchSize?: number;
-    /**
-     * Whether to strip new lines from the input text. This is recommended by
-     * OpenAI, but may not be suitable for all use cases.
-     */
-    stripNewLines?: boolean;
-}
-/**
- * Class for generating embeddings using the OpenAI API. Extends the
- * Embeddings class and implements OpenAIEmbeddingsParams and
- * AzureOpenAIInput.
- * @example
- * ```typescript
- * // Embed a query using OpenAIEmbeddings to generate embeddings for a given text
- * const model = new OpenAIEmbeddings();
- * const res = await model.embedQuery(
- *   "What would be a good company name for a company that makes colorful socks?",
- * );
- * console.log({ res });
- *
- * ```
- */
-export declare class OpenAIEmbeddings extends Embeddings implements OpenAIEmbeddingsParams, AzureOpenAIInput {
-    modelName: string;
-    batchSize: number;
-    stripNewLines: boolean;
-    timeout?: number;
-    azureOpenAIApiVersion?: string;
-    azureOpenAIApiKey?: string;
-    azureOpenAIApiInstanceName?: string;
-    azureOpenAIApiDeploymentName?: string;
-    azureOpenAIBasePath?: string;
-    organization?: string;
-    private client;
-    private clientConfig;
-    constructor(fields?: Partial<OpenAIEmbeddingsParams> & Partial<AzureOpenAIInput> & {
-        verbose?: boolean;
-        openAIApiKey?: string;
-        configuration?: ClientOptions;
-    }, configuration?: ClientOptions & LegacyOpenAIInput);
-    /**
-     * Method to generate embeddings for an array of documents. Splits the
-     * documents into batches and makes requests to the OpenAI API to generate
-     * embeddings.
-     * @param texts Array of documents to generate embeddings for.
-     * @returns Promise that resolves to a 2D array of embeddings for each document.
-     */
-    embedDocuments(texts: string[]): Promise<number[][]>;
-    /**
-     * Method to generate an embedding for a single document. Calls the
-     * embeddingWithRetry method with the document as the input.
-     * @param text Document to generate an embedding for.
-     * @returns Promise that resolves to an embedding for the document.
-     */
-    embedQuery(text: string): Promise<number[]>;
-    /**
-     * Private method to make a request to the OpenAI API to generate
-     * embeddings. Handles the retry logic and returns the response from the
-     * API.
-     * @param request Request to send to the OpenAI API.
-     * @returns Promise that resolves to the response from the API.
-     */
-    private embeddingWithRetry;
-}
+export { type OpenAIEmbeddingsParams, OpenAIEmbeddings, } from "@langchain/openai";

package/dist/embeddings/openai.js

@@ -1,239 +1 @@
-import { OpenAI as OpenAIClient } from "openai";
-import { getEnvironmentVariable } from "../util/env.js";
-import { chunkArray } from "../util/chunk.js";
-import { Embeddings } from "./base.js";
-import { getEndpoint } from "../util/azure.js";
-import { wrapOpenAIClientError } from "../util/openai.js";
-/**
- * Class for generating embeddings using the OpenAI API. Extends the
- * Embeddings class and implements OpenAIEmbeddingsParams and
- * AzureOpenAIInput.
- * @example
- * ```typescript
- * // Embed a query using OpenAIEmbeddings to generate embeddings for a given text
- * const model = new OpenAIEmbeddings();
- * const res = await model.embedQuery(
- *   "What would be a good company name for a company that makes colorful socks?",
- * );
- * console.log({ res });
- *
- * ```
- */
-export class OpenAIEmbeddings extends Embeddings {
-    constructor(fields, configuration) {
-        const fieldsWithDefaults = { maxConcurrency: 2, ...fields };
-        super(fieldsWithDefaults);
-        Object.defineProperty(this, "modelName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: "text-embedding-ada-002"
-        });
-        Object.defineProperty(this, "batchSize", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 512
-        });
-        Object.defineProperty(this, "stripNewLines", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: true
-        });
-        Object.defineProperty(this, "timeout", {
-            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
-        });
-        let apiKey = fieldsWithDefaults?.openAIApiKey ??
-            getEnvironmentVariable("OPENAI_API_KEY");
-        const azureApiKey = fieldsWithDefaults?.azureOpenAIApiKey ??
-            getEnvironmentVariable("AZURE_OPENAI_API_KEY");
-        if (!azureApiKey && !apiKey) {
-            throw new Error("OpenAI or Azure OpenAI API key not found");
-        }
-        const azureApiInstanceName = fieldsWithDefaults?.azureOpenAIApiInstanceName ??
-            getEnvironmentVariable("AZURE_OPENAI_API_INSTANCE_NAME");
-        const azureApiDeploymentName = (fieldsWithDefaults?.azureOpenAIApiEmbeddingsDeploymentName ||
-            fieldsWithDefaults?.azureOpenAIApiDeploymentName) ??
-            (getEnvironmentVariable("AZURE_OPENAI_API_EMBEDDINGS_DEPLOYMENT_NAME") ||
-                getEnvironmentVariable("AZURE_OPENAI_API_DEPLOYMENT_NAME"));
-        const azureApiVersion = fieldsWithDefaults?.azureOpenAIApiVersion ??
-            getEnvironmentVariable("AZURE_OPENAI_API_VERSION");
-        this.azureOpenAIBasePath =
-            fieldsWithDefaults?.azureOpenAIBasePath ??
-                getEnvironmentVariable("AZURE_OPENAI_BASE_PATH");
-        this.organization =
-            fieldsWithDefaults?.configuration?.organization ??
-                getEnvironmentVariable("OPENAI_ORGANIZATION");
-        this.modelName = fieldsWithDefaults?.modelName ?? this.modelName;
-        this.batchSize =
-            fieldsWithDefaults?.batchSize ?? (azureApiKey ? 1 : this.batchSize);
-        this.stripNewLines =
-            fieldsWithDefaults?.stripNewLines ?? this.stripNewLines;
-        this.timeout = fieldsWithDefaults?.timeout;
-        this.azureOpenAIApiVersion = azureApiVersion;
-        this.azureOpenAIApiKey = azureApiKey;
-        this.azureOpenAIApiInstanceName = azureApiInstanceName;
-        this.azureOpenAIApiDeploymentName = azureApiDeploymentName;
-        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");
-            }
-            apiKey = apiKey ?? "";
-        }
-        this.clientConfig = {
-            apiKey,
-            organization: this.organization,
-            baseURL: configuration?.basePath,
-            dangerouslyAllowBrowser: true,
-            defaultHeaders: configuration?.baseOptions?.headers,
-            defaultQuery: configuration?.baseOptions?.params,
-            ...configuration,
-            ...fields?.configuration,
-        };
-    }
-    /**
-     * Method to generate embeddings for an array of documents. Splits the
-     * documents into batches and makes requests to the OpenAI API to generate
-     * embeddings.
-     * @param texts Array of documents to generate embeddings for.
-     * @returns Promise that resolves to a 2D array of embeddings for each document.
-     */
-    async embedDocuments(texts) {
-        const batches = chunkArray(this.stripNewLines ? texts.map((t) => t.replace(/\n/g, " ")) : texts, this.batchSize);
-        const batchRequests = batches.map((batch) => this.embeddingWithRetry({
-            model: this.modelName,
-            input: batch,
-        }));
-        const batchResponses = await Promise.all(batchRequests);
-        const embeddings = [];
-        for (let i = 0; i < batchResponses.length; i += 1) {
-            const batch = batches[i];
-            const { data: batchResponse } = batchResponses[i];
-            for (let j = 0; j < batch.length; j += 1) {
-                embeddings.push(batchResponse[j].embedding);
-            }
-        }
-        return embeddings;
-    }
-    /**
-     * Method to generate an embedding for a single document. Calls the
-     * embeddingWithRetry method with the document as the input.
-     * @param text Document to generate an embedding for.
-     * @returns Promise that resolves to an embedding for the document.
-     */
-    async embedQuery(text) {
-        const { data } = await this.embeddingWithRetry({
-            model: this.modelName,
-            input: this.stripNewLines ? text.replace(/\n/g, " ") : text,
-        });
-        return data[0].embedding;
-    }
-    /**
-     * Private method to make a request to the OpenAI API to generate
-     * embeddings. Handles the retry logic and returns the response from the
-     * API.
-     * @param request Request to send to the OpenAI API.
-     * @returns Promise that resolves to the response from the API.
-     */
-    async embeddingWithRetry(request) {
-        if (!this.client) {
-            const openAIEndpointConfig = {
-                azureOpenAIApiDeploymentName: this.azureOpenAIApiDeploymentName,
-                azureOpenAIApiInstanceName: this.azureOpenAIApiInstanceName,
-                azureOpenAIApiKey: this.azureOpenAIApiKey,
-                azureOpenAIBasePath: this.azureOpenAIBasePath,
-                baseURL: this.clientConfig.baseURL,
-            };
-            const endpoint = getEndpoint(openAIEndpointConfig);
-            const params = {
-                ...this.clientConfig,
-                baseURL: endpoint,
-                timeout: this.timeout,
-                maxRetries: 0,
-            };
-            if (!params.baseURL) {
-                delete params.baseURL;
-            }
-            this.client = new OpenAIClient(params);
-        }
-        const requestOptions = {};
-        if (this.azureOpenAIApiKey) {
-            requestOptions.headers = {
-                "api-key": this.azureOpenAIApiKey,
-                ...requestOptions.headers,
-            };
-            requestOptions.query = {
-                "api-version": this.azureOpenAIApiVersion,
-                ...requestOptions.query,
-            };
-        }
-        return this.caller.call(async () => {
-            try {
-                const res = await this.client.embeddings.create(request, requestOptions);
-                return res;
-            }
-            catch (e) {
-                const error = wrapOpenAIClientError(e);
-                throw error;
-            }
-        });
-    }
-}
+export { OpenAIEmbeddings, } from "@langchain/openai";

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/schema").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/llm"), exports);
+__exportStar(require("@langchain/core/language_models/llms"), exports);

package/dist/llms/base.d.ts

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

package/dist/llms/base.js

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

package/dist/llms/bedrock/web.cjs

@@ -278,11 +278,31 @@ class Bedrock extends base_js_1.LLM {
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     _readChunks(reader) {
+        function _concatChunks(a, b) {
+            const newBuffer = new Uint8Array(a.length + b.length);
+            newBuffer.set(a);
+            newBuffer.set(b, a.length);
+            return newBuffer;
+        }
+        function getMessageLength(buffer) {
+            if (buffer.byteLength === 0)
+                return 0;
+            const view = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+            return view.getUint32(0, false);
+        }
         return {
             async *[Symbol.asyncIterator]() {
                 let readResult = await reader.read();
+                let buffer = new Uint8Array(0);
                 while (!readResult.done) {
-                    yield readResult.value;
+                    const chunk = readResult.value;
+                    buffer = _concatChunks(buffer, chunk);
+                    let messageLength = getMessageLength(buffer);
+                    while (buffer.byteLength > 0 && buffer.byteLength >= messageLength) {
+                        yield buffer.slice(0, messageLength);
+                        buffer = buffer.slice(messageLength);
+                        messageLength = getMessageLength(buffer);
+                    }
                     readResult = await reader.read();
                 }
             },

package/dist/llms/bedrock/web.d.ts

@@ -61,6 +61,6 @@ export declare class Bedrock extends LLM implements BaseBedrockInput {
     };
     _streamResponseChunks(prompt: string, options: this["ParsedCallOptions"], runManager?: CallbackManagerForLLMRun): AsyncGenerator<GenerationChunk>;
     _readChunks(reader: any): {
-        [Symbol.asyncIterator](): AsyncGenerator<any, void, unknown>;
+        [Symbol.asyncIterator](): AsyncGenerator<Uint8Array, void, unknown>;
     };
 }

package/dist/llms/bedrock/web.js

@@ -275,11 +275,31 @@ export class Bedrock extends LLM {
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     _readChunks(reader) {
+        function _concatChunks(a, b) {
+            const newBuffer = new Uint8Array(a.length + b.length);
+            newBuffer.set(a);
+            newBuffer.set(b, a.length);
+            return newBuffer;
+        }
+        function getMessageLength(buffer) {
+            if (buffer.byteLength === 0)
+                return 0;
+            const view = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+            return view.getUint32(0, false);
+        }
         return {
             async *[Symbol.asyncIterator]() {
                 let readResult = await reader.read();
+                let buffer = new Uint8Array(0);
                 while (!readResult.done) {
-                    yield readResult.value;
+                    const chunk = readResult.value;
+                    buffer = _concatChunks(buffer, chunk);
+                    let messageLength = getMessageLength(buffer);
+                    while (buffer.byteLength > 0 && buffer.byteLength >= messageLength) {
+                        yield buffer.slice(0, messageLength);
+                        buffer = buffer.slice(messageLength);
+                        messageLength = getMessageLength(buffer);
+                    }
                     readResult = await reader.read();
                 }
             },

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>;
 }