Merge pull request #83 from flystar32/main

Fix #76
alibaba · Oct 30, 2024 · b5a2054 · b5a2054
2 parents f772076 + a7ba8df
commit b5a2054
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/advisor/DocumentRetrievalAdvisor.java b/...-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/advisor/DocumentRetrievalAdvisor.java
@@ -56,7 +56,7 @@ public class DocumentRetrievalAdvisor implements CallAroundAdvisor, StreamAround
 
 	private static final int DEFAULT_ORDER = 0;
 
-	public static String RETRIEVED_DOCUMENTS = "qa_retrieved_documents";
+	public static String RETRIEVED_DOCUMENTS = "question_answer_context";
 
 	private final DocumentRetriever retriever;
 
@@ -145,9 +145,8 @@ private AdvisedRequest before(AdvisedRequest request) {
 		advisedUserParams.put("question_answer_context", documentContext);
 
 		return AdvisedRequest.from(request)
-			.withSystemText(this.userTextAdvise)
-			.withSystemParams(advisedUserParams)
-			.withUserText(request.userText())
+			.withUserText(request.userText() + System.lineSeparator() + this.userTextAdvise)
+			.withUserParams(advisedUserParams)
 			.withAdviseContext(context)
 			.build();
 	}

diff --git a/...e/src/main/java/com/alibaba/cloud/ai/dashscope/rag/DashScopeDocumentRetrievalAdvisor.java b/...e/src/main/java/com/alibaba/cloud/ai/dashscope/rag/DashScopeDocumentRetrievalAdvisor.java
@@ -75,7 +75,7 @@ public class DashScopeDocumentRetrievalAdvisor implements CallAroundAdvisor, Str
 
 	private static final int DEFAULT_ORDER = 0;
 
-	public static String RETRIEVED_DOCUMENTS = "qa_retrieved_documents";
+	public static String RETRIEVED_DOCUMENTS = "question_answer_context";
 
 	private final DocumentRetriever retriever;
 
@@ -184,9 +184,8 @@ private AdvisedRequest before(AdvisedRequest request) {
 		advisedUserParams.put(RETRIEVED_DOCUMENTS, documentContext);
 
 		return AdvisedRequest.from(request)
-			.withSystemText(this.userTextAdvise)
-			.withSystemParams(advisedUserParams)
-			.withUserText(request.userText())
+			.withUserText(request.userText() + System.lineSeparator() + this.userTextAdvise)
+			.withUserParams(advisedUserParams)
 			.withAdviseContext(context)
 			.build();
 	}