Skip to content

fix: Making stepsCompleted thread-safe #695

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
+6 −3
Open

fix: Making stepsCompleted thread-safe #695

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
9 changes: 6 additions & 3 deletions core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public abstract class BaseLlmFlow implements BaseFlow {

// Warning: This is local, in-process state that won't be preserved if the runtime is restarted.
// "Max steps" is experimental and may evolve in the future (e.g., to support persistence).
protected int stepsCompleted = 0;
protected final int maxSteps;

public BaseLlmFlow(
Expand Down Expand Up @@ -393,8 +392,12 @@ private Flowable<Event> runOneStep(InvocationContext context) {
*/
@Override
public Flowable<Event> run(InvocationContext invocationContext) {
return run(invocationContext, 0);
}

private Flowable<Event> run(InvocationContext invocationContext, int stepsCompleted) {
Flowable<Event> currentStepEvents = runOneStep(invocationContext).cache();
if (++stepsCompleted >= maxSteps) {
if (stepsCompleted + 1 >= maxSteps) {
logger.debug("Ending flow execution because max steps reached.");
return currentStepEvents;
}
Expand All @@ -413,7 +416,7 @@ public Flowable<Event> run(InvocationContext invocationContext) {
return Flowable.empty();
} else {
logger.debug("Continuing to next step of the flow.");
return Flowable.defer(() -> run(invocationContext));
return Flowable.defer(() -> run(invocationContext, stepsCompleted + 1));
}
}));
}
Expand Down