Skip to content

fix: Enable state context in AgentExecutor #1273

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
hemasekhar-p wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −16
Open

fix: Enable state context in AgentExecutor #1273

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
10 changes: 9 additions & 1 deletion a2a/src/main/java/com/google/adk/a2a/executor/AgentExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ public void execute(RequestContext ctx, EventQueue eventQueue) {
getUserId(ctx),
session.id(),
content,
agentExecutorConfig.runConfig());
agentExecutorConfig.runConfig(),
getStateDelta(ctx));
});
})
.concatMap(
Expand Down Expand Up @@ -273,6 +274,13 @@ private String getUserId(RequestContext ctx) {
return USER_ID_PREFIX + ctx.getContextId();
}

private Map<String, Object> getStateDelta(RequestContext ctx) {
if (ctx != null && ctx.getParams() != null) {
return ctx.getParams().metadata();
}
return null;
}

private Maybe<Session> prepareSession(
RequestContext ctx, String appName, BaseSessionService service) {
return service
Expand Down
23 changes: 8 additions & 15 deletions a2a/src/test/java/com/google/adk/a2a/executor/AgentExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.*;

import com.google.adk.agents.BaseAgent;
import com.google.adk.agents.InvocationContext;
Expand All @@ -23,19 +19,11 @@
import com.google.genai.types.Part;
import io.a2a.server.agentexecution.RequestContext;
import io.a2a.server.events.EventQueue;
import io.a2a.spec.Message;
import io.a2a.spec.TaskArtifactUpdateEvent;
import io.a2a.spec.TaskState;
import io.a2a.spec.TaskStatus;
import io.a2a.spec.TaskStatusUpdateEvent;
import io.a2a.spec.TextPart;
import io.a2a.spec.*;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.core.Maybe;
import io.reactivex.rxjava3.core.Single;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.*;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -350,10 +338,15 @@ private RequestContext createRequestContext() {
.parts(ImmutableList.of(new TextPart("trigger")))
.build();

MessageSendParams params = mock(MessageSendParams.class);
when(params.message()).thenReturn(message);
when(params.metadata()).thenReturn(ImmutableMap.of("key", "value"));

RequestContext ctx = mock(RequestContext.class);
when(ctx.getMessage()).thenReturn(message);
when(ctx.getTaskId()).thenReturn("task-" + UUID.randomUUID());
when(ctx.getContextId()).thenReturn("ctx-" + UUID.randomUUID());
when(ctx.getParams()).thenReturn(params);
return ctx;
}

Expand Down