Skip to content

Add the ability to customize SimpleLoggerAdvisor order #1556

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

Merged
merged 1 commit into from
Oct 22, 2024
Merged

Add the ability to customize SimpleLoggerAdvisor order #1556

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
13 changes: 10 additions & 3 deletions ...ai-core/src/main/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public class SimpleLoggerAdvisor implements CallAroundAdvisor, StreamAroundAdvis

private static final Logger logger = LoggerFactory.getLogger(SimpleLoggerAdvisor.class);

private int order;

public static final Function<AdvisedRequest, String> DEFAULT_REQUEST_TO_STRING = (request) -> {
return request.toString();
};
Expand All @@ -53,13 +55,18 @@ public class SimpleLoggerAdvisor implements CallAroundAdvisor, StreamAroundAdvis
private final Function<ChatResponse, String> responseToString;

public SimpleLoggerAdvisor() {
this(DEFAULT_REQUEST_TO_STRING, DEFAULT_RESPONSE_TO_STRING);
this(DEFAULT_REQUEST_TO_STRING, DEFAULT_RESPONSE_TO_STRING, 0);
}

public SimpleLoggerAdvisor(int order) {
this(DEFAULT_REQUEST_TO_STRING, DEFAULT_RESPONSE_TO_STRING, order);
}

public SimpleLoggerAdvisor(Function<AdvisedRequest, String> requestToString,
Function<ChatResponse, String> responseToString) {
Function<ChatResponse, String> responseToString, int order) {
this.requestToString = requestToString;
this.responseToString = responseToString;
this.order = order;
}

@Override
Expand All @@ -69,7 +76,7 @@ public String getName() {

@Override
public int getOrder() {
return 0;
return this.order;
}

private AdvisedRequest before(AdvisedRequest request) {
Expand Down
8 changes: 8 additions & 0 deletions ...re/src/test/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ public void streamLogging(CapturedOutput output) {
validate(content, output);
}

@Test
public void loggingOrder() {

var loggerAdvisor = new SimpleLoggerAdvisor(1);

assertThat(loggerAdvisor.getOrder()).isEqualTo(1);
}

private void validate(String content, CapturedOutput output) {
assertThat(content).isEqualTo("Your answer is ZXY");

Expand Down