Sultan
/
Flowise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1703 from FlowiseAI/feature/Retriever-Output 

Feature/Add document json output
This commit is contained in:
Henry Heng 2024-02-10 22:12:23 +08:00 committed by GitHub
parent 55dad31438 caf54bf31b
commit 2ef0f813c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 55 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/components/nodes/documentloaders/PlainText/PlainText.ts
View File

@ -51,11 +51,13 @@ class PlainText_DocumentLoaders implements INode {
{ {
label: 'Document', label: 'Document',
name: 'document', name: 'document',
baseClasses: this.baseClasses description: 'Array of document objects containing metadata and pageContent',
baseClasses: [...this.baseClasses, 'json']
}, },
{ {
label: 'Text', label: 'Text',
name: 'text', name: 'text',
description: 'Concatenated string from pageContent of documents',
baseClasses: ['string', 'json'] baseClasses: ['string', 'json']
} }
] ]

4
packages/components/nodes/documentloaders/Text/Text.ts
View File

@ -51,11 +51,13 @@ class Text_DocumentLoaders implements INode {
{ {
label: 'Document', label: 'Document',
name: 'document', name: 'document',
baseClasses: this.baseClasses description: 'Array of document objects containing metadata and pageContent',
baseClasses: [...this.baseClasses, 'json']
}, },
{ {
label: 'Text', label: 'Text',
name: 'text', name: 'text',
description: 'Concatenated string from pageContent of documents',
baseClasses: ['string', 'json'] baseClasses: ['string', 'json']
} }
] ]

2
packages/components/nodes/documentloaders/VectorStoreToDocument/VectorStoreToDocument.ts
View File

@ -51,11 +51,13 @@ class VectorStoreToDocument_DocumentLoaders implements INode {
{ {
label: 'Document', label: 'Document',
name: 'document', name: 'document',
description: 'Array of document objects containing metadata and pageContent',
baseClasses: [...this.baseClasses, 'json'] baseClasses: [...this.baseClasses, 'json']
}, },
{ {
label: 'Text', label: 'Text',
name: 'text', name: 'text',
description: 'Concatenated string from pageContent of documents',
baseClasses: ['string', 'json'] baseClasses: ['string', 'json']
} }
] ]

4
packages/components/nodes/retrievers/CohereRerankRetriever/CohereRerankRetriever.ts
View File

@ -94,11 +94,13 @@ class CohereRerankRetriever_Retrievers implements INode {
{ {
label: 'Document', label: 'Document',
name: 'document', name: 'document',
baseClasses: ['Document'] description: 'Array of document objects containing metadata and pageContent',
baseClasses: ['Document', 'json']
}, },
{ {
label: 'Text', label: 'Text',
name: 'text', name: 'text',
description: 'Concatenated string from pageContent of documents',
baseClasses: ['string', 'json'] baseClasses: ['string', 'json']
} }
] ]

4
packages/components/nodes/retrievers/EmbeddingsFilterRetriever/EmbeddingsFilterRetriever.ts
View File

@ -78,11 +78,13 @@ class EmbeddingsFilterRetriever_Retrievers implements INode {
{ {
label: 'Document', label: 'Document',
name: 'document', name: 'document',
baseClasses: ['Document'] description: 'Array of document objects containing metadata and pageContent',
baseClasses: ['Document', 'json']
}, },
{ {
label: 'Text', label: 'Text',
name: 'text', name: 'text',
description: 'Concatenated string from pageContent of documents',
baseClasses: ['string', 'json'] baseClasses: ['string', 'json']
} }
] ]

4
packages/components/nodes/retrievers/HydeRetriever/HydeRetriever.ts
View File

