From 0650f12bd5407806a82c0461e02539d97fe0bc0e Mon Sep 17 00:00:00 2001 From: "Peter.Morton" Date: Tue, 3 Jun 2025 14:47:33 -0500 Subject: [PATCH] you can now pass in the filterExpression so that the messeger can change the default in settings --- .../GlobalVariable/CQA_Retriever.js | 13 +++++++------ CQA_Retriever/_studio_dependencies/README.md | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CQA_Retriever/_studio_dependencies/GlobalVariable/CQA_Retriever.js b/CQA_Retriever/_studio_dependencies/GlobalVariable/CQA_Retriever.js index 7f900ef..720e75c 100644 --- a/CQA_Retriever/_studio_dependencies/GlobalVariable/CQA_Retriever.js +++ b/CQA_Retriever/_studio_dependencies/GlobalVariable/CQA_Retriever.js @@ -1,7 +1,3 @@ -const filter = { - filterExpression: CQA_RetrieverSettings.filterExpression, -}; - const embedding = new langchain.openai.AzureOpenAIEmbeddings({ azureOpenAIApiInstanceName: CQA_RetrieverSettings.azure_openai_api.instance_name, @@ -46,7 +42,12 @@ function getSourceId(document) { } return { - async retrieve(query) { + async retrieve(query, filterExpression) { + console.log({ query: query, filterExpression:filterExpression}) + const filter = { + filterExpression: filterExpression?? CQA_RetrieverSettings.filterExpression, + }; + const resultDocuments = await store.similaritySearch(query, 20, filter); const sources = resultDocuments.map((doc) => ({ source_id: getSourceId(doc), @@ -71,4 +72,4 @@ return { return cqaSources; }, -}; +}; \ No newline at end of file diff --git a/CQA_Retriever/_studio_dependencies/README.md b/CQA_Retriever/_studio_dependencies/README.md index 2876dde..c72f5af 100644 --- a/CQA_Retriever/_studio_dependencies/README.md +++ b/CQA_Retriever/_studio_dependencies/README.md @@ -72,7 +72,7 @@ let exitState=0; // i.e. next(0) means something went wrong or we found 0 source (async () => { console.log(`CQA Retrieval: ${conversationData.cqa_question}`) conversationData.cqa_source = await CQA_Retriever().retrieve(conversationData.cqa_question); - console.log({ lengthOfSources: conversationData.cqa_source.instances[0].sources.length}) + exitState = conversationData.cqa_source.instances[0].sources.length })()