Skip to content
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

Fix #76 #83

Merged
merged 6 commits into from
Oct 30, 2024
Merged

Fix #76 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
227782d
to #76 ,更正 prompts 目标里的 question_answer_context 和 question_answer_con…
flystar32 Oct 29, 2024
3c0f6ed
to #76, 删除和光合作用有关的内 容，使得默认模板能适用绝大多数场景
flystar32 Oct 29, 2024
a315ff8
to #76, 将知识库的上下文追加到usertext 里，而不是直接替换 systemtext。使得 DashScopeDocument…
flystar32 Oct 29, 2024
2770c53
Revert "to #76, 删除和光合作用有关的内 容，使得默认模板能适用绝大多数场景"
flystar32 Oct 29, 2024
5e469dd
to #76 ,更正 prompts 目标里的 question_answer_context 和 qa_retrieved_docume…
flystar32 Oct 29, 2024
a7ba8df
to #76, 将知识库的上下文追加到usertext 里，而不是直接替换 systemtext。使得 DocumentRetrieval…
flystar32 Oct 29, 2024
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
7 changes: 3 additions & 4 deletions ...-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/advisor/DocumentRetrievalAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
}
Expand Down
7 changes: 3 additions & 4 deletions ...e/src/main/java/com/alibaba/cloud/ai/dashscope/rag/DashScopeDocumentRetrievalAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
}
Expand Down