@ -140,11 +140,13 @@ Passage:`
{ {
label: 'Document', label: 'Document',
name: 'document', name: 'document',
baseClasses: ['Document'] description: 'Array of document objects containing metadata and pageContent',
baseClasses: ['Document', 'json']
}, },
{ {
label: 'Text', label: 'Text',
name: 'text', name: 'text',
description: 'Concatenated string from pageContent of documents',
baseClasses: ['string', 'json'] baseClasses: ['string', 'json']
} }
] ]

4
packages/components/nodes/retrievers/LLMFilterRetriever/LLMFilterCompressionRetriever.ts
View File

@ -58,11 +58,13 @@ class LLMFilterCompressionRetriever_Retrievers implements INode {
{ {
label: 'Document', label: 'Document',
name: 'document', name: 'document',
baseClasses: ['Document'] description: 'Array of document objects containing metadata and pageContent',
baseClasses: ['Document', 'json']
}, },
{ {
label: 'Text', label: 'Text',
name: 'text', name: 'text',
description: 'Concatenated string from pageContent of documents',
baseClasses: ['string', 'json'] baseClasses: ['string', 'json']
} }
] ]

4
packages/components/nodes/retrievers/RRFRetriever/RRFRetriever.ts
View File

@ -89,11 +89,13 @@ class RRFRetriever_Retrievers implements INode {
{ {
label: 'Document', label: 'Document',
name: 'document', name: 'document',
baseClasses: ['Document'] description: 'Array of document objects containing metadata and pageContent',
baseClasses: ['Document', 'json']
}, },
{ {
label: 'Text', label: 'Text',
name: 'text', name: 'text',
description: 'Concatenated string from pageContent of documents',
baseClasses: ['string', 'json'] baseClasses: ['string', 'json']
} }
] ]

4
packages/components/nodes/retrievers/SimilarityThresholdRetriever/SimilarityThresholdRetriever.ts
View File

@ -74,11 +74,13 @@ class SimilarityThresholdRetriever_Retrievers implements INode {
{ {
label: 'Document', label: 'Document',
name: 'document', name: 'document',
baseClasses: ['Document'] description: 'Array of document objects containing metadata and pageContent',
baseClasses: ['Document', 'json']
}, },
{ {
label: 'Text', label: 'Text',
name: 'text', name: 'text',
description: 'Concatenated string from pageContent of documents',
baseClasses: ['string', 'json'] baseClasses: ['string', 'json']
} }
] ]

4
packages/server/marketplaces/chatflows/Claude LLM.json
View File

@ -441,10 +441,10 @@
"type": "options", "type": "options",
"options": [ "options": [
{ {
"id": "plainText_0-output-document-Document", "id": "plainText_0-output-document-Document|json",
"name": "document", "name": "document",
"label": "Document", "label": "Document",
"type": "Document" "type": "Document | json"
}, },
{ {
"id": "plainText_0-output-text-string|json", "id": "plainText_0-output-text-string|json",

8
packages/server/marketplaces/chatflows/Context Chat Engine.json
View File

@ -59,10 +59,10 @@
"type": "options", "type": "options",
"options": [ "options": [
{ {
"id": "textFile_0-output-document-Document", "id": "textFile_0-output-document-Document|json",
"name": "document", "name": "document",
"label": "Document", "label": "Document",
"type": "Document" "type": "Document | json"
}, },
{ {
"id": "textFile_0-output-text-string|json", "id": "textFile_0-output-text-string|json",
@ -851,11 +851,11 @@
}, },
{ {
"source": "textFile_0", "source": "textFile_0",
"sourceHandle": "textFile_0-output-document-Document", "sourceHandle": "textFile_0-output-document-Document|json",
"target": "pineconeLlamaIndex_0", "target": "pineconeLlamaIndex_0",
"targetHandle": "pineconeLlamaIndex_0-input-document-Document", "targetHandle": "pineconeLlamaIndex_0-input-document-Document",
"type": "buttonedge", "type": "buttonedge",
"id": "textFile_0-textFile_0-output-document-Document-pineconeLlamaIndex_0-pineconeLlamaIndex_0-input-document-Document", "id": "textFile_0-textFile_0-output-document-Document|json-pineconeLlamaIndex_0-pineconeLlamaIndex_0-input-document-Document",
"data": { "data": {
"label": "" "label": ""
} }

8
packages/server/marketplaces/chatflows/Conversational Retrieval QA Chain.json
View File

@ -235,10 +235,10 @@
"type": "options", "type": "options",
"options": [ "options": [
{ {
"id": "textFile_0-output-document-Document", "id": "textFile_0-output-document-Document|json",
"name": "document", "name": "document",
"label": "Document", "label": "Document",
"type": "Document" "type": "Document | json"
}, },
{ {
"id": "textFile_0-output-text-string|json", "id": "textFile_0-output-text-string|json",
@ -732,11 +732,11 @@
}, },
{ {
"source": "textFile_0", "source": "textFile_0",
"sourceHandle": "textFile_0-output-document-Document", "sourceHandle": "textFile_0-output-document-Document|json",
"target": "pinecone_0", "target": "pinecone_0",
"targetHandle": "pinecone_0-input-document-Document", "targetHandle": "pinecone_0-input-document-Document",
"type": "buttonedge", "type": "buttonedge",
"id": "textFile_0-textFile_0-output-document-Document-pinecone_0-pinecone_0-input-document-Document", "id": "textFile_0-textFile_0-output-document-Document|json-pinecone_0-pinecone_0-input-document-Document",
"data": { "data": {
"label": "" "label": ""
} }

8
packages/server/marketplaces/chatflows/Local QnA.json
View File

@ -226,10 +226,10 @@
"type": "options", "type": "options",
"options": [ "options": [
{ {
"id": "textFile_0-output-document-Document", "id": "textFile_0-output-document-Document|json",
"name": "document", "name": "document",
"label": "Document", "label": "Document",
"type": "Document" "type": "Document | json"
}, },
{ {
"id": "textFile_0-output-text-string|json", "id": "textFile_0-output-text-string|json",
@ -651,11 +651,11 @@
}, },
{ {
"source": "textFile_0", "source": "textFile_0",
"sourceHandle": "textFile_0-output-document-Document", "sourceHandle": "textFile_0-output-document-Document|json",
"target": "faiss_0", "target": "faiss_0",
"targetHandle": "faiss_0-input-document-Document", "targetHandle": "faiss_0-input-document-Document",
"type": "buttonedge", "type": "buttonedge",
"id": "textFile_0-textFile_0-output-document-Document-faiss_0-faiss_0-input-document-Document", "id": "textFile_0-textFile_0-output-document-Document|json-faiss_0-faiss_0-input-document-Document",
"data": { "data": {
"label": "" "label": ""
} }

8
packages/server/marketplaces/chatflows/Metadata Filter.json
View File

@ -128,10 +128,10 @@
"type": "options", "type": "options",
"options": [ "options": [
{ {
"id": "textFile_0-output-document-Document", "id": "textFile_0-output-document-Document|json",
"name": "document", "name": "document",
"label": "Document", "label": "Document",
"type": "Document" "type": "Document | json"
}, },
{ {
"id": "textFile_0-output-text-string|json", "id": "textFile_0-output-text-string|json",
@ -838,11 +838,11 @@
}, },
{ {
"source": "textFile_0", "source": "textFile_0",
"sourceHandle": "textFile_0-output-document-Document", "sourceHandle": "textFile_0-output-document-Document|json",
"target": "pinecone_0", "target": "pinecone_0",
"targetHandle": "pinecone_0-input-document-Document", "targetHandle": "pinecone_0-input-document-Document",
"type": "buttonedge", "type": "buttonedge",
"id": "textFile_0-textFile_0-output-document-Document-pinecone_0-pinecone_0-input-document-Document", "id": "textFile_0-textFile_0-output-document-Document|json-pinecone_0-pinecone_0-input-document-Document",
"data": { "data": {
"label": "" "label": ""
} }

16
packages/server/marketplaces/chatflows/Multiple VectorDB.json
View File

@ -966,10 +966,10 @@
"type": "options", "type": "options",
"options": [ "options": [
{ {
"id": "plainText_0-output-document-Document", "id": "plainText_0-output-document-Document|json",
"name": "document", "name": "document",
"label": "Document", "label": "Document",
"type": "Document" "type": "Document | json"
}, },
{ {
"id": "plainText_0-output-text-string|json", "id": "plainText_0-output-text-string|json",
@ -1503,10 +1503,10 @@
"type": "options", "type": "options",
"options": [ "options": [
{ {
"id": "plainText_1-output-document-Document", "id": "plainText_1-output-document-Document|json",
"name": "document", "name": "document",
"label": "Document", "label": "Document",
"type": "Document" "type": "Document | json"
}, },
{ {
"id": "plainText_1-output-text-string|json", "id": "plainText_1-output-text-string|json",
@ -1723,11 +1723,11 @@
}, },
{ {
"source": "plainText_0", "source": "plainText_0",
"sourceHandle": "plainText_0-output-document-Document", "sourceHandle": "plainText_0-output-document-Document|json",
"target": "redis_0", "target": "redis_0",
"targetHandle": "redis_0-input-document-Document", "targetHandle": "redis_0-input-document-Document",
"type": "buttonedge", "type": "buttonedge",
"id": "plainText_0-plainText_0-output-document-Document-redis_0-redis_0-input-document-Document", "id": "plainText_0-plainText_0-output-document-Document|json-redis_0-redis_0-input-document-Document",
"data": { "data": {
"label": "" "label": ""
} }
@ -1778,11 +1778,11 @@
}, },
{ {
"source": "plainText_1", "source": "plainText_1",
"sourceHandle": "plainText_1-output-document-Document", "sourceHandle": "plainText_1-output-document-Document|json",
"target": "faiss_0", "target": "faiss_0",
"targetHandle": "faiss_0-input-document-Document", "targetHandle": "faiss_0-input-document-Document",
"type": "buttonedge", "type": "buttonedge",
"id": "plainText_1-plainText_1-output-document-Document-faiss_0-faiss_0-input-document-Document", "id": "plainText_1-plainText_1-output-document-Document|json-faiss_0-faiss_0-input-document-Document",
"data": { "data": {
"label": "" "label": ""
} }

3
packages/ui/src/utils/genericHelper.js
View File

@ -99,6 +99,7 @@ export const initNode = (nodeData, newNodeId) => {
id: `${newNodeId}-output-${nodeData.outputs[j].name}-${baseClasses}`, id: `${newNodeId}-output-${nodeData.outputs[j].name}-${baseClasses}`,
name: nodeData.outputs[j].name, name: nodeData.outputs[j].name,
label: nodeData.outputs[j].label, label: nodeData.outputs[j].label,
description: nodeData.outputs[j].description ?? '',
type type
} }
options.push(newOutputOption) options.push(newOutputOption)
@ -107,6 +108,7 @@ export const initNode = (nodeData, newNodeId) => {
name: 'output', name: 'output',
label: 'Output', label: 'Output',
type: 'options', type: 'options',
description: nodeData.outputs[0].description ?? '',
options, options,
default: nodeData.outputs[0].name default: nodeData.outputs[0].name
} }
@ -116,6 +118,7 @@ export const initNode = (nodeData, newNodeId) => {
id: `${newNodeId}-output-${nodeData.name}-${nodeData.baseClasses.join('|')}`, id: `${newNodeId}-output-${nodeData.name}-${nodeData.baseClasses.join('|')}`,
name: nodeData.name, name: nodeData.name,
label: nodeData.type, label: nodeData.type,
description: nodeData.description ?? '',
type: nodeData.baseClasses.join(' | ') type: nodeData.baseClasses.join(' | ')
} }
outputAnchors.push(newOutput) outputAnchors.push(newOutput)