Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Qdrant filter #912

Merged
merged 2 commits into from
Sep 13, 2023
Merged

feat: Qdrant filter #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bf298e
feat: filter qdrant existing
Anush008 Sep 12, 2023
73d7d4e
feat: filter qdrant upsert
Anush008 Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions packages/components/nodes/vectorstores/Qdrant_Existing/Qdrant_Existing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import { QdrantClient } from '@qdrant/js-client-rest'
import { QdrantVectorStore, QdrantLibArgs } from 'langchain/vectorstores/qdrant'
import { Embeddings } from 'langchain/embeddings/base'
import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
import { VectorStoreRetrieverInput } from 'langchain/vectorstores/base'

type RetrieverConfig = Partial<VectorStoreRetrieverInput<QdrantVectorStore>>

class Qdrant_Existing_VectorStores implements INode {
label: string
Expand Down Expand Up @@ -53,7 +56,7 @@ class Qdrant_Existing_VectorStores implements INode {
},
{
label: 'Qdrant Collection Cofiguration',
name: 'qdrantCollectionCofiguration',
name: 'qdrantCollectionConfiguration',
type: 'json',
optional: true,
additionalParams: true
Expand All @@ -66,6 +69,14 @@ class Qdrant_Existing_VectorStores implements INode {
type: 'number',
additionalParams: true,
optional: true
},
{
label: 'Qdrant Search Filter',
name: 'qdrantFilter',
description: 'Only return points which satisfy the conditions',
type: 'json',
additionalParams: true,
optional: true
}
]
this.outputs = [
Expand All @@ -85,10 +96,12 @@ class Qdrant_Existing_VectorStores implements INode {
async init(nodeData: INodeData, _: string, options: ICommonObject): Promise<any> {
const qdrantServerUrl = nodeData.inputs?.qdrantServerUrl as string
const collectionName = nodeData.inputs?.qdrantCollection as string
let qdrantCollectionCofiguration = nodeData.inputs?.qdrantCollectionCofiguration
let qdrantCollectionConfiguration = nodeData.inputs?.qdrantCollectionConfiguration
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
let queryFilter = nodeData.inputs?.queryFilter

const k = topK ? parseFloat(topK) : 4

const credentialData = await getCredentialData(nodeData.credential ?? '', options)
Expand All @@ -104,16 +117,26 @@ class Qdrant_Existing_VectorStores implements INode {
collectionName
}

if (qdrantCollectionCofiguration) {
qdrantCollectionCofiguration =
typeof qdrantCollectionCofiguration === 'object' ? qdrantCollectionCofiguration : JSON.parse(qdrantCollectionCofiguration)
dbConfig.collectionConfig = qdrantCollectionCofiguration
const retrieverConfig: RetrieverConfig = {
k
}

if (qdrantCollectionConfiguration) {
qdrantCollectionConfiguration =
typeof qdrantCollectionConfiguration === 'object'
? qdrantCollectionConfiguration
: JSON.parse(qdrantCollectionConfiguration)
dbConfig.collectionConfig = qdrantCollectionConfiguration
}

if (queryFilter) {
retrieverConfig.filter = typeof queryFilter === 'object' ? queryFilter : JSON.parse(queryFilter)
}

const vectorStore = await QdrantVectorStore.fromExistingCollection(embeddings, dbConfig)

if (output === 'retriever') {
const retriever = vectorStore.asRetriever(k)
const retriever = vectorStore.asRetriever(retrieverConfig)
return retriever
} else if (output === 'vectorStore') {
;(vectorStore as any).k = k
Expand Down
23 changes: 22 additions & 1 deletion packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import { Embeddings } from 'langchain/embeddings/base'
import { Document } from 'langchain/document'
import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
import { flatten } from 'lodash'
import { VectorStoreRetrieverInput } from 'langchain/vectorstores/base'

type RetrieverConfig = Partial<VectorStoreRetrieverInput<QdrantVectorStore>>

class QdrantUpsert_VectorStores implements INode {
label: string
Expand Down Expand Up @@ -67,6 +70,14 @@ class QdrantUpsert_VectorStores implements INode {
type: 'number',
additionalParams: true,
optional: true
},
{
label: 'Qdrant Search Filter',
name: 'qdrantFilter',
description: 'Only return points which satisfy the conditions',
type: 'json',
additionalParams: true,
optional: true
}
]
this.outputs = [
Expand All @@ -91,6 +102,7 @@ class QdrantUpsert_VectorStores implements INode {
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseFloat(topK) : 4
let queryFilter = nodeData.inputs?.qdrantFilter

const credentialData = await getCredentialData(nodeData.credential ?? '', options)
const qdrantApiKey = getCredentialParam('qdrantApiKey', credentialData, nodeData)
Expand All @@ -111,10 +123,19 @@ class QdrantUpsert_VectorStores implements INode {
url: qdrantServerUrl,
collectionName
}

const retrieverConfig: RetrieverConfig = {
k
}

if (queryFilter) {
retrieverConfig.filter = typeof queryFilter === 'object' ? queryFilter : JSON.parse(queryFilter)
}

const vectorStore = await QdrantVectorStore.fromDocuments(finalDocs, embeddings, dbConfig)

if (output === 'retriever') {
const retriever = vectorStore.asRetriever(k)
const retriever = vectorStore.asRetriever(retrieverConfig)
return retriever
} else if (output === 'vectorStore') {
;(vectorStore as any).k = k
Expand Down