-
Notifications
You must be signed in to change notification settings - Fork 217
feat: Support Sub-agent Escalation event in Parallel Agent #612
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.
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
jinnigu
wants to merge
1
commit into
google:main
Choose a base branch
from
jinnigu:feature/subagent-escalation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+153
−4
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
core/src/test/java/com/google/adk/agents/ParallelAgentEscalationTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| /* | ||
| * Copyright 2025 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.adk.agents; | ||
|
|
||
| import static com.google.adk.testing.TestUtils.createInvocationContext; | ||
| import static com.google.common.truth.Truth.assertThat; | ||
| import static java.util.concurrent.TimeUnit.MILLISECONDS; | ||
|
|
||
| import com.google.adk.events.Event; | ||
| import com.google.adk.events.EventActions; | ||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.genai.types.Content; | ||
| import com.google.genai.types.Part; | ||
| import io.reactivex.rxjava3.core.Flowable; | ||
| import io.reactivex.rxjava3.core.Scheduler; | ||
| import io.reactivex.rxjava3.schedulers.TestScheduler; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.JUnit4; | ||
|
|
||
| @RunWith(JUnit4.class) | ||
| public final class ParallelAgentEscalationTest { | ||
|
|
||
| static class EscalatingAgent extends BaseAgent { | ||
| private final long delayMillis; | ||
| private final Scheduler scheduler; | ||
|
|
||
| private EscalatingAgent(String name, long delayMillis, Scheduler scheduler) { | ||
| super(name, "Escalating Agent", ImmutableList.of(), null, null); | ||
| this.delayMillis = delayMillis; | ||
| this.scheduler = scheduler; | ||
| } | ||
|
|
||
| @Override | ||
| protected Flowable<Event> runAsyncImpl(InvocationContext invocationContext) { | ||
| Flowable<Event> event = | ||
| Flowable.fromCallable( | ||
| () -> | ||
| Event.builder() | ||
| .author(name()) | ||
| .branch(invocationContext.branch()) | ||
| .invocationId(invocationContext.invocationId()) | ||
| .content(Content.fromParts(Part.fromText("Escalating!"))) | ||
| .actions(EventActions.builder().escalate(true).build()) | ||
| .build()); | ||
|
|
||
| if (delayMillis > 0) { | ||
| return event.delay(delayMillis, MILLISECONDS, scheduler); | ||
| } | ||
| return event; | ||
| } | ||
|
|
||
| @Override | ||
| protected Flowable<Event> runLiveImpl(InvocationContext invocationContext) { | ||
| throw new UnsupportedOperationException("Not implemented"); | ||
| } | ||
| } | ||
|
|
||
| static class SlowAgent extends BaseAgent { | ||
| private final long delayMillis; | ||
| private final Scheduler scheduler; | ||
|
|
||
| private SlowAgent(String name, long delayMillis, Scheduler scheduler) { | ||
| super(name, "Slow Agent", ImmutableList.of(), null, null); | ||
| this.delayMillis = delayMillis; | ||
| this.scheduler = scheduler; | ||
| } | ||
|
|
||
| @Override | ||
| protected Flowable<Event> runAsyncImpl(InvocationContext invocationContext) { | ||
| Flowable<Event> event = | ||
| Flowable.fromCallable( | ||
| () -> | ||
| Event.builder() | ||
| .author(name()) | ||
| .branch(invocationContext.branch()) | ||
| .invocationId(invocationContext.invocationId()) | ||
| .content(Content.fromParts(Part.fromText("Finished"))) | ||
| .build()); | ||
|
|
||
| if (delayMillis > 0) { | ||
| return event.delay(delayMillis, MILLISECONDS, scheduler); | ||
| } | ||
| return event; | ||
| } | ||
|
|
||
| @Override | ||
| protected Flowable<Event> runLiveImpl(InvocationContext invocationContext) { | ||
| throw new UnsupportedOperationException("Not implemented"); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void runAsync_escalationEvent_shortCircuitsOtherAgents() { | ||
| TestScheduler testScheduler = new TestScheduler(); | ||
|
|
||
| EscalatingAgent agent1 = new EscalatingAgent("agent1", 100, testScheduler); | ||
| SlowAgent agent2 = new SlowAgent("agent2", 500, testScheduler); | ||
|
|
||
| ParallelAgent parallelAgent = | ||
| ParallelAgent.builder() | ||
| .name("parallel_agent") | ||
| .subAgents(agent1, agent2) | ||
| .scheduler(testScheduler) | ||
| .build(); | ||
|
|
||
| InvocationContext invocationContext = createInvocationContext(parallelAgent); | ||
|
|
||
| var subscriber = parallelAgent.runAsync(invocationContext).test(); | ||
|
|
||
| testScheduler.advanceTimeBy(200, MILLISECONDS); | ||
|
|
||
| subscriber.assertValueCount(1); | ||
| Event event = subscriber.values().get(0); | ||
| assertThat(event.author()).isEqualTo("agent1"); | ||
| assertThat(event.actions().escalate()).hasValue(true); | ||
|
|
||
| subscriber.assertComplete(); | ||
| testScheduler.advanceTimeBy(1000, MILLISECONDS); | ||
| subscriber.assertValueCount(1); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.