Fix errors due to cherrypicks

Author: ifsheldon

async-openai/src/types/impls.rs

@@ -3,7 +3,6 @@ use std::fmt::Display;
 use bytes::Bytes;
 
 use super::{
-    responses::{EasyInputContent, Role as ResponsesRole},
     AddUploadPartRequest, AudioInput, AudioResponseFormat, ChatCompletionFunctionCall,
     ChatCompletionFunctions, ChatCompletionNamedToolChoice, ChatCompletionRequestAssistantMessage,
     ChatCompletionRequestAssistantMessageContent, ChatCompletionRequestDeveloperMessage,
@@ -19,7 +18,7 @@ use super::{
     EmbeddingInput, FileExpiresAfterAnchor, FileInput, FilePurpose, FunctionName, ImageInput,
     ImageModel, ImageResponseFormat, ImageSize, ImageUrl, ModerationInput, Prompt, Role, Stop,
     TimestampGranularity, VideoSize,
-    responses::{CodeInterpreterContainer, Input, InputContent},
+    responses::EasyInputContent,
 };
 use crate::traits::AsyncTryFrom;
 use crate::{error::OpenAIError, types::InputSource, util::create_file_part};
@@ -974,12 +973,6 @@ impl Default for EasyInputContent {
     }
 }
 
