From e2a69a5f932998ff38e0403df81e407a59fbd095 Mon Sep 17 00:00:00 2001 From: Ahmed Essam Date: Wed, 3 Dec 2025 15:01:11 -0800 Subject: [PATCH] feat(datapools): fix namespace parsing for nkv --- packages/core/src/Components/RAG/DataSourceCleaner.class.ts | 4 ++-- packages/core/src/Components/RAG/DataSourceIndexer.class.ts | 4 ++-- packages/core/src/Components/RAG/DataSourceLookup.class.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/src/Components/RAG/DataSourceCleaner.class.ts b/packages/core/src/Components/RAG/DataSourceCleaner.class.ts index 6682c72e2..394728d8e 100644 --- a/packages/core/src/Components/RAG/DataSourceCleaner.class.ts +++ b/packages/core/src/Components/RAG/DataSourceCleaner.class.ts @@ -117,11 +117,11 @@ export class DataSourceCleaner extends DataSourceComponent { const namespaceLabel = /^c[a-z0-9]{24}.+$/.test(configSchema.value.namespaceId) ? configSchema.value.namespaceId.split('_').slice(1).join('_') : configSchema.value.namespaceId; - const namespaceId = configSchema.value.namespaceId; + // const namespaceId = configSchema.value.namespaceId; let vecDbConnector: VectorDBConnector = null; try { - vecDbConnector = await this.resolveVectorDbConnector(namespaceId, teamId); + vecDbConnector = await this.resolveVectorDbConnector(namespaceLabel, teamId); } catch (err: any) { debugOutput += `Error: ${err?.message || "Couldn't get vector database connector"}\n\n`; return { diff --git a/packages/core/src/Components/RAG/DataSourceIndexer.class.ts b/packages/core/src/Components/RAG/DataSourceIndexer.class.ts index 395505b9a..063ca164e 100644 --- a/packages/core/src/Components/RAG/DataSourceIndexer.class.ts +++ b/packages/core/src/Components/RAG/DataSourceIndexer.class.ts @@ -150,12 +150,12 @@ export class DataSourceIndexer extends DataSourceComponent { // we try to get the namespace without the prefix teamId, if not exist, we use the full namespace id // const namespaceLabel = _config.namespace.split('_').slice(1).join('_') || _config.namespace; const namespaceLabel = /^c[a-z0-9]{24}.+$/.test(_config.namespace) ? _config.namespace.split('_').slice(1).join('_') : _config.namespace; - const namespaceId = _config.namespace; + // const namespaceId = _config.namespace; debugOutput += `[Selected namespace] \n${namespaceLabel}\n\n`; let vecDbConnector: VectorDBConnector = null; try { - vecDbConnector = await this.resolveVectorDbConnector(namespaceId, teamId); + vecDbConnector = await this.resolveVectorDbConnector(namespaceLabel, teamId); } catch (err: any) { debugOutput += `Error: ${err?.message || "Couldn't get vector database connector"}\n\n`; return { diff --git a/packages/core/src/Components/RAG/DataSourceLookup.class.ts b/packages/core/src/Components/RAG/DataSourceLookup.class.ts index 82cfd0f9d..bed9a884b 100644 --- a/packages/core/src/Components/RAG/DataSourceLookup.class.ts +++ b/packages/core/src/Components/RAG/DataSourceLookup.class.ts @@ -161,7 +161,7 @@ export class DataSourceLookup extends DataSourceComponent { const namespaceLabel = /^c[a-z0-9]{24}.+$/.test(config.data.namespace) ? config.data.namespace.split('_').slice(1).join('_') : config.data.namespace; - const namespaceId = config.data.namespace; + // const namespaceId = config.data.namespace; const model = config.data?.model || 'gpt-4o-mini'; const includeMetadata = config.data?.includeMetadata || false; @@ -175,7 +175,7 @@ export class DataSourceLookup extends DataSourceComponent { // let vectorDbConnector = ConnectorService.getVectorDBConnector(); // let existingNs = await vectorDbConnector.requester(AccessCandidate.team(teamId)).namespaceExists(namespaceLabel); - const vecDbConnector = await this.resolveVectorDbConnector(namespaceId, teamId); + const vecDbConnector = await this.resolveVectorDbConnector(namespaceLabel, teamId); let results: string[] | { content: string; metadata: any; score?: number }[]; let _error;