Skip to content

feat(agui): propagate userId from forwardedProps to RuntimeContext #2044

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
ningmeng0503 wants to merge 1 commit into
base: main
Choose a base branch
from
+110 −0
Open

feat(agui): propagate userId from forwardedProps to RuntimeContext #2044

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
3 changes: 3 additions & 0 deletions ...scope-extensions-agui/src/main/java/io/agentscope/core/agui/adapter/AguiAgentAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public class AguiAgentAdapter {
public static final String RUNTIME_CONTEXT_CONTEXT_KEY = "agui.context";
public static final String RUNTIME_CONTEXT_STATE_KEY = "agui.state";
public static final String RUNTIME_CONTEXT_FORWARDED_PROPS_KEY = "agui.forwardedProps";
public static final String FORWARDED_PROP_USER_ID_KEY = "userId";

private final Agent agent;
private final AguiAdapterConfig config;
Expand Down Expand Up @@ -160,8 +161,10 @@ public Flux<AguiEvent> run(RunAgentInput input) {
}

private RuntimeContext buildRuntimeContext(RunAgentInput input) {
Object userId = input.getForwardedProp(FORWARDED_PROP_USER_ID_KEY);
return RuntimeContext.builder()
.sessionId(input.getThreadId())
.userId(userId == null ? null : userId.toString())
.put(RunAgentInput.class, input)
.put(RUNTIME_CONTEXT_THREAD_ID_KEY, input.getThreadId())
.put(RUNTIME_CONTEXT_RUN_ID_KEY, input.getRunId())
Expand Down
107 changes: 107 additions & 0 deletions ...e-extensions-agui/src/test/java/io/agentscope/core/agui/adapter/AguiAgentAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,113 @@ void setUp() {
adapter = new AguiAgentAdapter(mockAgent, AguiAdapterConfig.defaultConfig());
}

@Test
void testRunSetsUserIdFromForwardedPropsIntoRuntimeContext() {
ArgumentCaptor<RuntimeContext> contextCaptor =
ArgumentCaptor.forClass(RuntimeContext.class);
when(mockAgent.stream(anyList(), any(StreamOptions.class), contextCaptor.capture()))
.thenReturn(Flux.empty());

RunAgentInput input =
RunAgentInput.builder()
.threadId("thread-user")
.runId("run-user")
.messages(List.of(AguiMessage.userMessage("msg-1", "Hello")))
.forwardedProps(
Map.of(AguiAgentAdapter.FORWARDED_PROP_USER_ID_KEY, "user-123"))
.build();

adapter.run(input).collectList().block();

RuntimeContext context = contextCaptor.getValue();
assertEquals("user-123", context.getUserId());
assertSame(input.getForwardedProps(), context.get("agui.forwardedProps"));
}

@Test
void testRunConvertsNonStringUserIdFromForwardedProps() {
ArgumentCaptor<RuntimeContext> contextCaptor =
ArgumentCaptor.forClass(RuntimeContext.class);
when(mockAgent.stream(anyList(), any(StreamOptions.class), contextCaptor.capture()))
.thenReturn(Flux.empty());

RunAgentInput input =
RunAgentInput.builder()
.threadId("thread-user-long")
.runId("run-user-long")
.messages(List.of(AguiMessage.userMessage("msg-1", "Hello")))
.forwardedProps(Map.of(AguiAgentAdapter.FORWARDED_PROP_USER_ID_KEY, 12345L))
.build();

adapter.run(input).collectList().block();

RuntimeContext context = contextCaptor.getValue();
assertEquals("12345", context.getUserId());
}

@Test
void testRunKeepsUserIdNullWhenForwardedPropsMissingUserId() {
ArgumentCaptor<RuntimeContext> contextCaptor =
ArgumentCaptor.forClass(RuntimeContext.class);
when(mockAgent.stream(anyList(), any(StreamOptions.class), contextCaptor.capture()))
.thenReturn(Flux.empty());

RunAgentInput input =
RunAgentInput.builder()
.threadId("thread-no-user")
.runId("run-no-user")
.messages(List.of(AguiMessage.userMessage("msg-1", "Hello")))
.forwardedProps(Map.of("tenant", "demo"))
.build();

adapter.run(input).collectList().block();

RuntimeContext context = contextCaptor.getValue();
assertNull(context.getUserId());
}

@Test
void testRunKeepsBlankUserIdFromForwardedProps() {
ArgumentCaptor<RuntimeContext> contextCaptor =
ArgumentCaptor.forClass(RuntimeContext.class);
when(mockAgent.stream(anyList(), any(StreamOptions.class), contextCaptor.capture()))
.thenReturn(Flux.empty());

RunAgentInput input =
RunAgentInput.builder()
.threadId("thread-blank-user")
.runId("run-blank-user")
.messages(List.of(AguiMessage.userMessage("msg-1", "Hello")))
.forwardedProps(Map.of(AguiAgentAdapter.FORWARDED_PROP_USER_ID_KEY, " "))
.build();

adapter.run(input).collectList().block();

RuntimeContext context = contextCaptor.getValue();
assertEquals(" ", context.getUserId());
}

@Test
void testRunKeepsEmptyUserIdFromForwardedProps() {
ArgumentCaptor<RuntimeContext> contextCaptor =
ArgumentCaptor.forClass(RuntimeContext.class);
when(mockAgent.stream(anyList(), any(StreamOptions.class), contextCaptor.capture()))
.thenReturn(Flux.empty());

RunAgentInput input =
RunAgentInput.builder()
.threadId("thread-empty-user")
.runId("run-empty-user")
.messages(List.of(AguiMessage.userMessage("msg-1", "Hello")))
.forwardedProps(Map.of(AguiAgentAdapter.FORWARDED_PROP_USER_ID_KEY, ""))
.build();

adapter.run(input).collectList().block();

RuntimeContext context = contextCaptor.getValue();
assertEquals("", context.getUserId());
}

@Test
void testRunInjectsRunInputIntoRuntimeContext() {
ArgumentCaptor<RuntimeContext> contextCaptor =
Expand Down
Loading