@@ -11,7 +11,6 @@ const { removeModules } = require('../../lib/cache-buster')
1111const { runVectorstoreTests } = require ( '../langchain/vectorstore' )
1212const { Document } = require ( '@langchain/core/documents' )
1313const { FAKE_CREDENTIALS , getAiResponseServer } = require ( '../../lib/aws-server-stubs' )
14- const params = require ( '../../lib/params' )
1514const helper = require ( '../../lib/agent_helper' )
1615
1716const config = {
@@ -27,19 +26,14 @@ test.beforeEach(async (ctx) => {
2726 ctx . nr . server = server
2827 ctx . nr . agent = helper . instrumentMockedAgent ( config )
2928
29+ const { VectorStore } = require ( '@langchain/core/vectorstores' )
30+ // must pass in VectorStore to ensure it's the same version as the test
31+ // and not whatever is installed in `test/versioned/langchain/`
32+ const CustomVectorStore = require ( '../langchain/custom-vector-store' ) ( VectorStore )
3033 const { BedrockEmbeddings } = require ( '@langchain/aws' )
3134 const { BedrockRuntimeClient } = require ( '@aws-sdk/client-bedrock-runtime' )
3235 ctx . nr . langchainCoreVersion = require ( '@langchain/core/package.json' ) . version
3336
34- const { Client } = require ( '@elastic/elasticsearch' )
35- const clientArgs = {
36- client : new Client ( {
37- node : `http://${ params . elastic_host } :${ params . elastic_port } `
38- } ) ,
39- indexName : 'test_langchain_aws_vectorstore'
40- }
41- const { ElasticVectorSearch } = require ( '@langchain/community/vectorstores/elasticsearch' )
42-
4337 // Create the BedrockRuntimeClient with our mock endpoint
4438 const bedrockClient = new BedrockRuntimeClient ( {
4539 region : 'us-east-1' ,
@@ -60,18 +54,16 @@ test.beforeEach(async (ctx) => {
6054 pageContent : 'embed text amazon token count callback response'
6155 } )
6256 ]
63- const vectorStore = new ElasticVectorSearch ( ctx . nr . embedding , clientArgs )
64- await vectorStore . deleteIfExists ( )
57+ const vectorStore = new CustomVectorStore ( ctx . nr . embedding )
6558 await vectorStore . addDocuments ( docs )
6659 ctx . nr . vs = vectorStore
6760} )
6861
6962test . afterEach ( async ( ctx ) => {
70- await ctx . nr ?. vs ?. deleteIfExists ( )
7163 ctx . nr ?. server ?. destroy ( )
7264 helper . unloadAgent ( ctx . nr . agent )
7365 // bust the require-cache so it can re-instrument
74- removeModules ( [ '@langchain/core' , '@langchain/ aws' , '@aws -sdk' , '@elastic' , '@langchain/community '] )
66+ removeModules ( [ '@langchain/core' , '@aws-sdk' ] )
7567} )
7668
7769runVectorstoreTests ( {
0 commit comments