Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix RAG tests after Document refactoring

Browse Source
This commit is contained in:
Mark Pollack
2024-12-12 09:22:04 -05:00
parent dda86808b7
commit 85580f81fa
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-ai-core/src/main/java/org/springframework/ai/evaluation/EvaluationRequest.java
View File

@@ -20,6 +20,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
import org.springframework.ai.document.Document;
import org.springframework.ai.model.Content;
/**
@@ -35,7 +36,7 @@ public class EvaluationRequest {
private final String userText;
private final List<Content> dataList;
private final List<Document> dataList;
private final String responseContent;
@@ -43,11 +44,11 @@ public class EvaluationRequest {
this(userText, Collections.emptyList(), responseContent);
}
public EvaluationRequest(List<Content> dataList, String responseContent) {
public EvaluationRequest(List<Document> dataList, String responseContent) {
this("", dataList, responseContent);
}
public EvaluationRequest(String userText, List<Content> dataList, String responseContent) {
public EvaluationRequest(String userText, List<Document> dataList, String responseContent) {
this.userText = userText;
this.dataList = dataList;
this.responseContent = responseContent;
@@ -57,7 +58,7 @@ public class EvaluationRequest {
return this.userText;
}
public List<Content> getDataList() {
public List<Document> getDataList() {
return this.dataList;
}

5
spring-ai-core/src/main/java/org/springframework/ai/evaluation/Evaluator.java
View File

@@ -19,6 +19,7 @@ package org.springframework.ai.evaluation;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.ai.document.Document;
import org.springframework.ai.model.Content;
import org.springframework.util.StringUtils;
@@ -28,9 +29,9 @@ public interface Evaluator {
EvaluationResponse evaluate(EvaluationRequest evaluationRequest);
default String doGetSupportingData(EvaluationRequest evaluationRequest) {
List<Content> data = evaluationRequest.getDataList();
List<Document> data = evaluationRequest.getDataList();
return data.stream()
.map(Content::getText)
.map(Document::getText)
.filter(StringUtils::hasText)
.collect(Collectors.joining(System.lineSeparator()));
}