Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions frontend/src/blocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1132,16 +1132,20 @@ export function createAssistantEventProjector(
ignored: true,
};
}
if (ev.id && seenEventIds.has(ev.id)) {
// ADK streams content chunks under the id of their consolidated event, so
// only complete events and content-free partials (e.g. A2A status) dedupe.
const streamedChunk = ev.partial === true && Boolean(ev.content?.parts?.length);
const dedupeId = streamedChunk ? undefined : ev.id;
if (dedupeId && seenEventIds.has(dedupeId)) {
return {
turn: { role: "assistant", blocks: [] },
completed: false,
ignored: true,
};
}
if (ev.id) {
seenEventIds.add(ev.id);
eventIdOrder.push(ev.id);
if (dedupeId) {
seenEventIds.add(dedupeId);
eventIdOrder.push(dedupeId);
if (eventIdOrder.length > MAX_SEEN_EVENT_IDS) {
seenEventIds.delete(eventIdOrder.shift()!);
}
Expand Down
29 changes: 29 additions & 0 deletions frontend/tests/parallelStreamAggregation.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -537,3 +537,32 @@ test("closes the live sandbox task from its finalAlreadyEmitted wrapper response
assert.equal(transportFinished.meta.localId, turns[0].meta.localId);
assert.equal(transportFinished.meta.streaming, false);
});

test("keeps ADK streaming chunks that share the final event id", () => {
// ADK 2 gives every partial chunk of one model response the same id as its
// consolidated final event; only a replayed final event is a duplicate.
const projector = createAssistantEventProjector("adk-shared-id");
let turns = [];
for (const text of ["用户", "问", "你好"]) {
const result = projector.project(event("agent", text, { id: "shared-1" }));
assert.notEqual(result.ignored, true);
turns = upsertProjectedAssistantTurn(turns, result.turn);
}
assert.equal(blockText(turns[0], "text"), "用户问你好");

const final = projector.project(event("agent", "完整答案", {
partial: false,
id: "shared-1",
}));
assert.notEqual(final.ignored, true);
turns = upsertProjectedAssistantTurn(turns, final.turn);
assert.equal(turns.length, 1);
assert.equal(blockText(turns[0], "text"), "完整答案");
assert.equal(turns[0].meta.streaming, false);

const replayed = projector.project(event("agent", "完整答案", {
partial: false,
id: "shared-1",
}));
assert.equal(replayed.ignored, true);
});

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
import{U as a,C as n}from"../visualizations/mermaid/mermaid.core-CVx1WIOc.js";const t=(r,o)=>a.lang.round(n.parse(r)[o]);export{t as c};
import{U as a,C as n}from"../visualizations/mermaid/mermaid.core-DxEtHRGv.js";const t=(r,o)=>a.lang.round(n.parse(r)[o]);export{t as c};

Large diffs are not rendered by default.

Loading