Merge pull request #762 from vectara/Fix-filter

Fix Vectara filter
This commit is contained in:
Henry Heng
2023-08-14 20:47:08 +01:00
committed by GitHub
2 changed files with 11 additions and 17 deletions
@@ -34,7 +34,9 @@ class VectaraExisting_VectorStores implements INode {
{ {
label: 'Vectara Metadata Filter', label: 'Vectara Metadata Filter',
name: 'filter', name: 'filter',
type: 'json', description:
'Filter to apply to Vectara metadata. Refer to the <a target="_blank" href="https://docs.flowiseai.com/vector-stores/vectara">documentation</a> on how to use Vectara filters with Flowise.',
type: 'string',
additionalParams: true, additionalParams: true,
optional: true optional: true
}, },
@@ -74,7 +76,7 @@ class VectaraExisting_VectorStores implements INode {
const customerId = getCredentialParam('customerID', credentialData, nodeData) const customerId = getCredentialParam('customerID', credentialData, nodeData)
const corpusId = getCredentialParam('corpusID', credentialData, nodeData) const corpusId = getCredentialParam('corpusID', credentialData, nodeData)
const vectaraMetadatafilter = nodeData.inputs?.filter as VectaraFilter const vectaraMetadataFilter = nodeData.inputs?.filter as string
const lambda = nodeData.inputs?.lambda as number const lambda = nodeData.inputs?.lambda as number
const output = nodeData.outputs?.output as string const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string const topK = nodeData.inputs?.topK as string
@@ -87,12 +89,7 @@ class VectaraExisting_VectorStores implements INode {
} }
const vectaraFilter: VectaraFilter = {} const vectaraFilter: VectaraFilter = {}
if (vectaraMetadataFilter) vectaraFilter.filter = vectaraMetadataFilter
if (vectaraMetadatafilter) {
const metadatafilter = typeof vectaraMetadatafilter === 'object' ? vectaraMetadatafilter : JSON.parse(vectaraMetadatafilter)
vectaraFilter.filter = metadatafilter
}
if (lambda) vectaraFilter.lambda = lambda if (lambda) vectaraFilter.lambda = lambda
const vectorStore = new VectaraStore(vectaraArgs) const vectorStore = new VectaraStore(vectaraArgs)
@@ -41,9 +41,11 @@ class VectaraUpsert_VectorStores implements INode {
list: true list: true
}, },
{ {
label: 'Filter', label: 'Vectara Metadata Filter',
name: 'filter', name: 'filter',
type: 'json', description:
'Filter to apply to Vectara metadata. Refer to the <a target="_blank" href="https://docs.flowiseai.com/vector-stores/vectara">documentation</a> on how to use Vectara filters with Flowise.',
type: 'string',
additionalParams: true, additionalParams: true,
optional: true optional: true
}, },
@@ -85,7 +87,7 @@ class VectaraUpsert_VectorStores implements INode {
const docs = nodeData.inputs?.document as Document[] const docs = nodeData.inputs?.document as Document[]
const embeddings = {} as Embeddings const embeddings = {} as Embeddings
const vectaraMetadatafilter = nodeData.inputs?.filter as VectaraFilter const vectaraMetadataFilter = nodeData.inputs?.filter as string
const lambda = nodeData.inputs?.lambda as number const lambda = nodeData.inputs?.lambda as number
const output = nodeData.outputs?.output as string const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string const topK = nodeData.inputs?.topK as string
@@ -98,12 +100,7 @@ class VectaraUpsert_VectorStores implements INode {
} }
const vectaraFilter: VectaraFilter = {} const vectaraFilter: VectaraFilter = {}
if (vectaraMetadataFilter) vectaraFilter.filter = vectaraMetadataFilter
if (vectaraMetadatafilter) {
const metadatafilter = typeof vectaraMetadatafilter === 'object' ? vectaraMetadatafilter : JSON.parse(vectaraMetadatafilter)
vectaraFilter.filter = metadatafilter
}
if (lambda) vectaraFilter.lambda = lambda if (lambda) vectaraFilter.lambda = lambda
const flattenDocs = docs && docs.length ? flatten(docs) : [] const flattenDocs = docs && docs.length ? flatten(docs) : []