Skip to content

[WIP] Refactor AdvisedRequest and introduce AdvisedResponse #1332

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

Closed
wants to merge 5 commits into from
Closed

[WIP] Refactor AdvisedRequest and introduce AdvisedResponse #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c83336
Refactor AdvisedRequest and introduce AdvisedResponse for better enca…
tzolov Sep 5, 2024
1ec9c24
refactor(advisors): Rename and restructure advisor interfaces
tzolov Sep 11, 2024
afb9cf1
refactor(ai): move AdvisedRequest to advisor.api package
tzolov Sep 12, 2024
c218214
Additional tests
tzolov Sep 14, 2024
65f373a
Address some of the review comments
tzolov Sep 24, 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
18 changes: 9 additions & 9 deletions ...i-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiPaymentTransactionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
import org.junit.jupiter.params.provider.ValueSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ai.chat.client.AdvisedRequest;
import org.springframework.ai.chat.client.ChatClient;
import org.springframework.ai.chat.client.advisor.api.RequestAdvisor;
import org.springframework.ai.chat.client.advisor.api.ResponseAdvisor;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.ai.chat.client.advisor.api.AdvisedRequest;
import org.springframework.ai.chat.client.advisor.api.AdvisedResponse;
import org.springframework.ai.chat.client.advisor.api.BeforeAdvisor;
import org.springframework.ai.chat.client.advisor.api.AfterAdvisor;
import org.springframework.ai.converter.BeanOutputConverter;
import org.springframework.ai.model.function.FunctionCallbackContext;
import org.springframework.ai.openai.OpenAiChatModel;
Expand Down Expand Up @@ -65,7 +65,7 @@ public class OpenAiPaymentTransactionIT {
record TransactionStatusResponse(String id, String status) {
}

private static class LoggingAdvisor implements RequestAdvisor, ResponseAdvisor {
private static class LoggingAdvisor implements BeforeAdvisor, AfterAdvisor {

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

Expand All @@ -74,7 +74,7 @@ public String getName() {
}

@Override
public AdvisedRequest adviseRequest(AdvisedRequest request, Map<String, Object> context) {
public AdvisedRequest before(AdvisedRequest request) {
logger.info("System text: \n" + request.systemText());
logger.info("System params: " + request.systemParams());
logger.info("User text: \n" + request.userText());
Expand All @@ -87,9 +87,9 @@ public AdvisedRequest adviseRequest(AdvisedRequest request, Map<String, Object>
}

@Override
public ChatResponse adviseResponse(ChatResponse response, Map<String, Object> context) {
logger.info("Response: " + response);
return response;
public AdvisedResponse afterCall(AdvisedResponse advisedResponse) {
logger.info("Response: " + advisedResponse.response());
return advisedResponse;
}

}
Expand Down
18 changes: 9 additions & 9 deletions ...a/org/springframework/ai/vertexai/gemini/function/VertexAiGeminiPaymentTransactionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ai.chat.client.AdvisedRequest;
import org.springframework.ai.chat.client.ChatClient;
import org.springframework.ai.chat.client.advisor.api.RequestAdvisor;
import org.springframework.ai.chat.client.advisor.api.ResponseAdvisor;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.ai.chat.client.advisor.api.AdvisedRequest;
import org.springframework.ai.chat.client.advisor.api.AdvisedResponse;
import org.springframework.ai.chat.client.advisor.api.BeforeAdvisor;
import org.springframework.ai.chat.client.advisor.api.AfterAdvisor;
import org.springframework.ai.model.function.FunctionCallbackContext;
import org.springframework.ai.model.function.FunctionCallbackWrapper.Builder.SchemaType;
import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatModel;
Expand Down Expand Up @@ -65,7 +65,7 @@ public class VertexAiGeminiPaymentTransactionIT {
record TransactionStatusResponse(String id, String status) {
}

private static class LoggingAdvisor implements RequestAdvisor, ResponseAdvisor {
private static class LoggingAdvisor implements BeforeAdvisor, AfterAdvisor {

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

Expand All @@ -75,7 +75,7 @@ public String getName() {
}

@Override
public AdvisedRequest adviseRequest(AdvisedRequest request, Map<String, Object> context) {
public AdvisedRequest before(AdvisedRequest request) {
logger.info("System text: \n" + request.systemText());
logger.info("System params: " + request.systemParams());
logger.info("User text: \n" + request.userText());
Expand All @@ -88,9 +88,9 @@ public AdvisedRequest adviseRequest(AdvisedRequest request, Map<String, Object>
}

@Override
public ChatResponse adviseResponse(ChatResponse response, Map<String, Object> context) {
logger.info("Response: " + response);
return response;
public AdvisedResponse afterCall(AdvisedResponse advisedResponse) {
logger.info("Response: " + advisedResponse.response());
return advisedResponse;
}

}
Expand Down
Loading