tests

Author: margaretjgu

libs/langchain-community/src/vectorstores/elasticsearch.ts

@@ -33,9 +33,14 @@ export interface HybridRetrievalStrategyConfig {
   rankConstant?: number;
   textField?: string;
   /**
-   * For Elasticsearch 9.2, set to `false` to include vectors in responses.
+   * Include source vectors in search responses.
+   * 
+   * Elasticsearch 9.2+ excludes vectors from `_source` by default.
+   * Set to `true` to include vectors in responses for ES 9.2+.
+   * 
+   * Note: ES < 8.19 does not support this parameter.
    */
-  excludeSourceVectors?: boolean;
+  includeSourceVectors?: boolean;
 }
 
 /**
@@ -45,13 +50,13 @@ export class HybridRetrievalStrategy {
   public readonly rankWindowSize: number;
   public readonly rankConstant: number;
   public readonly textField: string;
-  public readonly excludeSourceVectors?: boolean;
+  public readonly includeSourceVectors?: boolean;
 
   constructor(config: HybridRetrievalStrategyConfig = {}) {
     this.rankWindowSize = config.rankWindowSize ?? 100;
     this.rankConstant = config.rankConstant ?? 60;
     this.textField = config.textField ?? "text";
-    this.excludeSourceVectors = config.excludeSourceVectors;
+    this.includeSourceVectors = config.includeSourceVectors;
   }
 }
 
@@ -239,6 +244,9 @@ export class ElasticVectorSearch extends VectorStore {
         k,
         num_candidates: this.candidates,
       },
+      ...(this.strategy?.includeSourceVectors === true && {
+        _source: { includes: ["*"] },
+      }),
     });
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -291,6 +299,9 @@ export class ElasticVectorSearch extends VectorStore {
         },
       },
       ...(filterClauses && { query: filterClauses }),
+      ...(this.strategy?.includeSourceVectors === true && {
+        _source: { includes: ["*"] },
+      }),
     });
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -427,12 +438,6 @@ export class ElasticVectorSearch extends VectorStore {
       },
     };
 
-    if (this.strategy?.excludeSourceVectors !== undefined) {
-      request.settings = {
-        "index.mapping.exclude_source_vectors": this.strategy.excludeSourceVectors,
-      };
-    }
-
     const indexExists = await this.doesIndexExist();
     if (indexExists) return;
 

libs/langchain-community/src/vectorstores/tests/elasticsearch.int.test.ts

@@ -423,37 +423,30 @@ describe("ElasticVectorSearch - ES 9.x Compatibility", () => {
     embeddings = new OpenAIEmbeddings();
   });
 
-  test.skip("Hybrid search with excludeSourceVectors set to false for ES 9.x", async () => {
-    const indexName = "test_es9_exclude_false";
+  test.skip("Hybrid search with includeSourceVectors set to true for ES 9.2+", async () => {
+    const indexName = "test_es9_include_vectors";
     const store = new ElasticVectorSearch(embeddings, {
       client,
       indexName,
       strategy: new HybridRetrievalStrategy({
-        excludeSourceVectors: false,
+        includeSourceVectors: true,
       }),
     });
     await store.deleteIfExists();
 
     await store.addDocuments([
-      new Document({ pageContent: "Document for ES 9.x testing" }),
+      new Document({ pageContent: "Document for ES 9.2+ testing" }),
       new Document({ pageContent: "Another document for compatibility" }),
     ]);
 
     const results = await store.similaritySearch("testing", 2);
 
     expect(results).toHaveLength(2);
     expect(results[0]).toBeInstanceOf(Document);
-
-    const indexSettings = await client.indices.getSettings({
-      index: indexName,
-    });
-    expect(
-      indexSettings[indexName].settings?.index?.mapping?.exclude_source_vectors
-    ).toBe("false");
   });
 
-  test.skip("Hybrid search with excludeSourceVectors undefined uses ES defaults", async () => {
-    const indexName = "test_es_default_exclude";
+  test.skip("Hybrid search with includeSourceVectors undefined uses ES defaults", async () => {
+    const indexName = "test_es_default_include";
     const store = new ElasticVectorSearch(embeddings, {
       client,
       indexName,
@@ -471,13 +464,13 @@ describe("ElasticVectorSearch - ES 9.x Compatibility", () => {
     expect(results[0]).toBeInstanceOf(Document);
   });
 
-  test.skip("Pure vector search with excludeSourceVectors for ES 9.x", async () => {
+  test.skip("Pure vector search with includeSourceVectors for ES 9.2+", async () => {
     const indexName = "test_es9_pure_vector";
     const store = new ElasticVectorSearch(embeddings, {
       client,
       indexName,
       strategy: new HybridRetrievalStrategy({
-        excludeSourceVectors: false,
+        includeSourceVectors: true,
       }),
     });
     await store.deleteIfExists();