Skip to content

feat!: Remove deprecated create method in ResponseProcessor #981

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
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −13
Open

feat!: Remove deprecated create method in ResponseProcessor #981

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
5 changes: 2 additions & 3 deletions core/src/main/java/com/google/adk/flows/llmflows/CodeExecution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,15 @@ public Single<ResponseProcessor.ResponseProcessingResult> processResponse(
InvocationContext invocationContext, LlmResponse llmResponse) {
if (llmResponse.partial().orElse(false)) {
return Single.just(
ResponseProcessor.ResponseProcessingResult.create(
llmResponse, ImmutableList.of(), Optional.empty()));
ResponseProcessor.ResponseProcessingResult.create(llmResponse, ImmutableList.of()));
}
var llmResponseBuilder = llmResponse.toBuilder();
return runPostProcessor(invocationContext, llmResponseBuilder)
.toList()
.map(
events ->
ResponseProcessor.ResponseProcessingResult.create(
llmResponseBuilder.build(), events, Optional.empty()));
llmResponseBuilder.build(), events));
}
}

Expand Down
12 changes: 9 additions & 3 deletions core/src/main/java/com/google/adk/flows/llmflows/ResponseProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.google.adk.agents.InvocationContext;
import com.google.adk.events.Event;
import com.google.adk.models.LlmResponse;
import com.google.api.client.util.Preconditions;
import com.google.auto.value.AutoValue;
import io.reactivex.rxjava3.core.Single;
import java.util.Optional;
Expand Down Expand Up @@ -50,11 +51,16 @@ public abstract static class ResponseProcessingResult {
*/
public abstract Optional<String> transferToAgent();

/** Creates a new {@link ResponseProcessingResult}. */
public static ResponseProcessingResult create(
LlmResponse updatedResponse, Iterable<Event> events, Optional<String> transferToAgent) {
LlmResponse updatedResponse, Iterable<Event> events, String transferToAgent) {
return new AutoValue_ResponseProcessor_ResponseProcessingResult(
updatedResponse, events, transferToAgent);
updatedResponse, events, Optional.of(Preconditions.checkNotNull(transferToAgent)));
}

public static ResponseProcessingResult create(
LlmResponse updatedResponse, Iterable<Event> events) {
return new AutoValue_ResponseProcessor_ResponseProcessingResult(
updatedResponse, events, Optional.empty());
}
}

Expand Down
9 changes: 2 additions & 7 deletions core/src/test/java/com/google/adk/flows/llmflows/BaseLlmFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,19 +524,14 @@ private static RequestProcessor createRequestProcessor(

private static ResponseProcessor createResponseProcessor() {
return (context, response) ->
Single.just(
ResponseProcessingResult.create(
response, ImmutableList.of(), /* transferToAgent= */ Optional.empty()));
Single.just(ResponseProcessingResult.create(response, ImmutableList.of()));
}

private static ResponseProcessor createResponseProcessor(
Function<LlmResponse, LlmResponse> responseUpdater) {
return (context, response) ->
Single.just(
ResponseProcessingResult.create(
responseUpdater.apply(response),
ImmutableList.of(),
/* transferToAgent= */ Optional.empty()));
ResponseProcessingResult.create(responseUpdater.apply(response), ImmutableList.of()));
}

private static class TestTool extends BaseTool {
Expand Down