mirror of
https://github.com/farcasclaudiu/Flowise.git
synced 2026-06-28 21:00:58 +03:00
chore: Bump zep cloud sdk version and clean up zep cloud vector store node (#2767)
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
import { flatten } from 'lodash'
|
import { flatten } from 'lodash'
|
||||||
import { IDocument, ZepClient } from '@getzep/zep-cloud'
|
import { ZepClient } from '@getzep/zep-cloud'
|
||||||
import { IZepConfig, ZepVectorStore } from '@getzep/zep-cloud/langchain'
|
import { IZepConfig, ZepVectorStore } from '@getzep/zep-cloud/langchain'
|
||||||
import { Embeddings } from 'langchain/embeddings/base'
|
import { Embeddings } from 'langchain/embeddings/base'
|
||||||
import { Document } from 'langchain/document'
|
import { Document } from 'langchain/document'
|
||||||
@@ -101,7 +101,9 @@ class Zep_CloudVectorStores implements INode {
|
|||||||
finalDocs.push(new Document(flattenDocs[i]))
|
finalDocs.push(new Document(flattenDocs[i]))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const client = await ZepClient.init(apiKey)
|
const client = new ZepClient({
|
||||||
|
apiKey: apiKey
|
||||||
|
})
|
||||||
const zepConfig = {
|
const zepConfig = {
|
||||||
apiKey: apiKey,
|
apiKey: apiKey,
|
||||||
collectionName: zepCollection,
|
collectionName: zepCollection,
|
||||||
@@ -129,7 +131,9 @@ class Zep_CloudVectorStores implements INode {
|
|||||||
if (zepMetadataFilter) {
|
if (zepMetadataFilter) {
|
||||||
zepConfig.filter = typeof zepMetadataFilter === 'object' ? zepMetadataFilter : JSON.parse(zepMetadataFilter)
|
zepConfig.filter = typeof zepMetadataFilter === 'object' ? zepMetadataFilter : JSON.parse(zepMetadataFilter)
|
||||||
}
|
}
|
||||||
zepConfig.client = await ZepClient.init(zepConfig.apiKey)
|
zepConfig.client = new ZepClient({
|
||||||
|
apiKey: apiKey
|
||||||
|
})
|
||||||
const vectorStore = await ZepExistingVS.init(zepConfig)
|
const vectorStore = await ZepExistingVS.init(zepConfig)
|
||||||
return resolveVectorStoreOrRetriever(nodeData, vectorStore, zepConfig.filter)
|
return resolveVectorStoreOrRetriever(nodeData, vectorStore, zepConfig.filter)
|
||||||
}
|
}
|
||||||
@@ -139,26 +143,6 @@ interface ZepFilter {
|
|||||||
filter: Record<string, any>
|
filter: Record<string, any>
|
||||||
}
|
}
|
||||||
|
|
||||||
function zepDocsToDocumentsAndScore(results: IDocument[]): [Document, number][] {
|
|
||||||
return results.map((d) => [
|
|
||||||
new Document({
|
|
||||||
pageContent: d.content,
|
|
||||||
metadata: d.metadata
|
|
||||||
}),
|
|
||||||
d.score ? d.score : 0
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
function assignMetadata(value: string | Record<string, unknown> | object | undefined): Record<string, unknown> | undefined {
|
|
||||||
if (typeof value === 'object' && value !== null) {
|
|
||||||
return value as Record<string, unknown>
|
|
||||||
}
|
|
||||||
if (value !== undefined) {
|
|
||||||
console.warn('Metadata filters must be an object, Record, or undefined.')
|
|
||||||
}
|
|
||||||
return undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
class ZepExistingVS extends ZepVectorStore {
|
class ZepExistingVS extends ZepVectorStore {
|
||||||
filter?: Record<string, any>
|
filter?: Record<string, any>
|
||||||
args?: IZepConfig & Partial<ZepFilter>
|
args?: IZepConfig & Partial<ZepFilter>
|
||||||
@@ -169,61 +153,6 @@ class ZepExistingVS extends ZepVectorStore {
|
|||||||
this.args = args
|
this.args = args
|
||||||
}
|
}
|
||||||
|
|
||||||
async initializeCollection(args: IZepConfig & Partial<ZepFilter>) {
|
|
||||||
this.client = await ZepClient.init(args.apiKey, args.apiUrl)
|
|
||||||
try {
|
|
||||||
this.collection = await this.client.document.getCollection(args.collectionName)
|
|
||||||
} catch (err) {
|
|
||||||
if (err instanceof Error) {
|
|
||||||
if (err.name === 'NotFoundError') {
|
|
||||||
await this.createNewCollection(args)
|
|
||||||
} else {
|
|
||||||
throw err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async createNewCollection(args: IZepConfig & Partial<ZepFilter>) {
|
|
||||||
this.collection = await this.client.document.addCollection({
|
|
||||||
name: args.collectionName,
|
|
||||||
description: args.description,
|
|
||||||
metadata: args.metadata
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async similaritySearchVectorWithScore(
|
|
||||||
query: number[],
|
|
||||||
k: number,
|
|
||||||
filter?: Record<string, unknown> | undefined
|
|
||||||
): Promise<[Document, number][]> {
|
|
||||||
if (filter && this.filter) {
|
|
||||||
throw new Error('cannot provide both `filter` and `this.filter`')
|
|
||||||
}
|
|
||||||
const _filters = filter ?? this.filter
|
|
||||||
const ANDFilters = []
|
|
||||||
for (const filterKey in _filters) {
|
|
||||||
let filterVal = _filters[filterKey]
|
|
||||||
if (typeof filterVal === 'string') filterVal = `"${filterVal}"`
|
|
||||||
ANDFilters.push({ jsonpath: `$[*] ? (@.${filterKey} == ${filterVal})` })
|
|
||||||
}
|
|
||||||
const newfilter = {
|
|
||||||
where: { and: ANDFilters }
|
|
||||||
}
|
|
||||||
await this.initializeCollection(this.args!).catch((err) => {
|
|
||||||
console.error('Error initializing collection:', err)
|
|
||||||
throw err
|
|
||||||
})
|
|
||||||
const results = await this.collection.search(
|
|
||||||
{
|
|
||||||
embedding: new Float32Array(query),
|
|
||||||
metadata: assignMetadata(newfilter)
|
|
||||||
},
|
|
||||||
k
|
|
||||||
)
|
|
||||||
return zepDocsToDocumentsAndScore(results)
|
|
||||||
}
|
|
||||||
|
|
||||||
static async fromExistingIndex(embeddings: Embeddings, dbConfig: IZepConfig & Partial<ZepFilter>): Promise<ZepVectorStore> {
|
static async fromExistingIndex(embeddings: Embeddings, dbConfig: IZepConfig & Partial<ZepFilter>): Promise<ZepVectorStore> {
|
||||||
return new this(embeddings, dbConfig)
|
return new this(embeddings, dbConfig)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
"@dqbd/tiktoken": "^1.0.7",
|
"@dqbd/tiktoken": "^1.0.7",
|
||||||
"@e2b/code-interpreter": "^0.0.5",
|
"@e2b/code-interpreter": "^0.0.5",
|
||||||
"@elastic/elasticsearch": "^8.9.0",
|
"@elastic/elasticsearch": "^8.9.0",
|
||||||
"@getzep/zep-cloud": "npm:@getzep/zep-js@next",
|
"@getzep/zep-cloud": "~1.0.7",
|
||||||
"@getzep/zep-js": "^0.9.0",
|
"@getzep/zep-js": "^0.9.0",
|
||||||
"@gomomento/sdk": "^1.51.1",
|
"@gomomento/sdk": "^1.51.1",
|
||||||
"@gomomento/sdk-core": "^1.51.1",
|
"@gomomento/sdk-core": "^1.51.1",
|
||||||
|
|||||||
Generated
+34324
-34309
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user