Skip to content

feat: remove executionId method that takes Optional param from CodeExecutionUtils #989

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
+8 −5
Open

feat: remove executionId method that takes Optional param from CodeExecutionUtils #989

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: 3 additions & 3 deletions core/src/main/java/com/google/adk/codeexecutors/CodeExecutionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jspecify.annotations.Nullable;

/** Utility functions for code execution. */
public final class CodeExecutionUtils {
Expand Down Expand Up @@ -237,8 +238,7 @@ public abstract static class CodeExecutionInput extends JsonBaseModel {

public static Builder builder() {
return new AutoValue_CodeExecutionUtils_CodeExecutionInput.Builder()
.inputFiles(ImmutableList.of())
.executionId(Optional.empty());
.inputFiles(ImmutableList.of());
}

/** Builder for {@link CodeExecutionInput}. */
Expand All @@ -248,7 +248,7 @@ public abstract static class Builder {

public abstract Builder inputFiles(List<File> inputFiles);

public abstract Builder executionId(Optional<String> executionId);
public abstract Builder executionId(@Nullable String executionId);

public abstract CodeExecutionInput build();
}
Expand Down
7 changes: 5 additions & 2 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 @@ -240,7 +240,8 @@ private static Flowable<Event> runPreProcessor(
.code(codeStr)
.inputFiles(ImmutableList.of(file))
.executionId(
getOrSetExecutionId(invocationContext, codeExecutorContext))
getOrSetExecutionId(invocationContext, codeExecutorContext)
.orElse(null))
.build());

codeExecutorContext.updateCodeExecutionResult(
Expand Down Expand Up @@ -320,7 +321,9 @@ private static Flowable<Event> runPostProcessor(
CodeExecutionInput.builder()
.code(codeStr)
.inputFiles(codeExecutorContext.getInputFiles())
.executionId(getOrSetExecutionId(invocationContext, codeExecutorContext))
.executionId(
getOrSetExecutionId(invocationContext, codeExecutorContext)
.orElse(null))
.build());
codeExecutorContext.updateCodeExecutionResult(
invocationContext.invocationId(),
Expand Down