Skip to content

Support pre-parsed Filter.Expression in getFilterExpression #3068

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+32 −3
Open

Support pre-parsed Filter.Expression in getFilterExpression #3068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47df5a7
Support pre-parsed Filter.Expression in getFilterExpression
solnone May 9, 2025
cc8a7a7
Merge branch 'spring-projects:main' into main
solnone May 14, 2025
172ee58
Merge branch 'main' into main
solnone May 17, 2025
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
9 changes: 6 additions & 3 deletions ...in/java/org/springframework/ai/chat/client/advisor/vectorstore/QuestionAnswerAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,14 @@ public ChatClientResponse after(ChatClientResponse chatClientResponse, AdvisorCh

@Nullable
protected Filter.Expression doGetFilterExpression(Map<String, Object> context) {
if (!context.containsKey(FILTER_EXPRESSION)
|| !StringUtils.hasText(context.get(FILTER_EXPRESSION).toString())) {
var filterExpression = context.get(FILTER_EXPRESSION);
if (filterExpression instanceof Filter.Expression) {
return (Filter.Expression) filterExpression;
}
if (!context.containsKey(FILTER_EXPRESSION) || !StringUtils.hasText(filterExpression.toString())) {
return this.searchRequest.getFilterExpression();
}
return new FilterExpressionTextParser().parse(context.get(FILTER_EXPRESSION).toString());
return new FilterExpressionTextParser().parse(filterExpression.toString());
}

@Override
Expand Down
26 changes: 26 additions & 0 deletions ...ngframework/ai/integration/tests/rag/retrieval/search/VectorStoreDocumentRetrieverIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.springframework.ai.rag.retrieval.search.DocumentRetriever;
import org.springframework.ai.rag.retrieval.search.VectorStoreDocumentRetriever;
import org.springframework.ai.vectorstore.filter.Filter;
import org.springframework.ai.vectorstore.filter.FilterExpressionBuilder;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
Expand Down Expand Up @@ -134,4 +135,29 @@ void withRequestFilter() {
assertThat(retrievedDocuments).anyMatch(document -> document.getId().equals(documents.get("4").getId()));
}

@Test
void withRequestFilterExpression() {
FilterExpressionBuilder b = new FilterExpressionBuilder();
DocumentRetriever documentRetriever = VectorStoreDocumentRetriever.builder()
.vectorStore(this.pgVectorStore)
.similarityThreshold(0.50)
.topK(3)
.build();

Query query = Query.builder()
.text("Who is Anacletus?")
.context(Map.of(VectorStoreDocumentRetriever.FILTER_EXPRESSION,
b.eq("location", "Whispering Woods").build()))
.build();
List<Document> retrievedDocuments = documentRetriever.retrieve(query);

assertThat(retrievedDocuments).hasSize(2);
assertThat(retrievedDocuments).anyMatch(document -> document.getId().equals(documents.get("1").getId()));
assertThat(retrievedDocuments).anyMatch(document -> document.getId().equals(documents.get("2").getId()));

// No request filter expression applied, so full access to all documents.
retrievedDocuments = documentRetriever.retrieve(new Query("Who is Birba?"));
assertThat(retrievedDocuments).anyMatch(document -> document.getId().equals(documents.get("4").getId()));
}

}