From 9989f6f70acf469270d156196759adbdfc89c011 Mon Sep 17 00:00:00 2001 From: Seif Date: Sun, 13 Aug 2023 19:40:33 -0700 Subject: [PATCH] Fix filters --- .../Vectara_Existing/Vectara_Existing.ts | 11 +++-------- .../vectorstores/Vectara_Upsert/Vectara_Upsert.ts | 13 ++++--------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/packages/components/nodes/vectorstores/Vectara_Existing/Vectara_Existing.ts b/packages/components/nodes/vectorstores/Vectara_Existing/Vectara_Existing.ts index 725a9e32..96fed4ef 100644 --- a/packages/components/nodes/vectorstores/Vectara_Existing/Vectara_Existing.ts +++ b/packages/components/nodes/vectorstores/Vectara_Existing/Vectara_Existing.ts @@ -34,7 +34,7 @@ class VectaraExisting_VectorStores implements INode { { label: 'Vectara Metadata Filter', name: 'filter', - type: 'json', + type: 'string', additionalParams: true, optional: true }, @@ -74,7 +74,7 @@ class VectaraExisting_VectorStores implements INode { const customerId = getCredentialParam('customerID', 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 output = nodeData.outputs?.output as string const topK = nodeData.inputs?.topK as string @@ -87,12 +87,7 @@ class VectaraExisting_VectorStores implements INode { } const vectaraFilter: VectaraFilter = {} - - if (vectaraMetadatafilter) { - const metadatafilter = typeof vectaraMetadatafilter === 'object' ? vectaraMetadatafilter : JSON.parse(vectaraMetadatafilter) - vectaraFilter.filter = metadatafilter - } - + if (vectaraMetadataFilter) vectaraFilter.filter = vectaraMetadataFilter if (lambda) vectaraFilter.lambda = lambda const vectorStore = new VectaraStore(vectaraArgs) diff --git a/packages/components/nodes/vectorstores/Vectara_Upsert/Vectara_Upsert.ts b/packages/components/nodes/vectorstores/Vectara_Upsert/Vectara_Upsert.ts index bc236060..ecbe5569 100644 --- a/packages/components/nodes/vectorstores/Vectara_Upsert/Vectara_Upsert.ts +++ b/packages/components/nodes/vectorstores/Vectara_Upsert/Vectara_Upsert.ts @@ -41,9 +41,9 @@ class VectaraExisting_VectorStores implements INode { list: true }, { - label: 'Filter', + label: 'Vectara Metadata Filter', name: 'filter', - type: 'json', + type: 'string', additionalParams: true, optional: true }, @@ -85,7 +85,7 @@ class VectaraExisting_VectorStores implements INode { const docs = nodeData.inputs?.document as Document[] 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 output = nodeData.outputs?.output as string const topK = nodeData.inputs?.topK as string @@ -98,12 +98,7 @@ class VectaraExisting_VectorStores implements INode { } const vectaraFilter: VectaraFilter = {} - - if (vectaraMetadatafilter) { - const metadatafilter = typeof vectaraMetadatafilter === 'object' ? vectaraMetadatafilter : JSON.parse(vectaraMetadatafilter) - vectaraFilter.filter = metadatafilter - } - + if (vectaraMetadataFilter) vectaraFilter.filter = vectaraMetadataFilter if (lambda) vectaraFilter.lambda = lambda const flattenDocs = docs && docs.length ? flatten(docs) : []