Skip to content

refactor: remove use of Optional params in Contents class #955

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
Open

refactor: remove use of Optional params in Contents class #955

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
27 changes: 14 additions & 13 deletions core/src/main/java/com/google/adk/flows/llmflows/Contents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.google.adk.events.Event;
import com.google.adk.events.EventCompaction;
import com.google.adk.models.LlmRequest;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
Expand All @@ -41,6 +42,7 @@
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import javax.annotation.Nullable;

/** {@link RequestProcessor} that populates content in request for LLM flows. */
public final class Contents implements RequestProcessor {
Expand Down Expand Up @@ -68,7 +70,7 @@ public Single<RequestProcessor.RequestProcessingResult> processRequest(
request.toBuilder()
.contents(
getCurrentTurnContents(
context.branch(),
context.branch().orElse(null),
context.session().events(),
context.agent().name(),
modelName))
Expand All @@ -78,7 +80,10 @@ public Single<RequestProcessor.RequestProcessingResult> processRequest(

ImmutableList<Content> contents =
getContents(
context.branch(), context.session().events(), context.agent().name(), modelName);
context.branch().orElse(null),
context.session().events(),
context.agent().name(),
modelName);

return Single.just(
RequestProcessor.RequestProcessingResult.create(
Expand All @@ -87,7 +92,7 @@ public Single<RequestProcessor.RequestProcessingResult> processRequest(

/** Gets contents for the current turn only (no conversation history). */
private ImmutableList<Content> getCurrentTurnContents(
Optional<String> currentBranch, List<Event> events, String agentName, String modelName) {
@Nullable String currentBranch, List<Event> events, String agentName, String modelName) {
// Find the latest event that starts the current turn and process from there.
for (int i = events.size() - 1; i >= 0; i--) {
Event event = events.get(i);
Expand All @@ -99,7 +104,7 @@ private ImmutableList<Content> getCurrentTurnContents(
}

private ImmutableList<Content> getContents(
Optional<String> currentBranch, List<Event> events, String agentName, String modelName) {
@Nullable String currentBranch, List<Event> events, String agentName, String modelName) {
List<Event> filteredEvents = new ArrayList<>();
boolean hasCompactEvent = false;

Expand Down Expand Up @@ -414,16 +419,12 @@ private static String convertMapToJson(Map<String, Object> struct) {
}
}

private static boolean isEventBelongsToBranch(Optional<String> invocationBranchOpt, Event event) {
Optional<String> eventBranchOpt = event.branch();
private static boolean isEventBelongsToBranch(@Nullable String invocationBranch, Event event) {
@Nullable String eventBranch = event.branch().orElse(null);

if (invocationBranchOpt.isEmpty() || invocationBranchOpt.get().isEmpty()) {
return true;
}
if (eventBranchOpt.isEmpty() || eventBranchOpt.get().isEmpty()) {
return true;
}
return invocationBranchOpt.get().startsWith(eventBranchOpt.get());
return Strings.isNullOrEmpty(invocationBranch)
|| Strings.isNullOrEmpty(eventBranch)
|| invocationBranch.startsWith(eventBranch);
}

/**
Expand Down