farcasclaudiu/Flowise
1
0
Fork 0
mirror of https://github.com/farcasclaudiu/Flowise.git synced 2026-06-28 15:00:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into chore/Upgrade-LC-version

Browse Source 
# Conflicts:
#	packages/components/nodes/vectorstores/Qdrant/Qdrant.ts
This commit is contained in:
Henry
2024-01-27 00:59:15 +00:00
parent 0606d2c6dd c1767f302d
commit 7b0416b680
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts
+8
View File
@@ -47,6 +47,14 @@ class ChatOpenAI_ChatModels implements INode {
label: 'gpt-4', label: 'gpt-4',
name: 'gpt-4' name: 'gpt-4'
}, },
{
label: 'gpt-4-turbo-preview',
name: 'gpt-4-turbo-preview'
},
{
label: 'gpt-4-0125-preview',
name: 'gpt-4-0125-preview'
},
{ {
label: 'gpt-4-1106-preview', label: 'gpt-4-1106-preview',
name: 'gpt-4-1106-preview' name: 'gpt-4-1106-preview'
packages/components/nodes/vectorstores/Qdrant/Qdrant.ts
+1 -1
View File
@@ -194,7 +194,7 @@ class Qdrant_VectorStores implements INode {
const qdrantVectorDimension = nodeData.inputs?.qdrantVectorDimension const qdrantVectorDimension = nodeData.inputs?.qdrantVectorDimension
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
let queryFilter = nodeData.inputs?.queryFilter let queryFilter = nodeData.inputs?.qdrantFilter
const k = topK ? parseFloat(topK) : 4 const k = topK ? parseFloat(topK) : 4
packages/components/nodes/vectorstores/Qdrant/Qdrant_Existing.ts
+1 -1
View File
@@ -135,7 +135,7 @@ class Qdrant_Existing_VectorStores implements INode {
const qdrantVectorDimension = nodeData.inputs?.qdrantVectorDimension const qdrantVectorDimension = nodeData.inputs?.qdrantVectorDimension
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
let queryFilter = nodeData.inputs?.queryFilter let queryFilter = nodeData.inputs?.qdrantFilter
const k = topK ? parseFloat(topK) : 4 const k = topK ? parseFloat(topK) : 4
packages/server/src/index.ts
+6 -2
View File
@@ -473,7 +473,7 @@ export class App {
} }
} }
isStreaming = isFlowValidForStream(nodes, endingNodeData) isStreaming = isEndingNode ? false : isFlowValidForStream(nodes, endingNodeData)
} }
const obj = { isStreaming } const obj = { isStreaming }
@@ -1676,7 +1676,11 @@ export class App {
return res.status(500).send(`Ending node must be either a Chain or Agent`) return res.status(500).send(`Ending node must be either a Chain or Agent`)
} }
if (!Object.values(endingNodeData.outputs ?? {}).includes(endingNodeData.name)) { if (
endingNodeData.outputs &&
Object.keys(endingNodeData.outputs).length &&
!Object.values(endingNodeData.outputs ?? {}).includes(endingNodeData.name)
) {
return res return res
.status(500) .status(500)
.send( .send(