Skip to content

Commit e8e18ac

Browse files
YuqiGuo105YuqiGuo105
authored
Merge branch 'main' into fix/memory-leak-delete-session
2 parents 9ebdec6 + e3ea378 commit e8e18ac

35 files changed

Lines changed: 692 additions & 50 deletions

File tree

‎.release-please-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "0.6.0"
2+
".": "0.7.0"
33
}

‎CHANGELOG.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
# Changelog
22

3+
## [0.7.0](https://github.com/google/adk-java/compare/v0.6.0...v0.7.0) (2026-02-27)
4+
5+
6+
### Features
7+
8+
* Add ComputerUse tool ([d733a48](https://github.com/google/adk-java/commit/d733a480a7a787cb7c32fd3470ab978ca3eb574c))
9+
* add the AgentExecutor config ([e0f7137](https://github.com/google/adk-java/commit/e0f7137253c9bd929fe3ea899e32f4b61f994986))
10+
* drop gemini-1 support in GoogleSearchTool ([15255b4](https://github.com/google/adk-java/commit/15255b48285819c7d3aedb4470e91f37d1bcfaf4))
11+
* Extend url_context support to Gemini 3 in Java ADK ([2c9d4dd](https://github.com/google/adk-java/commit/2c9d4dd5eafe8efe3a2fb099b58e2d0f1d9cad98))
12+
* Extend url_context support to Gemini 3 in Java ADK ([5f5869f](https://github.com/google/adk-java/commit/5f5869f67200831dcbb7ac10ad0d7f44410bc096))
13+
* Handle final and error TaskStatusUpdateEvents ([746e857](https://github.com/google/adk-java/commit/746e857d97c6f356ffe5c20be0ccae85d5a8f989))
14+
* remove model restrictions in BuiltInCodeExecutionTool ([1a593a9](https://github.com/google/adk-java/commit/1a593a996607904eed24b64bc63eecd7708710af))
15+
* Update AgentExecutor so it builds new runner on execute and there is no need to pass the runner instance ([7218295](https://github.com/google/adk-java/commit/72182958586e59ccb3d7490cd207ec2837c5b577))
16+
17+
18+
### Bug Fixes
19+
20+
* change Session events list to a threadsafe implementation by default ([0b5ac92](https://github.com/google/adk-java/commit/0b5ac9214926200c3d65d64d8c10489847c29291))
21+
* deep-merge stateDelta maps when merging EventActions ([ff07474](https://github.com/google/adk-java/commit/ff07474035baec910f0c3fa83b7b1646d8409ffd))
22+
* drop explicit gemini-1 model version check in GoogleMapsTool ([7953503](https://github.com/google/adk-java/commit/7953503e61c547e40a1e1abbece73a99910766c1))
23+
* LlmAgent model name resolution and improve Gemini-3 model detection logic ([313ce85](https://github.com/google/adk-java/commit/313ce8590982346bb8ac631b4bf88da76fb849a4))
24+
* make a mutable copy of function args for the beforeToolCallback invocations ([64d3a77](https://github.com/google/adk-java/commit/64d3a775d68610d20c084678ffdc559cd467e627))
25+
26+
27+
### Documentation
28+
29+
* Update a parameter name in a comment ([5262d4a](https://github.com/google/adk-java/commit/5262d4ae3eca533e1a695e6e2e71c5845055ed5d))
30+
331
## [0.6.0](https://github.com/google/adk-java/compare/v0.5.0...v0.6.0) (2026-02-19)
432

533

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ If you're using Maven, add the following to your dependencies:
5050
<dependency>
5151
<groupId>com.google.adk</groupId>
5252
<artifactId>google-adk</artifactId>
53-
<version>0.6.0</version>
53+
<version>0.7.0</version>
5454
</dependency>
5555
<!-- Dev UI -->
5656
<dependency>
5757
<groupId>com.google.adk</groupId>
5858
<artifactId>google-adk-dev</artifactId>
59-
<version>0.6.0</version>
59+
<version>0.7.0</version>
6060
</dependency>
6161
```
6262

‎a2a/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.google.adk</groupId>
77
<artifactId>google-adk-parent</artifactId>
8-
<version>0.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
8+
<version>0.7.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
99
</parent>
1010

1111
<artifactId>google-adk-a2a</artifactId>
@@ -104,6 +104,11 @@
104104
<version>${truth.version}</version>
105105
<scope>test</scope>
106106
</dependency>
107+
<dependency>
108+
<groupId>org.mockito</groupId>
109+
<artifactId>mockito-core</artifactId>
110+
<scope>test</scope>
111+
</dependency>
107112
</dependencies>
108113
<build>
109114
<plugins>

a2a/src/main/java/com/google/adk/a2a/AgentExecutor.java renamed to a2a/src/main/java/com/google/adk/a2a/executor/AgentExecutor.java

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package com.google.adk.a2a;
1+
package com.google.adk.a2a.executor;
2+
3+
import static java.util.Objects.requireNonNull;
24

35
import com.google.adk.a2a.converters.EventConverter;
46
import com.google.adk.a2a.converters.PartConverter;
57
import com.google.adk.agents.BaseAgent;
6-
import com.google.adk.agents.RunConfig;
78
import com.google.adk.apps.App;
89
import com.google.adk.artifacts.BaseArtifactService;
910
import com.google.adk.events.Event;
@@ -44,12 +45,10 @@ public class AgentExecutor implements io.a2a.server.agentexecution.AgentExecutor
4445

4546
private static final Logger logger = LoggerFactory.getLogger(AgentExecutor.class);
4647
private static final String USER_ID_PREFIX = "A2A_USER_";
47-
private static final RunConfig DEFAULT_RUN_CONFIG =
48-
RunConfig.builder().setStreamingMode(RunConfig.StreamingMode.NONE).setMaxLlmCalls(20).build();
4948

5049
private final Map<String, Disposable> activeTasks = new ConcurrentHashMap<>();
5150
private final Runner.Builder runnerBuilder;
52-
private final RunConfig runConfig;
51+
private final AgentExecutorConfig agentExecutorConfig;
5352

5453
private AgentExecutor(
5554
App app,
@@ -59,7 +58,10 @@ private AgentExecutor(
5958
BaseSessionService sessionService,
6059
BaseMemoryService memoryService,
6160
List<? extends Plugin> plugins,
62-
RunConfig runConfig) {
61+
AgentExecutorConfig agentExecutorConfig) {
62+
requireNonNull(agentExecutorConfig);
63+
this.agentExecutorConfig = agentExecutorConfig;
64+
6365
this.runnerBuilder =
6466
Runner.builder()
6567
.agent(agent)
@@ -73,7 +75,6 @@ private AgentExecutor(
7375
}
7476
// Check that the runner is configured correctly and can be built.
7577
var unused = runnerBuilder.build();
76-
this.runConfig = runConfig == null ? DEFAULT_RUN_CONFIG : runConfig;
7778
}
7879

7980
/** Builder for {@link AgentExecutor}. */
@@ -85,7 +86,13 @@ public static class Builder {
8586
private BaseSessionService sessionService;
8687
private BaseMemoryService memoryService;
8788
private List<? extends Plugin> plugins = ImmutableList.of();
88-
private RunConfig runConfig;
89+
private AgentExecutorConfig agentExecutorConfig;
90+
91+
@CanIgnoreReturnValue
92+
public Builder agentExecutorConfig(AgentExecutorConfig agentExecutorConfig) {
93+
this.agentExecutorConfig = agentExecutorConfig;
94+
return this;
95+
}
8996

9097
@CanIgnoreReturnValue
9198
public Builder app(App app) {
@@ -129,16 +136,17 @@ public Builder plugins(List<? extends Plugin> plugins) {
129136
return this;
130137
}
131138

132-
@CanIgnoreReturnValue
133-
public Builder runConfig(RunConfig runConfig) {
134-
this.runConfig = runConfig;
135-
return this;
136-
}
137-
138139
@CanIgnoreReturnValue
139140
public AgentExecutor build() {
140141
return new AgentExecutor(
141-
app, agent, appName, artifactService, sessionService, memoryService, plugins, runConfig);
142+
app,
143+
agent,
144+
appName,
145+
artifactService,
146+
sessionService,
147+
memoryService,
148+
plugins,
149+
agentExecutorConfig);
142150
}
143151
}
144152

@@ -178,7 +186,8 @@ public void execute(RequestContext ctx, EventQueue eventQueue) {
178186
.flatMapPublisher(
179187
session -> {
180188
updater.startWork();
181-
return runner.runAsync(getUserId(ctx), session.id(), content, runConfig);
189+
return runner.runAsync(
190+
getUserId(ctx), session.id(), content, agentExecutorConfig.runConfig());
182191
})
183192
.subscribe(
184193
event -> {

‎a2a/src/main/java/com/google/adk/a2a/executor/AgentExecutorConfig.java‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.google.adk.a2a.executor;
2+
3+
import com.google.adk.a2a.executor.Callbacks.AfterEventCallback;
4+
import com.google.adk.a2a.executor.Callbacks.AfterExecuteCallback;
5+
import com.google.adk.a2a.executor.Callbacks.BeforeExecuteCallback;
6+
import com.google.adk.agents.RunConfig;
7+
import com.google.auto.value.AutoValue;
8+
import com.google.errorprone.annotations.CanIgnoreReturnValue;
9+
import org.jspecify.annotations.Nullable;
10+
11+
/** Configuration for the {@link AgentExecutor}. */
12+
@AutoValue
13+
public abstract class AgentExecutorConfig {
14+
15+
private static final RunConfig DEFAULT_RUN_CONFIG =
16+
RunConfig.builder().setStreamingMode(RunConfig.StreamingMode.NONE).setMaxLlmCalls(20).build();
17+
18+
public abstract RunConfig runConfig();
19+
20+
public abstract @Nullable BeforeExecuteCallback beforeExecuteCallback();
21+
22+
public abstract @Nullable AfterExecuteCallback afterExecuteCallback();
23+
24+
public abstract @Nullable AfterEventCallback afterEventCallback();
25+
26+
public abstract Builder toBuilder();
27+
28+
public static Builder builder() {
29+
return new AutoValue_AgentExecutorConfig.Builder().runConfig(DEFAULT_RUN_CONFIG);
30+
}
31+
32+
/** Builder for {@link AgentExecutorConfig}. */
33+
@AutoValue.Builder
34+
public abstract static class Builder {
35+
@CanIgnoreReturnValue
36+
public abstract Builder runConfig(RunConfig runConfig);
37+
38+
@CanIgnoreReturnValue
39+
public abstract Builder beforeExecuteCallback(BeforeExecuteCallback beforeExecuteCallback);
40+
41+
@CanIgnoreReturnValue
42+
public abstract Builder afterExecuteCallback(AfterExecuteCallback afterExecuteCallback);
43+
44+
@CanIgnoreReturnValue
45+
public abstract Builder afterEventCallback(AfterEventCallback afterEventCallback);
46+
47+
abstract AgentExecutorConfig autoBuild();
48+
49+
public AgentExecutorConfig build() {
50+
return autoBuild();
51+
}
52+
}
53+
}

‎a2a/src/main/java/com/google/adk/a2a/executor/Callbacks.java‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
package com.google.adk.a2a.executor;
2+
3+
import com.google.adk.events.Event;
4+
import io.a2a.server.agentexecution.RequestContext;
5+
import io.a2a.spec.TaskArtifactUpdateEvent;
6+
import io.a2a.spec.TaskStatusUpdateEvent;
7+
import io.reactivex.rxjava3.core.Maybe;
8+
import io.reactivex.rxjava3.core.Single;
9+
10+
/** Functional interfaces for agent executor lifecycle callbacks. */
11+
public final class Callbacks {
12+
13+
private Callbacks() {}
14+
15+
interface BeforeExecuteCallbackBase {}
16+
17+
/** Async callback interface for actions to be performed before an execution is started. */
18+
@FunctionalInterface
19+
public interface BeforeExecuteCallback extends BeforeExecuteCallbackBase {
20+
/**
21+
* Callback which will be called before an execution is started. It can be used to instrument a
22+
* context or prevent the execution by returning an error.
23+
*
24+
* @param ctx the request context
25+
* @return a {@link Single} that completes with a boolean indicating whether the execution
26+
* should be prevented
27+
*/
28+
Single<Boolean> call(RequestContext ctx);
29+
}
30+
31+
interface AfterExecuteCallbackBase {}
32+
33+
/**
34+
* Async callback interface for actions to be performed after an execution is completed or failed.
35+
*/
36+
@FunctionalInterface
37+
public interface AfterExecuteCallback extends AfterExecuteCallbackBase {
38+
/**
39+
* Callback which will be called after an execution resolved into a completed or failed task.
40+
* This gives an opportunity to enrich the event with additional metadata or log it.
41+
*
42+
* @param ctx the request context
43+
* @param finalUpdateEvent the final update event
44+
* @return a {@link Maybe} that completes when the callback is done
45+
*/
46+
Maybe<TaskStatusUpdateEvent> call(RequestContext ctx, TaskStatusUpdateEvent finalUpdateEvent);
47+
}
48+
49+
interface AfterEventCallbackBase {}
50+
51+
/** Async callback interface for actions to be performed after an event is processed. */
52+
@FunctionalInterface
53+
public interface AfterEventCallback extends AfterEventCallbackBase {
54+
/**
55+
* Callback which will be called after an ADK event is successfully converted to an A2A event.
56+
* This gives an opportunity to enrich the event with additional metadata or abort the execution
57+
* by returning an error. The callback is not invoked for errors originating from ADK or event
58+
* processing.
59+
*
60+
* @param ctx the request context
61+
* @param processedEvent the processed task artifact update event
62+
* @param event the ADK event
63+
* @return a {@link Maybe} that completes when the callback is done
64+
*/
65+
Maybe<TaskArtifactUpdateEvent> call(
66+
RequestContext ctx, TaskArtifactUpdateEvent processedEvent, Event event);
67+
}
68+
}

a2a/src/test/java/com/google/adk/a2a/AgentExecutorTest.java renamed to a2a/src/test/java/com/google/adk/a2a/executor/AgentExecutorTest.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.google.adk.a2a;
1+
package com.google.adk.a2a.executor;
22

33
import static org.junit.Assert.assertThrows;
44

@@ -32,6 +32,7 @@ public void createAgentExecutor_noAgent_succeeds() {
3232
.app(App.builder().name("test_app").rootAgent(testAgent).build())
3333
.sessionService(new InMemorySessionService())
3434
.artifactService(new InMemoryArtifactService())
35+
.agentExecutorConfig(AgentExecutorConfig.builder().build())
3536
.build();
3637
}
3738

@@ -44,6 +45,7 @@ public void createAgentExecutor_withAgentAndApp_throwsException() {
4445
.agent(testAgent)
4546
.app(App.builder().name("test_app").rootAgent(testAgent).build())
4647
.sessionService(new InMemorySessionService())
48+
.agentExecutorConfig(AgentExecutorConfig.builder().build())
4749
.artifactService(new InMemoryArtifactService())
4850
.build();
4951
});
@@ -55,6 +57,20 @@ public void createAgentExecutor_withEmptyAgentAndApp_throwsException() {
5557
IllegalStateException.class,
5658
() -> {
5759
new AgentExecutor.Builder()
60+
.sessionService(new InMemorySessionService())
61+
.artifactService(new InMemoryArtifactService())
62+
.agentExecutorConfig(AgentExecutorConfig.builder().build())
63+
.build();
64+
});
65+
}
66+
67+
@Test
68+
public void createAgentExecutor_noAgentExecutorConfig_throwsException() {
69+
assertThrows(
70+
NullPointerException.class,
71+
() -> {
72+
new AgentExecutor.Builder()
73+
.app(App.builder().name("test_app").rootAgent(testAgent).build())
5874
.sessionService(new InMemorySessionService())
5975
.artifactService(new InMemoryArtifactService())
6076
.build();

‎contrib/firestore-session-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.google.adk</groupId>
2222
<artifactId>google-adk-parent</artifactId>
23-
<version>0.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
23+
<version>0.7.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎contrib/langchain4j/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.google.adk</groupId>
2222
<artifactId>google-adk-parent</artifactId>
23-
<version>0.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
23+
<version>0.7.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

0 commit comments

Comments
 (0)