Skip to content

Commit 368f7bd

Browse files
committed
Remove filter on external knowledge.
* Update question so that evaulator passes fix formatting
1 parent a7eb28a commit 368f7bd

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/chatbot/OpenAiDefaultChatBotIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.springframework.ai.chat.prompt.transformer.TransformerContentType;
2727
import org.springframework.ai.document.Document;
2828
import org.springframework.ai.openai.OpenAiChatOptions;
29+
import org.testcontainers.containers.wait.strategy.Wait;
2930
import org.testcontainers.junit.jupiter.Container;
3031
import org.testcontainers.junit.jupiter.Testcontainers;
3132
import org.testcontainers.qdrant.QdrantContainer;
@@ -91,7 +92,7 @@ public OpenAiDefaultChatBotIT(ChatClient chatClient, ChatBot chatBot, VectorStor
9192
void simpleChat() {
9293
loadData();
9394

94-
var prompt = new Prompt(new UserMessage("What bike is good for city commuting?"));
95+
var prompt = new Prompt(new UserMessage("What reliable road bike?"));
9596
var chatBotResponse = this.chatBot.call(new PromptContext(prompt));
9697
String answer = chatBotResponse.getChatResponse().getResult().getOutput().getContent();
9798
assertTrue(answer.contains("Celerity"), "Response does not include 'Celerity'");

spring-ai-core/src/main/java/org/springframework/ai/chat/prompt/transformer/QuestionContextAugmentor.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@ public PromptContext transform(PromptContext promptContext) {
6161
}
6262

6363
protected String doCreateContext(List<Content> data) {
64-
return data.stream()
65-
.filter(content -> content.getMetadata().containsKey(TransformerContentType.EXTERNAL_KNOWLEDGE))
66-
.map(Content::getContent)
67-
.collect(Collectors.joining(System.lineSeparator()));
64+
return data.stream().map(Content::getContent).collect(Collectors.joining(System.lineSeparator()));
6865
}
6966

7067
private Map<String, Object> doCreateContextMap(Prompt prompt, String context) {

spring-ai-core/src/main/java/org/springframework/ai/chat/prompt/transformer/VectorStoreRetriever.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.springframework.ai.document.Document;
2424
import org.springframework.ai.vectorstore.SearchRequest;
2525
import org.springframework.ai.vectorstore.VectorStore;
26+
import org.springframework.ai.vectorstore.filter.Filter;
2627

2728
import java.util.List;
2829
import java.util.Objects;
@@ -60,8 +61,7 @@ public PromptContext transform(PromptContext promptContext) {
6061
.map(m -> m.getContent())
6162
.collect(Collectors.joining(System.lineSeparator()));
6263

63-
List<Document> documents = vectorStore.similaritySearch(searchRequest.withQuery(userMessage)
64-
.withFilterExpression(TransformerContentType.EXTERNAL_KNOWLEDGE + "=='true'"));
64+
List<Document> documents = vectorStore.similaritySearch(searchRequest.withQuery(userMessage));
6565

6666
logger.info("Retrieved {} documents for user message {}", documents.size(), userMessage);
6767
for (Document document : documents) {

0 commit comments

Comments
 (0)