Merge branch 'main' into feature/LlamaIndex

packages/components/nodes/vectorstores/Qdrant/Qdrant.ts

@@ -1,6 +1,5 @@
 import { flatten } from 'lodash'
 import { QdrantClient } from '@qdrant/js-client-rest'
-import type { Schemas as QdrantSchemas } from '@qdrant/js-client-rest'
 import { VectorStoreRetrieverInput } from 'langchain/vectorstores/base'
 import { Document } from 'langchain/document'
 import { QdrantVectorStore, QdrantLibArgs } from 'langchain/vectorstores/qdrant'
@@ -9,12 +8,6 @@ import { ICommonObject, INode, INodeData, INodeOutputsValue, INodeParams } from
 import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
 
 type RetrieverConfig = Partial<VectorStoreRetrieverInput<QdrantVectorStore>>
-type QdrantSearchResponse = QdrantSchemas['ScoredPoint'] & {
-    payload: {
-        metadata: object
-        content: string
-    }
-}
 
 class Qdrant_VectorStores implements INode {
     label: string

packages/components/nodes/vectorstores/Redis/Redis.ts

@@ -1,5 +1,5 @@
-import { flatten } from 'lodash'
-import { createClient, SearchOptions } from 'redis'
+import { flatten, isEqual } from 'lodash'
+import { createClient, SearchOptions, RedisClientOptions } from 'redis'
 import { Embeddings } from 'langchain/embeddings/base'
 import { RedisVectorStore, RedisVectorStoreConfig } from 'langchain/vectorstores/redis'
 import { Document } from 'langchain/document'
@@ -7,6 +7,27 @@ import { ICommonObject, INode, INodeData, INodeOutputsValue, INodeParams } from
 import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
 import { escapeAllStrings, escapeSpecialChars, unEscapeSpecialChars } from './utils'
 
+let redisClientSingleton: ReturnType<typeof createClient>
+let redisClientOption: RedisClientOptions
+
+const getRedisClient = async (option: RedisClientOptions) => {
+    if (!redisClientSingleton) {
+        // if client doesn't exists
+        redisClientSingleton = createClient(option)
+        await redisClientSingleton.connect()
+        redisClientOption = option
+        return redisClientSingleton
+    } else if (redisClientSingleton && !isEqual(option, redisClientOption)) {
+        // if client exists but option changed
+        redisClientSingleton.quit()
+        redisClientSingleton = createClient(option)
+        await redisClientSingleton.connect()
+        redisClientOption = option
+        return redisClientSingleton
+    }
+    return redisClientSingleton
+}
+
 class Redis_VectorStores implements INode {
     label: string
     name: string
@@ -149,8 +170,7 @@ class Redis_VectorStores implements INode {
             }
 
             try {
-                const redisClient = createClient({ url: redisUrl })
-                await redisClient.connect()
+                const redisClient = await getRedisClient({ url: redisUrl })
 
                 const storeConfig: RedisVectorStoreConfig = {
                     redisClient: redisClient,
@@ -210,8 +230,7 @@ class Redis_VectorStores implements INode {
             redisUrl = 'redis://' + username + ':' + password + '@' + host + ':' + portStr
         }
 
-        const redisClient = createClient({ url: redisUrl })
-        await redisClient.connect()
+        const redisClient = await getRedisClient({ url: redisUrl })
 
         const storeConfig: RedisVectorStoreConfig = {
             redisClient: redisClient,

packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts

@@ -7,13 +7,34 @@ import {
     INodeOutputsValue,
     INodeParams
 } from '../../../src'
-
 import { Embeddings } from 'langchain/embeddings/base'
 import { VectorStore } from 'langchain/vectorstores/base'
 import { Document } from 'langchain/document'
-import { createClient, SearchOptions } from 'redis'
+import { createClient, SearchOptions, RedisClientOptions } from 'redis'
 import { RedisVectorStore } from 'langchain/vectorstores/redis'
 import { escapeSpecialChars, unEscapeSpecialChars } from './utils'
+import { isEqual } from 'lodash'
+
+let redisClientSingleton: ReturnType<typeof createClient>
+let redisClientOption: RedisClientOptions
+
+const getRedisClient = async (option: RedisClientOptions) => {
+    if (!redisClientSingleton) {
+        // if client doesn't exists
+        redisClientSingleton = createClient(option)
+        await redisClientSingleton.connect()
+        redisClientOption = option
+        return redisClientSingleton
+    } else if (redisClientSingleton && !isEqual(option, redisClientOption)) {
+        // if client exists but option changed
+        redisClientSingleton.quit()
+        redisClientSingleton = createClient(option)
+        await redisClientSingleton.connect()
+        redisClientOption = option
+        return redisClientSingleton
+    }
+    return redisClientSingleton
+}
 
 export abstract class RedisSearchBase {
     label: string
@@ -141,8 +162,7 @@ export abstract class RedisSearchBase {
             redisUrl = 'redis://' + username + ':' + password + '@' + host + ':' + portStr
         }
 
-        this.redisClient = createClient({ url: redisUrl })
-        await this.redisClient.connect()
+        this.redisClient = await getRedisClient({ url: redisUrl })
 
         const vectorStore = await this.constructVectorStore(embeddings, indexName, replaceIndex, docs)
         if (!contentKey || contentKey === '') contentKey = 'content'

packages/components/nodes/vectorstores/Redis/Redis_Existing.ts

@@ -3,7 +3,6 @@ import { Embeddings } from 'langchain/embeddings/base'
 import { VectorStore } from 'langchain/vectorstores/base'
 import { RedisVectorStore, RedisVectorStoreConfig } from 'langchain/vectorstores/redis'
 import { Document } from 'langchain/document'
-
 import { RedisSearchBase } from './RedisSearchBase'
 
 class RedisExisting_VectorStores extends RedisSearchBase implements INode {

packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts

@@ -1,7 +1,6 @@
 import { ICommonObject, INode, INodeData } from '../../../src/Interface'
 import { Embeddings } from 'langchain/embeddings/base'
 import { Document } from 'langchain/document'
-
 import { flatten } from 'lodash'
 import { RedisSearchBase } from './RedisSearchBase'
 import { VectorStore } from 'langchain/vectorstores/base'