Skip to content

fix:Advisor parameters lost when mutate ChatClient #5090

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
YunKuiLu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix:Advisor parameters lost when mutate ChatClient #5090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion ...ng-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,11 @@ public Builder mutate() {
.defaultToolNames(StringUtils.toStringArray(this.toolNames));

if (!CollectionUtils.isEmpty(this.advisors)) {
builder.defaultAdvisors(a -> a.advisors(this.advisors).params(this.advisorParams));
builder.defaultAdvisors(a -> a.advisors(this.advisors));
}

if (!CollectionUtils.isEmpty(this.advisorParams)) {
builder.defaultAdvisors(a -> a.params(this.advisorParams));
}

if (StringUtils.hasText(this.userText)) {
Expand Down
14 changes: 14 additions & 0 deletions spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/ChatClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,20 @@ void mutateDefaults() {

}

@Test
void mutateAdvisorParams() {
ChatClient defaultChatClient = ChatClient.builder(this.chatModel)
.defaultAdvisors(AdvisorParams.ENABLE_NATIVE_STRUCTURED_OUTPUT)
.build();

ChatClient mutatedChatClient = defaultChatClient.mutate().build();

ChatClient.ChatClientRequestSpec prompt = mutatedChatClient.prompt();

assertThat(((DefaultChatClient.DefaultChatClientRequestSpec) prompt).getAdvisorParams())
.containsKey(ChatClientAttributes.STRUCTURED_OUTPUT_NATIVE.getKey());
}

@Test
void mutatePrompt() {

Expand Down