Skip to content
Merged
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
17 changes: 6 additions & 11 deletions async-openai/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -544,23 +544,18 @@ impl<C: Config> Client<C> {
}

/// Make HTTP GET request to receive SSE
pub(crate) async fn _get_stream<Q, O>(
pub(crate) async fn get_stream<O>(
&self,
path: &str,
query: &Q,
request_options: &RequestOptions,
) -> Pin<Box<dyn Stream<Item = Result<O, OpenAIError>> + Send>>
where
Q: Serialize + ?Sized,
O: DeserializeOwned + std::marker::Send + 'static,
{
let event_source = self
.http_client
.get(self.config.url(path))
.query(query)
.query(&self.config.query())
.headers(self.config.headers())
.eventsource()
.unwrap();
let request_builder =
self.build_request_builder(reqwest::Method::GET, path, request_options);

let event_source = request_builder.eventsource().unwrap();

stream(event_source).await
}
Expand Down
19 changes: 19 additions & 0 deletions async-openai/src/responses.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,25 @@ impl<'c, C: Config> Responses<'c, C> {
.await
}

/// Retrieves a model response with the given ID with streaming.
///
/// Response events will be sent as server-sent events as they become available.
#[crate::byot(
T0 = std::fmt::Display,
R = serde::de::DeserializeOwned,
stream = "true",
where_clause = "R: std::marker::Send + 'static"
)]
pub async fn retrieve_stream(&self, response_id: &str) -> Result<ResponseStream, OpenAIError> {
let mut request_options = self.request_options.clone();
request_options.with_query(&[("stream", "true")])?;

Ok(self
.client
.get_stream(&format!("/responses/{}", response_id), &request_options)
.await)
}

