langchain 0.0.172 → 0.0.174

package/dist/vectorstores/pgvector.js

@@ -68,6 +68,12 @@ export class PGVectorStore extends VectorStore {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "chunkSize", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 500
+        });
         this.tableName = config.tableName;
         this.filter = config.filter;
         this.vectorColumnName = config.columns?.vectorColumnName ?? "embedding";
@@ -76,6 +82,7 @@ export class PGVectorStore extends VectorStore {
         this.metadataColumnName = config.columns?.metadataColumnName ?? "metadata";
         const pool = new pg.Pool(config.postgresConnectionOptions);
         this.pool = pool;
+        this.chunkSize = config.chunkSize ?? 500;
         this._verbose =
             getEnvironmentVariable("LANGCHAIN_VERBOSE") === "true" ??
                 !!config.verbose;
@@ -126,9 +133,9 @@ export class PGVectorStore extends VectorStore {
      * @param chunkIndex - The starting index for generating query placeholders based on chunk positioning.
      * @returns The complete SQL INSERT INTO query string.
      */
-    buildInsertQuery(rows, chunkIndex) {
+    buildInsertQuery(rows) {
         const valuesPlaceholders = rows
-            .map((_, j) => this.generatePlaceholderForRowAt(chunkIndex + j))
+            .map((_, j) => this.generatePlaceholderForRowAt(j))
             .join(", ");
         const text = `
       INSERT INTO ${this.tableName}(
@@ -157,10 +164,9 @@ export class PGVectorStore extends VectorStore {
                 documents[idx].metadata,
             ];
         });
-        const chunkSize = 500;
-        for (let i = 0; i < rows.length; i += chunkSize) {
-            const chunk = rows.slice(i, i + chunkSize);
-            const insertQuery = this.buildInsertQuery(chunk, i);
+        for (let i = 0; i < rows.length; i += this.chunkSize) {
+            const chunk = rows.slice(i, i + this.chunkSize);
+            const insertQuery = this.buildInsertQuery(chunk);
             const flatValues = chunk.flat();
             try {
                 await this.pool.query(insertQuery, flatValues);
@@ -264,7 +270,7 @@ export class PGVectorStore extends VectorStore {
      * @returns Promise that resolves when all clients are closed and the pool is terminated.
      */
     async end() {
-        await this.client?.release();
+        this.client?.release();
         return this.pool.end();
     }
 }

package/dist/vectorstores/pinecone.cjs

@@ -33,6 +33,7 @@ const flat_1 = __importDefault(require("flat"));
 const base_js_1 = require("./base.cjs");
 const document_js_1 = require("../document.cjs");
 const async_caller_js_1 = require("../util/async_caller.cjs");
+const math_js_1 = require("../util/math.cjs");
 /**
  * Class that extends the VectorStore class and provides methods to
  * interact with the Pinecone vector database.
@@ -166,15 +167,7 @@ class PineconeStore extends base_js_1.VectorStore {
             throw new Error("Either ids or delete_all must be provided.");
         }
     }
-    /**
-     * Method that performs a similarity search in the Pinecone database and
-     * returns the results along with their scores.
-     * @param query Query vector for the similarity search.
-     * @param k Number of top results to return.
-     * @param filter Optional filter to apply to the search.
-     * @returns Promise that resolves with an array of documents and their scores.
-     */
-    async similaritySearchVectorWithScore(query, k, filter) {
+    async _runPineconeQuery(query, k, filter, options) {
         if (filter && this.filter) {
             throw new Error("cannot provide both `filter` and `this.filter`");
         }
@@ -185,7 +178,20 @@ class PineconeStore extends base_js_1.VectorStore {
             topK: k,
             vector: query,
             filter: _filter,
+            ...options,
         });
+        return results;
+    }
+    /**
+     * Method that performs a similarity search in the Pinecone database and
+     * returns the results along with their scores.
+     * @param query Query vector for the similarity search.
+     * @param k Number of top results to return.
+     * @param filter Optional filter to apply to the search.
+     * @returns Promise that resolves with an array of documents and their scores.
+     */
+    async similaritySearchVectorWithScore(query, k, filter) {
+        const results = await this._runPineconeQuery(query, k, filter);
         const result = [];
         if (results.matches) {
             for (const res of results.matches) {
@@ -198,6 +204,37 @@ class PineconeStore extends base_js_1.VectorStore {
         }
         return result;
     }
+    /**
+     * Return documents selected using the maximal marginal relevance.
+     * Maximal marginal relevance optimizes for similarity to the query AND diversity
+     * among selected documents.
+     *
+     * @param {string} query - Text to look up documents similar to.
+     * @param {number} options.k - Number of documents to return.
+     * @param {number} options.fetchK=20 - Number of documents to fetch before passing to the MMR algorithm.
+     * @param {number} options.lambda=0.5 - Number between 0 and 1 that determines the degree of diversity among the results,
+     *                 where 0 corresponds to maximum diversity and 1 to minimum diversity.
+     * @param {PineconeMetadata} options.filter - Optional filter to apply to the search.
+     *
+     * @returns {Promise<Document[]>} - List of documents selected by maximal marginal relevance.
+     */
+    async maxMarginalRelevanceSearch(query, options) {
+        const queryEmbedding = await this.embeddings.embedQuery(query);
+        const results = await this._runPineconeQuery(queryEmbedding, options.fetchK ?? 20, options.filter, { includeValues: true });
+        const matches = results?.matches ?? [];
+        const embeddingList = matches.map((match) => match.values);
+        const mmrIndexes = (0, math_js_1.maximalMarginalRelevance)(queryEmbedding, embeddingList, options.lambda, options.k);
+        const topMmrMatches = mmrIndexes.map((idx) => matches[idx]);
+        const finalResult = [];
+        for (const res of topMmrMatches) {
+            const { [this.textKey]: pageContent, ...metadata } = (res.metadata ??
+                {});
+            if (res.score) {
+                finalResult.push(new document_js_1.Document({ metadata, pageContent }));
+            }
+        }
+        return finalResult;
+    }
     /**
      * Static method that creates a new instance of the PineconeStore class
      * from texts.

package/dist/vectorstores/pinecone.d.ts

@@ -1,5 +1,5 @@
-import { Index as PineconeIndex } from "@pinecone-database/pinecone";
-import { VectorStore } from "./base.js";
+import { RecordMetadata, Index as PineconeIndex } from "@pinecone-database/pinecone";
+import { MaxMarginalRelevanceSearchOptions, VectorStore } from "./base.js";
 import { Embeddings } from "../embeddings/base.js";
 import { Document } from "../document.js";
 import { AsyncCaller } from "../util/async_caller.js";
@@ -57,6 +57,9 @@ export declare class PineconeStore extends VectorStore {
      * @returns Promise that resolves when the delete operation is complete.
      */
     delete(params: PineconeDeleteParams): Promise<void>;
+    protected _runPineconeQuery(query: number[], k: number, filter?: PineconeMetadata, options?: {
+        includeValues: boolean;
+    }): Promise<import("@pinecone-database/pinecone").QueryResponse<RecordMetadata>>;
     /**
      * Method that performs a similarity search in the Pinecone database and
      * returns the results along with their scores.
@@ -66,6 +69,21 @@ export declare class PineconeStore extends VectorStore {
      * @returns Promise that resolves with an array of documents and their scores.
      */
     similaritySearchVectorWithScore(query: number[], k: number, filter?: PineconeMetadata): Promise<[Document, number][]>;
+    /**
+     * Return documents selected using the maximal marginal relevance.
+     * Maximal marginal relevance optimizes for similarity to the query AND diversity
+     * among selected documents.
+     *
+     * @param {string} query - Text to look up documents similar to.
+     * @param {number} options.k - Number of documents to return.
+     * @param {number} options.fetchK=20 - Number of documents to fetch before passing to the MMR algorithm.
+     * @param {number} options.lambda=0.5 - Number between 0 and 1 that determines the degree of diversity among the results,
+     *                 where 0 corresponds to maximum diversity and 1 to minimum diversity.
+     * @param {PineconeMetadata} options.filter - Optional filter to apply to the search.
+     *
+     * @returns {Promise<Document[]>} - List of documents selected by maximal marginal relevance.
+     */
+    maxMarginalRelevanceSearch(query: string, options: MaxMarginalRelevanceSearchOptions<this["FilterType"]>): Promise<Document[]>;
     /**
      * Static method that creates a new instance of the PineconeStore class
      * from texts.

package/dist/vectorstores/pinecone.js

@@ -4,6 +4,7 @@ import flatten from "flat";
 import { VectorStore } from "./base.js";
 import { Document } from "../document.js";
 import { AsyncCaller } from "../util/async_caller.js";
+import { maximalMarginalRelevance } from "../util/math.js";
 /**
  * Class that extends the VectorStore class and provides methods to
  * interact with the Pinecone vector database.
@@ -137,15 +138,7 @@ export class PineconeStore extends VectorStore {
             throw new Error("Either ids or delete_all must be provided.");
         }
     }
-    /**
-     * Method that performs a similarity search in the Pinecone database and
-     * returns the results along with their scores.
-     * @param query Query vector for the similarity search.
-     * @param k Number of top results to return.
-     * @param filter Optional filter to apply to the search.
-     * @returns Promise that resolves with an array of documents and their scores.
-     */
-    async similaritySearchVectorWithScore(query, k, filter) {
+    async _runPineconeQuery(query, k, filter, options) {
         if (filter && this.filter) {
             throw new Error("cannot provide both `filter` and `this.filter`");
         }
@@ -156,7 +149,20 @@ export class PineconeStore extends VectorStore {
             topK: k,
             vector: query,
             filter: _filter,
+            ...options,
         });
+        return results;
+    }
+    /**
+     * Method that performs a similarity search in the Pinecone database and
+     * returns the results along with their scores.
+     * @param query Query vector for the similarity search.
+     * @param k Number of top results to return.
+     * @param filter Optional filter to apply to the search.
+     * @returns Promise that resolves with an array of documents and their scores.
+     */
+    async similaritySearchVectorWithScore(query, k, filter) {
+        const results = await this._runPineconeQuery(query, k, filter);
         const result = [];
         if (results.matches) {
             for (const res of results.matches) {
@@ -169,6 +175,37 @@ export class PineconeStore extends VectorStore {
         }
         return result;
     }
+    /**
+     * Return documents selected using the maximal marginal relevance.
+     * Maximal marginal relevance optimizes for similarity to the query AND diversity
+     * among selected documents.
+     *
+     * @param {string} query - Text to look up documents similar to.
+     * @param {number} options.k - Number of documents to return.
+     * @param {number} options.fetchK=20 - Number of documents to fetch before passing to the MMR algorithm.
+     * @param {number} options.lambda=0.5 - Number between 0 and 1 that determines the degree of diversity among the results,
+     *                 where 0 corresponds to maximum diversity and 1 to minimum diversity.
+     * @param {PineconeMetadata} options.filter - Optional filter to apply to the search.
+     *
+     * @returns {Promise<Document[]>} - List of documents selected by maximal marginal relevance.
+     */
+    async maxMarginalRelevanceSearch(query, options) {
+        const queryEmbedding = await this.embeddings.embedQuery(query);
+        const results = await this._runPineconeQuery(queryEmbedding, options.fetchK ?? 20, options.filter, { includeValues: true });
+        const matches = results?.matches ?? [];
+        const embeddingList = matches.map((match) => match.values);
+        const mmrIndexes = maximalMarginalRelevance(queryEmbedding, embeddingList, options.lambda, options.k);
+        const topMmrMatches = mmrIndexes.map((idx) => matches[idx]);
+        const finalResult = [];
+        for (const res of topMmrMatches) {
+            const { [this.textKey]: pageContent, ...metadata } = (res.metadata ??
+                {});
+            if (res.score) {
+                finalResult.push(new Document({ metadata, pageContent }));
+            }
+        }
+        return finalResult;
+    }
     /**
      * Static method that creates a new instance of the PineconeStore class
      * from texts.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langchain",
-  "version": "0.0.172",
+  "version": "0.0.174",
   "description": "Typescript bindings for langchain",
   "type": "module",
   "engines": {
@@ -46,6 +46,12 @@
     "agents/react/output_parser.cjs",
     "agents/react/output_parser.js",
     "agents/react/output_parser.d.ts",
+    "agents/xml/output_parser.cjs",
+    "agents/xml/output_parser.js",
+    "agents/xml/output_parser.d.ts",
+    "agents/openai/output_parser.cjs",
+    "agents/openai/output_parser.js",
+    "agents/openai/output_parser.d.ts",
     "base_language.cjs",
     "base_language.js",
     "base_language.d.ts",
@@ -697,6 +703,9 @@
     "hub.cjs",
     "hub.js",
     "hub.d.ts",
+    "util/document.cjs",
+    "util/document.js",
+    "util/document.d.ts",
     "util/math.cjs",
     "util/math.js",
     "util/math.d.ts",
@@ -837,7 +846,7 @@
     "apify-client": "^2.7.1",
     "assemblyai": "^2.0.2",
     "axios": "^0.26.0",
-    "cassandra-driver": "^4.6.4",
+    "cassandra-driver": "^4.7.2",
     "cheerio": "^1.0.0-rc.12",
     "chromadb": "^1.5.3",
     "closevector-common": "0.1.0-alpha.1",
@@ -953,7 +962,7 @@
     "apify-client": "^2.7.1",
     "assemblyai": "^2.0.2",
     "axios": "*",
-    "cassandra-driver": "^4.6.4",
+    "cassandra-driver": "^4.7.2",
     "cheerio": "^1.0.0-rc.12",
     "chromadb": "*",
     "closevector-common": "0.1.0-alpha.1",
@@ -1391,6 +1400,16 @@
       "import": "./agents/react/output_parser.js",
       "require": "./agents/react/output_parser.cjs"
     },
+    "./agents/xml/output_parser": {
+      "types": "./agents/xml/output_parser.d.ts",
+      "import": "./agents/xml/output_parser.js",
+      "require": "./agents/xml/output_parser.cjs"
+    },
+    "./agents/openai/output_parser": {
+      "types": "./agents/openai/output_parser.d.ts",
+      "import": "./agents/openai/output_parser.js",
+      "require": "./agents/openai/output_parser.cjs"
+    },
     "./base_language": {
       "types": "./base_language.d.ts",
       "import": "./base_language.js",
@@ -2476,6 +2495,11 @@
       "import": "./hub.js",
       "require": "./hub.cjs"
     },
+    "./util/document": {
+      "types": "./util/document.d.ts",
+      "import": "./util/document.js",
+      "require": "./util/document.cjs"
+    },
     "./util/math": {
       "types": "./util/math.d.ts",
       "import": "./util/math.js",

package/util/document.cjs

@@ -0,0 +1 @@
+module.exports = require('../dist/util/document.cjs');

package/util/document.d.ts

@@ -0,0 +1 @@
+export * from '../dist/util/document.js'

package/util/document.js

@@ -0,0 +1 @@
+export * from '../dist/util/document.js'