Skip to content

fix: 修复 v2 流式事件中 THINKING_BLOCK_END / MODEL_CALL_END / AGENT_END 的收尾顺序 #1639

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

Closed
guslegend0510 wants to merge 1 commit into from
+107 −25
Closed

fix: 修复 v2 流式事件中 THINKING_BLOCK_END / MODEL_CALL_END / AGENT_END 的收尾顺序 #1639

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
103 changes: 78 additions & 25 deletions agentscope-core/src/main/java/io/agentscope/core/ReActAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1993,6 +1993,7 @@ private Flux<AgentEvent> modelCallStream(
String replyId = UUID.randomUUID().toString().replace("-", "");
AtomicBoolean textStarted = new AtomicBoolean(false);
AtomicBoolean thinkingStarted = new AtomicBoolean(false);
AtomicBoolean thinkingEnded = new AtomicBoolean(false);
Set<String> startedToolCalls = ConcurrentHashMap.newKeySet();

Flux<AgentEvent> modelEvents =
Expand All @@ -2018,6 +2019,7 @@ private Flux<AgentEvent> modelCallStream(
context,
textStarted,
thinkingStarted,
thinkingEnded,
withToolEvents
? startedToolCalls
: ConcurrentHashMap.newKeySet(),
Expand All @@ -2033,9 +2035,8 @@ private Flux<AgentEvent> modelCallStream(
if (textStarted.get()) {
events.add(new TextBlockEndEvent(replyId, "text"));
}
if (thinkingStarted.get()) {
events.add(new ThinkingBlockEndEvent(replyId, "thinking"));
}
emitThinkingBlockEndIfNeeded(
replyId, thinkingStarted, thinkingEnded, events);
for (String toolId : startedToolCalls) {
events.add(new ToolCallEndEvent(replyId, toolId));
}
Expand All @@ -2052,9 +2053,14 @@ private void emitBlockEvents(
ReasoningContext context,
AtomicBoolean textStarted,
AtomicBoolean thinkingStarted,
AtomicBoolean thinkingEnded,
Set<String> startedToolCalls,
List<AgentEvent> events) {

if (!(block instanceof ThinkingBlock)) {
emitThinkingBlockEndIfNeeded(replyId, thinkingStarted, thinkingEnded, events);
}

if (block instanceof TextBlock tb) {
if (textStarted.compareAndSet(false, true)) {
events.add(new TextBlockStartEvent(replyId, "text"));
Expand Down Expand Up @@ -2085,6 +2091,16 @@ private void emitBlockEvents(
}
}

private void emitThinkingBlockEndIfNeeded(
String replyId,
AtomicBoolean thinkingStarted,
AtomicBoolean thinkingEnded,
List<AgentEvent> events) {
if (thinkingStarted.get() && thinkingEnded.compareAndSet(false, true)) {
events.add(new ThinkingBlockEndEvent(replyId, "thinking"));
}
}

private String resolveToolCallId(ToolUseBlock tub, ReasoningContext context) {
if (tub.getId() != null && !tub.getId().isEmpty()) {
return tub.getId();
Expand Down Expand Up @@ -2301,6 +2317,7 @@ private Flux<AgentEvent> runToolBatch(

List<Map.Entry<ToolUseBlock, ToolResultBlock>> deniedEntries = new ArrayList<>();
List<ToolUseBlock> approved = new ArrayList<>();
Set<String> emittedToolResultIds = ConcurrentHashMap.newKeySet();
for (ToolUseBlock tc : toolCalls) {
if (deniedIds.contains(tc.getId())) {
ToolResultBlock denied =
Expand Down Expand Up @@ -2347,6 +2364,11 @@ private Flux<AgentEvent> runToolBatch(
parentCtx ->
Flux.<AgentEvent>create(
sink -> {
sink.onDispose(
() ->
toolkit.setInternalChunkCallback(
null));

for (ToolUseBlock tool : approved) {
sink.next(
new ToolResultStartEvent(
Expand All @@ -2357,27 +2379,18 @@ private Flux<AgentEvent> runToolBatch(

toolkit.setInternalChunkCallback(
(toolUse, chunk) -> {
if (chunk.getOutput() != null) {
if (chunk.getOutput() != null
&& !chunk.getOutput()
.isEmpty()) {
emittedToolResultIds.add(
toolUse.getId());
for (ContentBlock block :
chunk.getOutput()) {
if (block
instanceof
TextBlock tb) {
sink.next(
new ToolResultTextDeltaEvent(
replyId,
toolUse
.getId(),
tb
.getText()));
} else {
sink.next(
new ToolResultDataDeltaEvent(
replyId,
toolUse
.getId(),
block));
}
emitToolResultBlock(
sink,
replyId,
toolUse.getId(),
block);
}
}
hookDispatcher
Expand All @@ -2403,6 +2416,17 @@ private Flux<AgentEvent> runToolBatch(
ToolUseBlock,
ToolResultBlock>
entry : results) {
if (emittedToolResultIds
.add(
entry.getKey()
.getId())) {
emitToolResultOutput(
sink,
replyId,
entry.getKey(),
entry.getValue()
.getOutput());
}
ToolResultState state =
determineToolResultState(
entry
Expand All @@ -2422,6 +2446,28 @@ private Flux<AgentEvent> runToolBatch(
return deniedEvents.concatWith(approvedEvents);
}

private void emitToolResultOutput(
FluxSink<AgentEvent> sink,
String replyId,
ToolUseBlock toolUse,
List<ContentBlock> output) {
if (toolUse == null || output == null || output.isEmpty()) {
return;
}
for (ContentBlock block : output) {
emitToolResultBlock(sink, replyId, toolUse.getId(), block);
}
}

private void emitToolResultBlock(
FluxSink<AgentEvent> sink, String replyId, String toolCallId, ContentBlock block) {
if (block instanceof TextBlock tb) {
sink.next(new ToolResultTextDeltaEvent(replyId, toolCallId, tb.getText()));
} else {
sink.next(new ToolResultDataDeltaEvent(replyId, toolCallId, block));
}
}

/**
* Outcome of running every {@link ToolBase} call through the {@link PermissionEngine}.
*
Expand Down Expand Up @@ -2838,6 +2884,7 @@ private Flux<AgentEvent> summaryModelCallStream(
String replyId = UUID.randomUUID().toString().replace("-", "");
AtomicBoolean textStarted = new AtomicBoolean(false);
AtomicBoolean thinkingStarted = new AtomicBoolean(false);
AtomicBoolean thinkingEnded = new AtomicBoolean(false);

Flux<AgentEvent> modelEvents =
mci.model().stream(mci.messages(), mci.tools(), mci.options())
Expand All @@ -2857,6 +2904,13 @@ private Flux<AgentEvent> summaryModelCallStream(

List<AgentEvent> events = new ArrayList<>();
for (ContentBlock block : chunk.getContent()) {
if (!(block instanceof ThinkingBlock)) {
emitThinkingBlockEndIfNeeded(
replyId,
thinkingStarted,
thinkingEnded,
events);
}
if (block instanceof TextBlock tb) {
if (textStarted.compareAndSet(false, true)) {
events.add(
Expand Down Expand Up @@ -2895,9 +2949,8 @@ private Flux<AgentEvent> summaryModelCallStream(
if (textStarted.get()) {
events.add(new TextBlockEndEvent(replyId, "text"));
}
if (thinkingStarted.get()) {
events.add(new ThinkingBlockEndEvent(replyId, "thinking"));
}
emitThinkingBlockEndIfNeeded(
replyId, thinkingStarted, thinkingEnded, events);
events.add(new ModelCallEndEvent(replyId, context.getChatUsage()));
return Flux.fromIterable(events);
});
Expand Down
29 changes: 29 additions & 0 deletions agentscope-core/src/test/java/io/agentscope/core/agent/ReActAgentNewLoopReplyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
import static org.junit.jupiter.api.Assertions.assertTrue;

import io.agentscope.core.ReActAgent;
import io.agentscope.core.agent.test.MockModel;
import io.agentscope.core.event.AgentEndEvent;
import io.agentscope.core.event.AgentEvent;
import io.agentscope.core.event.AgentEventType;
import io.agentscope.core.event.AgentStartEvent;
import io.agentscope.core.event.ExceedMaxItersEvent;
import io.agentscope.core.event.ModelCallEndEvent;
Expand Down Expand Up @@ -163,6 +165,33 @@ void textOnlyReplyEmitsExpectedEventOrder() {
assertEquals(1L, modelEnds);
}

@Test
void thinkingBlockEndsBeforeTextBlockStarts() {
ReActAgent agent =
ReActAgent.builder()
.name("asst")
.model(MockModel.withThinking("I am thinking.", "Final answer"))
.toolkit(new Toolkit())
.build();

List<AgentEvent> events = agent.streamEvents(List.of()).collectList().block();
assertNotNull(events);

assertEquals(
List.of(
AgentEventType.AGENT_START,
AgentEventType.MODEL_CALL_START,
AgentEventType.THINKING_BLOCK_START,
AgentEventType.THINKING_BLOCK_DELTA,
AgentEventType.THINKING_BLOCK_END,
AgentEventType.TEXT_BLOCK_START,
AgentEventType.TEXT_BLOCK_DELTA,
AgentEventType.TEXT_BLOCK_END,
AgentEventType.MODEL_CALL_END,
AgentEventType.AGENT_END),
events.stream().map(AgentEvent::getType).toList());
}

@Test
void callResolvesToFinalAssistantMsg() {
ChatModelBase model = new ScriptedModel(List.of(() -> Flux.just(textResponse("answer"))));
Expand Down
Loading