langchain 0.2.5 → 0.2.6

package/dist/chains/openai_moderation.cjs

@@ -99,7 +99,9 @@ class OpenAIModerationChain extends base_js_1.BaseChain {
         });
         this.throwError = fields?.throwError ?? false;
         this.openAIApiKey =
-            fields?.openAIApiKey ?? (0, env_1.getEnvironmentVariable)("OPENAI_API_KEY");
+            fields?.apiKey ??
+                fields?.openAIApiKey ??
+                (0, env_1.getEnvironmentVariable)("OPENAI_API_KEY");
         if (!this.openAIApiKey) {
             throw new Error("OpenAI API key not found");
         }

package/dist/chains/openai_moderation.d.ts

@@ -6,6 +6,8 @@ import { BaseChain, ChainInputs } from "./base.js";
  * Interface for the input parameters of the OpenAIModerationChain class.
  */
 export interface OpenAIModerationChainInput extends ChainInputs, AsyncCallerParams {
+    apiKey?: string;
+    /** @deprecated Use "apiKey" instead. */
     openAIApiKey?: string;
     openAIOrganization?: string;
     throwError?: boolean;

package/dist/chains/openai_moderation.js

@@ -96,7 +96,9 @@ export class OpenAIModerationChain extends BaseChain {
         });
         this.throwError = fields?.throwError ?? false;
         this.openAIApiKey =
-            fields?.openAIApiKey ?? getEnvironmentVariable("OPENAI_API_KEY");
+            fields?.apiKey ??
+                fields?.openAIApiKey ??
+                getEnvironmentVariable("OPENAI_API_KEY");
         if (!this.openAIApiKey) {
             throw new Error("OpenAI API key not found");
         }

package/dist/document_loaders/fs/unstructured.cjs