-impl Default for ResponsesRole {
-    fn default() -> Self {
-        Self::User
-    }
-}
-
 impl From<String> for EasyInputContent {
     fn from(value: String) -> Self {
         Self::Text(value)

async-openai/src/types/realtime/client_event.rs

@@ -1,5 +1,4 @@
 use serde::{Deserialize, Serialize};
-use super::{item::Item, session_resource::SessionResource};
 
 use crate::types::realtime::{RealtimeConversationItem, RealtimeResponseCreateParams, Session};
 
@@ -247,22 +246,6 @@ impl From<&RealtimeClientEvent> for String {
     }
 }
 
-impl From<RealtimeClientEvent> for Message {
-    fn from(value: RealtimeClientEvent) -> Self {
-        Message::Text(String::from(&value).into())
-    }
-}
-
-macro_rules! message_from_event {
-    ($from_typ:ty, $evt_typ:ty) => {
-        impl From<$from_typ> for Message {
-            fn from(value: $from_typ) -> Self {
-                Self::from(<$evt_typ>::from(value))
-            }
-        }
-    };
-}
-
 macro_rules! event_from {
     ($from_typ:ty, $evt_typ:ty, $variant:ident) => {
         impl From<$from_typ> for $evt_typ {
@@ -283,32 +266,32 @@ event_from!(
     RealtimeClientEvent,
     InputAudioBufferAppend
 );
-event_struct_to_variant!(
+event_from!(
     RealtimeClientEventInputAudioBufferCommit,
     RealtimeClientEvent,
     InputAudioBufferCommit
 );
-event_struct_to_variant!(
+event_from!(
     RealtimeClientEventInputAudioBufferClear,
     RealtimeClientEvent,
     InputAudioBufferClear
 );
-event_struct_to_variant!(
+event_from!(
     RealtimeClientEventConversationItemCreate,
     RealtimeClientEvent,
     ConversationItemCreate
 );
-event_struct_to_variant!(
+event_from!(
     RealtimeClientEventConversationItemTruncate,
     RealtimeClientEvent,
     ConversationItemTruncate
 );
-event_struct_to_variant!(
+event_from!(
     RealtimeClientEventConversationItemDelete,
     RealtimeClientEvent,
     ConversationItemDelete
 );
-event_struct_to_variant!(
+event_from!(
     RealtimeClientEventConversationItemRetrieve,
     RealtimeClientEvent,
     ConversationItemRetrieve
@@ -318,7 +301,7 @@ event_from!(
     RealtimeClientEvent,
     ResponseCreate
 );
-event_struct_to_variant!(
+event_from!(
     RealtimeClientEventResponseCancel,
     RealtimeClientEvent,
     ResponseCancel
@@ -329,7 +312,7 @@ event_from!(
     OutputAudioBufferClear
 );
 
-impl<T: Into<ClientEvent>> ToText for T {
+impl<T: Into<RealtimeClientEvent>> ToText for T {
     // blanket impl for all client event structs
     fn to_text(self) -> String {
         (&self.into()).into()

async-openai/src/types/realtime/session.rs

@@ -1,8 +1,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::types::{
-    responses::{Prompt, ToolChoiceFunction, ToolChoiceMCP, ToolChoiceOptions},
     MCPTool,
+    responses::{Prompt, ToolChoiceFunction, ToolChoiceMCP, ToolChoiceOptions},
 };
 
 #[derive(Debug, Default, Serialize, Deserialize, Clone)]

async-openai/src/types/responses/response.rs

@@ -9,9 +9,10 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
 /// Role of messages in the API.
-#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Default)]
 #[serde(rename_all = "lowercase")]
 pub enum Role {
+    #[default]
     User,
     Assistant,
     System,
@@ -583,10 +584,10 @@ pub struct CreateResponse {
     /// - `web_search_call.action.sources`: Include the sources of the web search tool call.
     ///
     /// - `code_interpreter_call.outputs`: Includes the outputs of python code execution in code
-    ///    interpreter tool call items.
+    ///   interpreter tool call items.
     ///
     /// - `computer_call_output.output.image_url`: Include image urls from the computer call
-    ///    output.
+    ///   output.
     ///
     /// - `file_search_call.results`: Include the search results of the file search tool call.
     ///
@@ -595,9 +596,9 @@ pub struct CreateResponse {
     /// - `message.output_text.logprobs`: Include logprobs with assistant messages.
     ///
     /// - `reasoning.encrypted_content`: Includes an encrypted version of reasoning tokens in
-    ///    reasoning item outputs. This enables reasoning items to be used in multi-turn
-    ///    conversations when using the Responses API statelessly (like when the `store` parameter is
-    ///    set to `false`, or when an organization is enrolled in the zero data retention program).
+    ///   reasoning item outputs. This enables reasoning items to be used in multi-turn
+    ///   conversations when using the Responses API statelessly (like when the `store` parameter is
+    ///   set to `false`, or when an organization is enrolled in the zero data retention program).
     #[serde(skip_serializing_if = "Option::is_none")]
     pub include: Option<Vec<IncludeEnum>>,
 
@@ -760,10 +761,10 @@ pub struct CreateResponse {
 
     ///The truncation strategy to use for the model response.
     /// - `auto`: If the input to this Response exceeds
-    /// the model's context window size, the model will truncate the
-    /// response to fit the context window by dropping items from the beginning of the conversation.
+    ///   the model's context window size, the model will truncate the
+    ///   response to fit the context window by dropping items from the beginning of the conversation.
     /// - `disabled` (default): If the input size will exceed the context window
-    /// size for a model, the request will fail with a 400 error.
+    ///   size for a model, the request will fail with a 400 error.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub truncation: Option<Truncation>,
 }
@@ -2333,10 +2334,10 @@ pub struct Response {
 
     ///The truncation strategy to use for the model response.
     /// - `auto`: If the input to this Response exceeds
-    /// the model's context window size, the model will truncate the
-    /// response to fit the context window by dropping items from the beginning of the conversation.
+    ///   the model's context window size, the model will truncate the
+    ///   response to fit the context window by dropping items from the beginning of the conversation.
     /// - `disabled` (default): If the input size will exceed the context window
-    /// size for a model, the request will fail with a 400 error.
+    ///   size for a model, the request will fail with a 400 error.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub truncation: Option<Truncation>,
 
@@ -2539,10 +2540,10 @@ pub struct TokenCountsBody {
 
     ///The truncation strategy to use for the model response.
     /// - `auto`: If the input to this Response exceeds
-    /// the model's context window size, the model will truncate the
-    /// response to fit the context window by dropping items from the beginning of the conversation.
+    ///   the model's context window size, the model will truncate the
+    ///   response to fit the context window by dropping items from the beginning of the conversation.
     /// - `disabled` (default): If the input size will exceed the context window
-    /// size for a model, the request will fail with a 400 error.
+    ///   size for a model, the request will fail with a 400 error.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub truncation: Option<Truncation>,
 }

async-openai/src/types/responses/response_stream.rs

@@ -1,15 +1,12 @@
-use futures::Stream;
 use serde::{Deserialize, Serialize};
-use std::pin::Pin;
 
 use crate::{
-    error::OpenAIError,
+    OpenAIEventStream,
     types::responses::{OutputContent, OutputItem, Response, ResponseLogProb, Summary},
 };
 
 /// Stream of response events
-pub type ResponseStream =
-    Pin<Box<dyn Stream<Item = Result<ResponseStreamEvent, OpenAIError>> + Send>>;
+pub type ResponseStream = OpenAIEventStream<ResponseStreamEvent>;
 
 /// Event types for streaming responses from the Responses API
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]

examples/realtime/src/main.rs

@@ -2,7 +2,7 @@ use std::process::exit;
 
 use async_openai_wasm::types::realtime::{
     RealtimeClientEventConversationItemCreate, RealtimeClientEventResponseCreate,
-    RealtimeConversationItem, RealtimeServerEvent,
+    RealtimeConversationItem, RealtimeServerEvent, ToText,
 };
 use futures_util::{StreamExt, future, pin_mut};
 
@@ -128,7 +128,9 @@ async fn read_stdin(tx: futures_channel::mpsc::UnboundedSender<Message>) {
         tx.unbounded_send(message).unwrap();
         // send WebSocket message containing event of type "response.create" to server
         tx.unbounded_send(Message::Text(
-            ResponseCreateEvent::default().to_text().into(),
+            RealtimeClientEventResponseCreate::default()
+                .to_text()
+                .into(),
         ))
         .unwrap();
     }