Skip to content

fix: check [DONE] SSE marker before deserialization in stream_mapped_raw_events #543

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

Merged
64bit merged 1 commit into from
May 11, 2026
Merged

fix: check [DONE] SSE marker before deserialization in stream_mapped_raw_events #543

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
24 changes: 10 additions & 14 deletions async-openai/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,12 +791,8 @@ where
let event_stream = Box::pin(eventsource_stream::EventStream::new(byte_stream));

Box::pin(futures::stream::unfold(
(event_stream, event_mapper, false),
|(mut event_stream, event_mapper, finished)| async move {
if finished {
return None;
}

(event_stream, event_mapper),
|(mut event_stream, event_mapper)| async move {
loop {
let event = match event_stream.next().await {
Some(Ok(event)) => event,
Expand All @@ -805,20 +801,22 @@ where
Err(OpenAIError::StreamError(Box::new(
StreamError::EventStream(error.to_string()),
))),
(event_stream, event_mapper, true),
(event_stream, event_mapper),
));
}
None => return None,
};

let done = event.data == "[DONE]";
if event.data == "[DONE]" {
return None;
}

if event.event == "keepalive" {
continue;
}

let response = event_mapper(event);
return Some((response, (event_stream, event_mapper, done)));
return Some((response, (event_stream, event_mapper)));
}
},
))
Expand Down Expand Up @@ -856,7 +854,9 @@ where
break;
}
};
let done = event.data == "[DONE]";
if event.data == "[DONE]" {
break;
}

if event.event == "keepalive" {
continue;
Expand All @@ -867,10 +867,6 @@ where
if tx.send(response).is_err() {
break;
}

if done {
break;
}
}
});

Expand Down
Loading