Skip to content

Commit 942f24b

Browse files
committed
0.23 upstream merge fix part 3:
use full power pin-project
1 parent 0ea8365 commit 942f24b

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

async-openai-wasm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ tracing = "0.1"
3939
derive_builder = "0.20"
4040
async-convert = "1.0"
4141
secrecy = { version = "0.8", features = ["serde"] }
42-
pin-project-lite = "0.2"
42+
pin-project = "1.1"
4343
getrandom = { version = "0.2", features = ["js"] }
4444
bytes = "1.6"
4545
eventsource-stream = "0.2"

async-openai-wasm/src/client.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::task::{Context, Poll};
66
use bytes::Bytes;
77
use futures::{Stream, stream::StreamExt};
88
use futures::stream::Filter;
9-
use pin_project_lite::pin_project;
9+
use pin_project::pin_project;
1010
use reqwest_eventsource::{Event, EventSource, RequestBuilderExt};
1111
use serde::{de::DeserializeOwned, Serialize};
1212

@@ -449,7 +449,7 @@ impl<C: Config> Client<C> {
449449
) -> Pin<Box<dyn Stream<Item=Result<O, OpenAIError>> + Send>>
450450
where
451451
I: Serialize,
452-
O: DeserializeOwned + std::marker::Send + 'static,
452+
O: DeserializeOwned + Send + 'static,
453453
{
454454
let event_source = self
455455
.http_client
@@ -487,14 +487,14 @@ impl<C: Config> Client<C> {
487487
}
488488
}
489489

490-
pin_project! {
491-
/// Request which responds with SSE.
492-
/// [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#event_stream_format)
493-
pub struct OpenAIEventStream<O> {
494-
#[pin]
495-
stream: Filter<EventSource, future::Ready<bool>, fn(&Result<Event, reqwest_eventsource::Error>) -> future::Ready<bool>>,
496-
_phantom_data: PhantomData<O>
497-
}
490+
491+
/// Request which responds with SSE.
492+
/// [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#event_stream_format)
493+
#[pin_project]
494+
pub struct OpenAIEventStream<O> {
495+
#[pin]
496+
stream: Filter<EventSource, future::Ready<bool>, fn(&Result<Event, reqwest_eventsource::Error>) -> future::Ready<bool>>,
497+
_phantom_data: PhantomData<O>,
498498
}
499499

500500
impl<O> OpenAIEventStream<O> {

0 commit comments

Comments
 (0)