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

Merge pull request #1480 from micromata/feature/qdrant-port-fix 

Feature/qdrant port fix
This commit is contained in:
Henry Heng 2024-01-05 00:01:49 +00:00 committed by GitHub
parent d20debc6f0 e35faa57af
commit 3362706d39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/components/nodes/vectorstores/Qdrant/Qdrant.ts
View File

@ -149,9 +149,12 @@ class Qdrant_VectorStores implements INode {
const credentialData = await getCredentialData(nodeData.credential ?? '', options) const credentialData = await getCredentialData(nodeData.credential ?? '', options)
const qdrantApiKey = getCredentialParam('qdrantApiKey', credentialData, nodeData) const qdrantApiKey = getCredentialParam('qdrantApiKey', credentialData, nodeData)
const port = Qdrant_VectorStores.determinePortByUrl(qdrantServerUrl)
const client = new QdrantClient({ const client = new QdrantClient({
url: qdrantServerUrl, url: qdrantServerUrl,
apiKey: qdrantApiKey apiKey: qdrantApiKey,
port: port
}) })
const flattenDocs = docs && docs.length ? flatten(docs) : [] const flattenDocs = docs && docs.length ? flatten(docs) : []
@ -198,9 +201,12 @@ class Qdrant_VectorStores implements INode {
const credentialData = await getCredentialData(nodeData.credential ?? '', options) const credentialData = await getCredentialData(nodeData.credential ?? '', options)
const qdrantApiKey = getCredentialParam('qdrantApiKey', credentialData, nodeData) const qdrantApiKey = getCredentialParam('qdrantApiKey', credentialData, nodeData)
const port = Qdrant_VectorStores.determinePortByUrl(qdrantServerUrl)
const client = new QdrantClient({ const client = new QdrantClient({
url: qdrantServerUrl, url: qdrantServerUrl,
apiKey: qdrantApiKey apiKey: qdrantApiKey,
port: port
}) })
const dbConfig: QdrantLibArgs = { const dbConfig: QdrantLibArgs = {
@ -242,6 +248,28 @@ class Qdrant_VectorStores implements INode {
} }
return vectorStore return vectorStore
} }
/**
* Determine the port number from the given URL.
*
* The problem is when not doing this the qdrant-client.js will fall back on 6663 when you enter a port 443 and 80.
* See: https://stackoverflow.com/questions/59104197/nodejs-new-url-urlhttps-myurl-com80-lists-the-port-as-empty
* @param qdrantServerUrl the url to get the port from
*/
static determinePortByUrl(qdrantServerUrl: string): number {
const parsedUrl = new URL(qdrantServerUrl)
let port = parsedUrl.port ? parseInt(parsedUrl.port) : 6663
if (parsedUrl.protocol === 'https:' && parsedUrl.port === '') {
port = 443
}
if (parsedUrl.protocol === 'http:' && parsedUrl.port === '') {
port = 80
}
return port
}
} }
module.exports = { nodeClass: Qdrant_VectorStores } module.exports = { nodeClass: Qdrant_VectorStores }