@@ -43,7 +43,7 @@ const UNSTRUCTURED_API_FILETYPES = [
  * and returns an array of Document instances.
  */
 class UnstructuredLoader extends base_js_1.BaseDocumentLoader {
-    constructor(filePathOrLegacyApiUrl, optionsOrLegacyFilePath = {}) {
+    constructor(filePathOrLegacyApiUrlOrMemoryBuffer, optionsOrLegacyFilePath = {}) {
         super();
         Object.defineProperty(this, "filePath", {
             enumerable: true,
@@ -51,6 +51,18 @@ class UnstructuredLoader extends base_js_1.BaseDocumentLoader {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "buffer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "fileName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "apiUrl", {
             enumerable: true,
             configurable: true,
@@ -150,12 +162,19 @@ class UnstructuredLoader extends base_js_1.BaseDocumentLoader {
         // Temporary shim to avoid breaking existing users
         // Remove when API keys are enforced by Unstructured and existing code will break anyway
         const isLegacySyntax = typeof optionsOrLegacyFilePath === "string";
-        if (isLegacySyntax) {
+        const isMemorySyntax = typeof filePathOrLegacyApiUrlOrMemoryBuffer === "object";
+        if (isMemorySyntax) {
+            this.buffer = filePathOrLegacyApiUrlOrMemoryBuffer.buffer;
+            this.fileName = filePathOrLegacyApiUrlOrMemoryBuffer.fileName;
+        }
+        else if (isLegacySyntax) {
             this.filePath = optionsOrLegacyFilePath;
-            this.apiUrl = filePathOrLegacyApiUrl;
+            this.apiUrl = filePathOrLegacyApiUrlOrMemoryBuffer;
         }
         else {
-            this.filePath = filePathOrLegacyApiUrl;
+            this.filePath = filePathOrLegacyApiUrlOrMemoryBuffer;
+        }
+        if (!isLegacySyntax) {
             const options = optionsOrLegacyFilePath;
             this.apiKey = options.apiKey;
             this.apiUrl = options.apiUrl ?? this.apiUrl;
@@ -176,12 +195,16 @@ class UnstructuredLoader extends base_js_1.BaseDocumentLoader {
         }
     }
     async _partition() {
-        const { readFile, basename } = await this.imports();
-        const buffer = await readFile(this.filePath);
-        const fileName = basename(this.filePath);
-        // I'm aware this reads the file into memory first, but we have lots of work
-        // to do on then consuming Documents in a streaming fashion anyway, so not
-        // worried about this for now.
+        let { buffer } = this;
+        let { fileName } = this;
+        if (!buffer) {
+            const { readFile, basename } = await this.imports();
+            buffer = await readFile(this.filePath);
+            fileName = basename(this.filePath);
+            // I'm aware this reads the file into memory first, but we have lots of work
+            // to do on then consuming Documents in a streaming fashion anyway, so not
+            // worried about this for now.
+        }
         const formData = new FormData();
         formData.append("files", new Blob([buffer]), fileName);
         formData.append("strategy", this.strategy);

package/dist/document_loaders/fs/unstructured.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import type { basename as BasenameT } from "node:path";
 import type { readFile as ReadFileT } from "node:fs/promises";
 import { Document } from "@langchain/core/documents";
@@ -63,6 +64,10 @@ type UnstructuredDirectoryLoaderOptions = UnstructuredLoaderOptions & {
     recursive?: boolean;
     unknown?: UnknownHandling;
 };
+type UnstructuredMemoryLoaderOptions = {
+    buffer: Buffer;
+    fileName: string;
+};
 /**
  * @deprecated - Import from "@langchain/community/document_loaders/fs/unstructured" instead. This entrypoint will be removed in 0.3.0.
  *
@@ -75,6 +80,8 @@ type UnstructuredDirectoryLoaderOptions = UnstructuredLoaderOptions & {
  */
 export declare class UnstructuredLoader extends BaseDocumentLoader {
     filePath: string;
+    private buffer?;
+    private fileName?;
     private apiUrl;
     private apiKey?;
     private strategy;
@@ -91,7 +98,7 @@ export declare class UnstructuredLoader extends BaseDocumentLoader {
     private combineUnderNChars?;
     private newAfterNChars?;
     private maxCharacters?;
-    constructor(filePathOrLegacyApiUrl: string, optionsOrLegacyFilePath?: UnstructuredLoaderOptions | string);
+    constructor(filePathOrLegacyApiUrlOrMemoryBuffer: string | UnstructuredMemoryLoaderOptions, optionsOrLegacyFilePath?: UnstructuredLoaderOptions | string);
     _partition(): Promise<Element[]>;
     load(): Promise<Document[]>;
     imports(): Promise<{

package/dist/document_loaders/fs/unstructured.js

@@ -39,7 +39,7 @@ const UNSTRUCTURED_API_FILETYPES = [
  * and returns an array of Document instances.
  */
 export class UnstructuredLoader extends BaseDocumentLoader {
-    constructor(filePathOrLegacyApiUrl, optionsOrLegacyFilePath = {}) {
+    constructor(filePathOrLegacyApiUrlOrMemoryBuffer, optionsOrLegacyFilePath = {}) {
         super();
         Object.defineProperty(this, "filePath", {
             enumerable: true,
@@ -47,6 +47,18 @@ export class UnstructuredLoader extends BaseDocumentLoader {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "buffer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "fileName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "apiUrl", {
             enumerable: true,
             configurable: true,
@@ -146,12 +158,19 @@ export class UnstructuredLoader extends BaseDocumentLoader {
         // Temporary shim to avoid breaking existing users
         // Remove when API keys are enforced by Unstructured and existing code will break anyway
         const isLegacySyntax = typeof optionsOrLegacyFilePath === "string";
-        if (isLegacySyntax) {
+        const isMemorySyntax = typeof filePathOrLegacyApiUrlOrMemoryBuffer === "object";
+        if (isMemorySyntax) {
+            this.buffer = filePathOrLegacyApiUrlOrMemoryBuffer.buffer;
+            this.fileName = filePathOrLegacyApiUrlOrMemoryBuffer.fileName;
+        }
+        else if (isLegacySyntax) {
             this.filePath = optionsOrLegacyFilePath;
-            this.apiUrl = filePathOrLegacyApiUrl;
+            this.apiUrl = filePathOrLegacyApiUrlOrMemoryBuffer;
         }
         else {
-            this.filePath = filePathOrLegacyApiUrl;
+            this.filePath = filePathOrLegacyApiUrlOrMemoryBuffer;
+        }
+        if (!isLegacySyntax) {
             const options = optionsOrLegacyFilePath;
             this.apiKey = options.apiKey;
             this.apiUrl = options.apiUrl ?? this.apiUrl;
@@ -172,12 +191,16 @@ export class UnstructuredLoader extends BaseDocumentLoader {
         }
     }
     async _partition() {
-        const { readFile, basename } = await this.imports();
-        const buffer = await readFile(this.filePath);
-        const fileName = basename(this.filePath);
-        // I'm aware this reads the file into memory first, but we have lots of work
-        // to do on then consuming Documents in a streaming fashion anyway, so not
-        // worried about this for now.
+        let { buffer } = this;
+        let { fileName } = this;
+        if (!buffer) {
+            const { readFile, basename } = await this.imports();
+            buffer = await readFile(this.filePath);
+            fileName = basename(this.filePath);
+            // I'm aware this reads the file into memory first, but we have lots of work
+            // to do on then consuming Documents in a streaming fashion anyway, so not
+            // worried about this for now.
+        }
         const formData = new FormData();
         formData.append("files", new Blob([buffer]), fileName);
         formData.append("strategy", this.strategy);

package/dist/document_loaders/tests/unstructured.int.test.js

@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import * as url from "node:url";
 import * as path from "node:path";
+import { readFile } from "node:fs/promises";
 import { test, expect } from "@jest/globals";
 import { UnstructuredDirectoryLoader, UnstructuredLoader, UnknownHandling, } from "../fs/unstructured.js";
 test.skip("Test Unstructured base loader", async () => {
@@ -16,6 +17,23 @@ test.skip("Test Unstructured base loader", async () => {
         expect(typeof doc.pageContent).toBe("string");
     }
 });
+test.skip("Test Unstructured base loader with buffer", async () => {
+    const filePath = path.resolve(path.dirname(url.fileURLToPath(import.meta.url)), "./example_data/example.txt");
+    const options = {
+        apiKey: process.env.UNSTRUCTURED_API_KEY,
+    };
+    const buffer = await readFile(filePath);
+    const fileName = "example.txt";
+    const loader = new UnstructuredLoader({
+        buffer,
+        fileName,
+    }, options);
+    const docs = await loader.load();
+    expect(docs.length).toBe(3);
+    for (const doc of docs) {
+        expect(typeof doc.pageContent).toBe("string");
+    }
+});
 test.skip("Test Unstructured base loader with fast strategy", async () => {
     const filePath = path.resolve(path.dirname(url.fileURLToPath(import.meta.url)), "./example_data/1706.03762.pdf");
     const options = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langchain",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Typescript bindings for langchain",
   "type": "module",
   "engines": {
@@ -580,7 +580,7 @@
     "clean": "rm -rf .turbo dist/",
     "prepack": "yarn build",
     "release": "release-it --only-version --config .release-it.json",
-    "test": "yarn run build:deps && NODE_OPTIONS=--experimental-vm-modules jest --testPathIgnorePatterns=\\.int\\.test.ts --testTimeout 30000 --maxWorkers=50%",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --testPathIgnorePatterns=\\.int\\.test.ts --testTimeout 30000 --maxWorkers=50%",
     "test:watch": "yarn run build:deps && NODE_OPTIONS=--experimental-vm-modules jest --watch --testPathIgnorePatterns=\\.int\\.test.ts",
     "test:integration": "yarn run build:deps && NODE_OPTIONS=--experimental-vm-modules jest --testPathPattern=\\.int\\.test.ts --testTimeout 100000 --maxWorkers=50%",
     "test:single": "yarn run build:deps && NODE_OPTIONS=--experimental-vm-modules yarn run jest --config jest.config.cjs --testTimeout 100000",
@@ -672,7 +672,7 @@
     "sonix-speech-recognition": "^2.1.1",
     "srt-parser-2": "^1.2.3",
     "ts-jest": "^29.1.0",
-    "typeorm": "^0.3.12",
+    "typeorm": "^0.3.20",
     "typescript": "~5.1.6",
     "weaviate-ts-client": "^2.0.0",
     "web-auth-library": "^1.0.3",
@@ -724,7 +724,7 @@
     "redis": "^4.6.4",
     "sonix-speech-recognition": "^2.1.1",
     "srt-parser-2": "^1.2.3",
-    "typeorm": "^0.3.12",
+    "typeorm": "^0.3.20",
     "weaviate-ts-client": "*",
     "web-auth-library": "^1.0.3",
     "ws": "^8.14.2",
@@ -885,7 +885,7 @@
   },
   "dependencies": {
     "@langchain/core": "~0.2.0",
-    "@langchain/openai": "~0.1.0",
+    "@langchain/openai": ">=0.1.0 <0.3.0",
     "@langchain/textsplitters": "~0.0.0",
     "binary-extensions": "^2.2.0",
     "js-tiktoken": "^1.0.12",