/// Deletes a model response with the given ID.
#[crate::byot(T0 = std::fmt::Display, R = serde::de::DeserializeOwned)]
pub async fn delete(&self, response_id: &str) -> Result<DeleteResponse, OpenAIError> {
Expand Down
2 changes: 2 additions & 0 deletions async-openai/src/types/audio/audio_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pub enum Voice {
Sage,
Shimmer,
Verse,
#[serde(untagged)]
Other(String),
}

#[derive(Debug, Default, Clone, PartialEq)]
Expand Down
72 changes: 70 additions & 2 deletions async-openai/src/types/chat/impls.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use std::fmt::Display;

use crate::types::chat::{
ChatCompletionFunctionCall, ChatCompletionNamedToolChoice,
ChatCompletionFunctionCall, ChatCompletionMessageCustomToolCall, ChatCompletionMessageToolCall,
ChatCompletionMessageToolCalls, ChatCompletionNamedToolChoice,
ChatCompletionRequestAssistantMessage, ChatCompletionRequestAssistantMessageContent,
ChatCompletionRequestDeveloperMessage, ChatCompletionRequestDeveloperMessageContent,
ChatCompletionRequestFunctionMessage, ChatCompletionRequestMessage,
Expand All @@ -10,7 +11,8 @@ use crate::types::chat::{
ChatCompletionRequestSystemMessageContent, ChatCompletionRequestToolMessage,
ChatCompletionRequestToolMessageContent, ChatCompletionRequestUserMessage,
ChatCompletionRequestUserMessageContent, ChatCompletionRequestUserMessageContentPart,
FunctionName, ImageUrl, Role,
ChatCompletionTool, ChatCompletionTools, CustomToolChatCompletions, FunctionName, ImageUrl,
Role,
};

impl From<ChatCompletionRequestUserMessage> for ChatCompletionRequestMessage {
Expand Down Expand Up @@ -332,3 +334,69 @@ impl Display for Role {
)
}
}

impl From<ChatCompletionTool> for Vec<ChatCompletionTools> {
fn from(value: ChatCompletionTool) -> Self {
vec![ChatCompletionTools::Function(value)]
}
}

impl From<CustomToolChatCompletions> for Vec<ChatCompletionTools> {
fn from(value: CustomToolChatCompletions) -> Self {
vec![ChatCompletionTools::Custom(value)]
}
}

impl From<ChatCompletionRequestUserMessage> for Vec<ChatCompletionRequestMessage> {
fn from(value: ChatCompletionRequestUserMessage) -> Self {
vec![value.into()]
}
}

impl From<ChatCompletionRequestSystemMessage> for Vec<ChatCompletionRequestMessage> {
fn from(value: ChatCompletionRequestSystemMessage) -> Self {
vec![value.into()]
}
}

impl From<ChatCompletionRequestDeveloperMessage> for Vec<ChatCompletionRequestMessage> {
fn from(value: ChatCompletionRequestDeveloperMessage) -> Self {
vec![value.into()]
}
}

impl From<ChatCompletionRequestAssistantMessage> for Vec<ChatCompletionRequestMessage> {
fn from(value: ChatCompletionRequestAssistantMessage) -> Self {
vec![value.into()]
}
}

impl From<ChatCompletionRequestFunctionMessage> for Vec<ChatCompletionRequestMessage> {
fn from(value: ChatCompletionRequestFunctionMessage) -> Self {
vec![value.into()]
}
}

impl From<ChatCompletionRequestToolMessage> for Vec<ChatCompletionRequestMessage> {
fn from(value: ChatCompletionRequestToolMessage) -> Self {
vec![value.into()]
}
}

impl From<ChatCompletionMessageToolCall> for ChatCompletionMessageToolCalls {
fn from(value: ChatCompletionMessageToolCall) -> Self {
ChatCompletionMessageToolCalls::Function(value)
}
}

impl From<ChatCompletionMessageCustomToolCall> for ChatCompletionMessageToolCalls {
fn from(value: ChatCompletionMessageCustomToolCall) -> Self {
ChatCompletionMessageToolCalls::Custom(value)
}
}

impl From<ImageUrl> for ChatCompletionRequestMessageContentPartImage {
fn from(value: ImageUrl) -> Self {
ChatCompletionRequestMessageContentPartImage { image_url: value }
}
}
2 changes: 2 additions & 0 deletions async-openai/src/types/realtime/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ pub enum RealtimeVoice {
Verse,
Marin,
Cedar,
#[serde(untagged)]
Other(String),
}

#[derive(Debug, Serialize, Deserialize, Clone)]
Expand Down
28 changes: 10 additions & 18 deletions examples/chat/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::error::Error;
use async_openai::{
traits::RequestOptionsBuilder,
types::chat::{
ChatCompletionRequestAssistantMessageArgs, ChatCompletionRequestSystemMessageArgs,
ChatCompletionRequestUserMessageArgs, CreateChatCompletionRequestArgs,
ChatCompletionRequestAssistantMessage, ChatCompletionRequestSystemMessage,
ChatCompletionRequestUserMessage, CreateChatCompletionRequestArgs,
},
Client,
};
Expand All @@ -17,22 +17,14 @@ async fn main() -> Result<(), Box<dyn Error>> {
.max_tokens(512u32)
.model("gpt-3.5-turbo")
.messages([
ChatCompletionRequestSystemMessageArgs::default()
.content("You are a helpful assistant.")
.build()?
.into(),
ChatCompletionRequestUserMessageArgs::default()
.content("Who won the world series in 2020?")
.build()?
.into(),
ChatCompletionRequestAssistantMessageArgs::default()
.content("The Los Angeles Dodgers won the World Series in 2020.")
.build()?
.into(),
ChatCompletionRequestUserMessageArgs::default()
.content("Where was it played?")
.build()?
.into(),
// Can also use ChatCompletionRequest<Role>MessageArgs for builder pattern
ChatCompletionRequestSystemMessage::from("You are a helpful assistant.").into(),
ChatCompletionRequestUserMessage::from("Who won the world series in 2020?").into(),
ChatCompletionRequestAssistantMessage::from(
"The Los Angeles Dodgers won the World Series in 2020.",
)
.into(),
ChatCompletionRequestUserMessage::from("Where was it played?").into(),
])
.build()?;

Expand Down
12 changes: 12 additions & 0 deletions examples/responses-retrieve-stream/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[package]
name = "responses-retrive-stream"
version = "0.1.0"
edition = "2021"
publish = false

[dependencies]
async-openai = { path = "../../async-openai" }
tokio = { version = "1.0", features = ["full"] }
futures = "0.3"
serde_json = "1.0"

45 changes: 45 additions & 0 deletions examples/responses-retrieve-stream/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
use async_openai::{
types::responses::{CreateResponseArgs, ResponseStreamEvent},
Client,
};
use futures::StreamExt;
use std::error::Error;
use std::io::{stdout, Write};

#[tokio::main]
async fn main() -> Result<(), Box<dyn Error>> {
let client = Client::new();

// First, create a response with background=true and stream=true
println!("Creating a respose with background=true and stream=true ...");
let create_request = CreateResponseArgs::default()
.model("gpt-4.1")
.background(true)
.stream(true)
.input("Write a function in Rust that adds two u32 and returns u64'")
.build()?;

let mut response = client.responses().create_stream(create_request).await?;
let mut response_id = None;
let mut lock = stdout().lock();

while let Some(result) = response.next().await {
if let Ok(ResponseStreamEvent::ResponseCreated(event)) = result {
writeln!(lock, "Response created with ID: {}", event.response.id).unwrap();
response_id = Some(event.response.id.clone());
break;
}
}

if let Some(response_id) = response_id {
writeln!(lock, "\nRetrieving {} with streaming...\n", &response_id).unwrap();
let mut retrieve_stream = client.responses().retrieve_stream(&response_id).await?;
while let Some(result) = retrieve_stream.next().await {
if let Ok(ResponseStreamEvent::ResponseOutputTextDelta(delta)) = result {
write!(lock, "{}", delta.delta).unwrap();
}
}
}

Ok(())
}
Loading
Loading