Skip to content

End stream when Error::StreamEnded appears #406

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
wants to merge 1 commit into from
Closed

End stream when Error::StreamEnded appears #406

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
29 changes: 24 additions & 5 deletions async-openai/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::pin::Pin;

use bytes::Bytes;
use futures::{stream::StreamExt, Stream};
use futures::{stream::StreamExt, Stream, TryStreamExt};
use reqwest::multipart::Form;
use reqwest_eventsource::{Event, EventSource, RequestBuilderExt};
use serde::{de::DeserializeOwned, Serialize};
Expand Down Expand Up @@ -479,13 +479,20 @@ pub(crate) async fn stream<O>(
where
O: DeserializeOwned + std::marker::Send + 'static,
{
let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
let (tx, rx) = tokio::sync::mpsc::unbounded_channel::<Result<O, (bool, OpenAIError)>>();

tokio::spawn(async move {
while let Some(ev) = event_source.next().await {
match ev {
Err(e) => {
if let Err(_e) = tx.send(Err(OpenAIError::StreamError(e.to_string()))) {
let send_reuslt = match e {
reqwest_eventsource::Error::StreamEnded => {
tx.send(Err((true, OpenAIError::StreamError(e.to_string()))))
}
_ => tx.send(Err((false, OpenAIError::StreamError(e.to_string())))),
};

if let Err(_e) = send_reuslt {
// rx dropped
break;
}
Expand All @@ -497,7 +504,9 @@ where
}

let response = match serde_json::from_str::<O>(&message.data) {
Err(e) => Err(map_deserialization_error(e, message.data.as_bytes())),
Err(e) => {
Err((false, map_deserialization_error(e, message.data.as_bytes())))
}
Ok(output) => Ok(output),
};

Expand All @@ -514,7 +523,17 @@ where
event_source.close();
});

Box::pin(tokio_stream::wrappers::UnboundedReceiverStream::new(rx))
Box::pin(
tokio_stream::wrappers::UnboundedReceiverStream::new(rx)
.scan((), |_, item| async {
if let Err((true, _)) = item {
None
} else {
Some(item)
}
})
.map_err(|e| e.1),
)
}

pub(crate) async fn stream_mapped_raw_events<O>(
Expand Down