Skip to content

fix(RoutingLLMService): 修复 commit 后流式事件乱序问题 #9

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
ASGPIPO wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(RoutingLLMService): 修复 commit 后流式事件乱序问题 #9

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
42 changes: 26 additions & 16 deletions infra-ai/src/main/java/com/nageoffer/ai/ragent/infra/chat/RoutingLLMService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ private static final class ProbeBufferingCallback implements StreamCallback {
private final Object lock = new Object();
private final List<BufferedEvent> bufferedEvents = new ArrayList<>();
private volatile boolean committed;
private boolean draining;

private ProbeBufferingCallback(StreamCallback downstream, FirstPacketAwaiter awaiter) {
this.downstream = downstream;
Expand Down Expand Up @@ -259,34 +260,23 @@ public void onError(Throwable t) {
* 2. 按事件顺序回放缓存，保证时序一致
*/
private void commit() {
List<BufferedEvent> snapshot;
synchronized (lock) {
if (committed) {
return;
}
committed = true;
if (bufferedEvents.isEmpty()) {
return;
}
snapshot = new ArrayList<>(bufferedEvents);
bufferedEvents.clear();
}
for (BufferedEvent event : snapshot) {
dispatch(event);
}
drain();
}

private void bufferOrDispatch(BufferedEvent event) {
boolean dispatchNow;
synchronized (lock) {
dispatchNow = committed;
if (!dispatchNow) {
bufferedEvents.add(event);
bufferedEvents.add(event);
if (!committed) {
return;
}
}
if (dispatchNow) {
dispatch(event);
}
drain();
}

private void dispatch(BufferedEvent event) {
Expand All @@ -300,6 +290,26 @@ private void dispatch(BufferedEvent event) {
}
}

private void drain() {
while (true) {
BufferedEvent event;
synchronized (lock) {
if (draining || bufferedEvents.isEmpty()) {
return;
}
draining = true;
event = bufferedEvents.remove(0);
}
try {
dispatch(event);
} finally {
synchronized (lock) {
draining = false;
}
}
}
}

private record BufferedEvent(EventType type, String content, Throwable error) {

private static BufferedEvent content(String content) {
Expand Down