fix cherrypick issues and format

Author: ifsheldon

async-openai/Cargo.toml

@@ -119,6 +119,7 @@ _api = [
     "dep:eventsource-stream",
     "dep:serde_urlencoded",
     "dep:url",
+    "dep:pin-project"
 ]
 
 
@@ -131,7 +132,7 @@ bytes = { version = "1.9.0", optional = true }
 
 # API dependencies - only needed when API features are enabled
 # We use a feature gate to enable these when any API feature is enabled
-async-openai-macros = { path = "../async-openai-macros", version = "0.1.0" }
+async-openai-macros = { path = "../async-openai-macros", version = "0.1.0", optional = true }
 base64 = { version = "0.22.1", optional = true }
 futures = { version = "0.3.31", optional = true }
 reqwest = { version = "0.12.12", features = [
@@ -167,10 +168,6 @@ serde_json = "1.0"
 name = "bring_your_own_type"
 required-features = ["byot", "file", "assistant", "model", "moderation", "image", "chat-completion", "completions", "audio", "embedding", "finetuning", "batch", "administration", "upload", "vectorstore", "responses", "chatkit", "container", "evals", "video"]
 
-[[test]]
-name = "boxed_future"
-required-features = ["completions", "chat-completion-types"]
-
 [[test]]
 name = "chat_completion"
 required-features = ["chat-completion-types"]

async-openai/src/client.rs

@@ -16,22 +16,12 @@ use serde::{Serialize, de::DeserializeOwned};
 
 use crate::error::{ApiError, StreamError};
 use crate::{
+    RequestOptions,
     config::{Config, OpenAIConfig},
     error::{OpenAIError, WrappedError, map_deserialization_error},
     traits::AsyncTryFrom,
-    RequestOptions,
 };
 
-#[cfg(feature = "administration")]
-use crate::admin::Admin;
-#[cfg(feature = "chatkit")]
-use crate::chatkit::Chatkit;
-#[cfg(feature = "file")]
-use crate::file::Files;
-#[cfg(feature = "image")]
-use crate::image::Images;
-#[cfg(feature = "moderation")]
-use crate::moderation::Moderations;
 #[cfg(feature = "assistant")]
 use crate::Assistants;
 #[cfg(feature = "audio")]
@@ -66,6 +56,16 @@ use crate::Uploads;
 use crate::VectorStores;
 #[cfg(feature = "video")]
 use crate::Videos;
+#[cfg(feature = "administration")]
+use crate::admin::Admin;
+#[cfg(feature = "chatkit")]
+use crate::chatkit::Chatkit;
+#[cfg(feature = "file")]
+use crate::file::Files;
+#[cfg(feature = "image")]
+use crate::image::Images;
+#[cfg(feature = "moderation")]
+use crate::moderation::Moderations;
 
 #[derive(Debug, Clone)]
 /// Client is a container for config and http_client

async-openai/src/impls.rs

@@ -1,3 +1,5 @@
+#[cfg(feature = "realtime")]
+use crate::Realtime;
 #[cfg(feature = "batch")]
 use crate::batches::Batches;
 #[cfg(feature = "chat-completion")]
@@ -22,8 +24,6 @@ use crate::moderation::Moderations;
 use crate::uploads::Uploads;
 #[cfg(feature = "video")]
 use crate::video::Videos;
-#[cfg(feature = "realtime")]
-use crate::Realtime;
 #[cfg(feature = "administration")]
 use crate::{
     admin::AdminAPIKeys, admin::AuditLogs, admin::Certificates, admin::GroupRoles,

async-openai/src/types/assistants/stream.rs

@@ -105,7 +105,7 @@ pub enum AssistantStreamEvent {
 }
 
 #[cfg(feature = "_api")]
-pub type AssistantEventStream = OpenAIEventStream<AssistantStreamEvent>;
+pub type AssistantEventStream = crate::client::OpenAIEventStream<AssistantStreamEvent>;
 
 #[cfg(feature = "_api")]
 impl TryFrom<eventsource_stream::Event> for AssistantStreamEvent {

async-openai/src/types/audio/audio_.rs

@@ -3,8 +3,8 @@ use derive_builder::Builder;
 use serde::{Deserialize, Serialize};
 
 use crate::error::OpenAIError;
-use crate::types::audio::{LogProbProperties, TranscriptTextUsageDuration, TranscriptionUsage};
 use crate::types::InputSource;
+use crate::types::audio::{LogProbProperties, TranscriptTextUsageDuration, TranscriptionUsage};
 
 // openapi spec type: VoiceIdsShared
 #[derive(Debug, Default, Serialize, Deserialize, Clone, PartialEq)]

async-openai/src/types/audio/stream.rs

@@ -36,7 +36,6 @@ pub struct SpeechAudioDoneEvent {
     pub usage: SpeechUsage,
 }
 
-
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
 pub struct TranscriptionTextSegmentEvent {
     /// Unique identifier for the segment.
@@ -100,7 +99,7 @@ pub type TranscriptionResponseStream =
 /// Stream of response events
 #[cfg(feature = "_api")]
 /// Stream of response events
-pub type SpeechResponseStream = OpenAIEventStream<CreateSpeechResponseStreamEvent>;
+pub type SpeechResponseStream = crate::client::OpenAIEventStream<CreateSpeechResponseStreamEvent>;
 
 #[cfg(feature = "_api")]
 macro_rules! impl_event_type {

async-openai/src/types/chat/chat_.rs

@@ -3,7 +3,6 @@ use std::collections::HashMap;
 use derive_builder::Builder;
 use serde::{Deserialize, Serialize};
 
-use crate::client::OpenAIEventStream;
 use crate::{
     error::OpenAIError,
     types::{
@@ -1115,7 +1114,8 @@ pub struct CreateChatCompletionResponse {
 
 /// Parsed server side events stream until an \[DONE\] is received from server.
 #[cfg(feature = "_api")]
-pub type ChatCompletionResponseStream = OpenAIEventStream<CreateChatCompletionStreamResponse>;
+pub type ChatCompletionResponseStream =
+    crate::client::OpenAIEventStream<CreateChatCompletionStreamResponse>;
 
 #[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
 pub struct FunctionCallStream {

async-openai/src/types/images/stream.rs

@@ -103,11 +103,10 @@ pub enum ImageEditStreamEvent {
 }
 
 #[cfg(feature = "_api")]
-pub type ImageEditStream = OpenAIFormEventStream<ImageEditStreamEvent>;
+pub type ImageEditStream = crate::client::OpenAIFormEventStream<ImageEditStreamEvent>;
 
 #[cfg(feature = "_api")]
-pub type ImageGenStream = OpenAIEventStream<ImageGenStreamEvent>;
-
+pub type ImageGenStream = crate::client::OpenAIEventStream<ImageGenStreamEvent>;
 
 #[cfg(feature = "_api")]
 macro_rules! impl_event_type {

async-openai/src/types/impls.rs

@@ -1,3 +1,9 @@
+#[cfg(any(
+    feature = "audio-types",
+    feature = "file-types",
+    feature = "image-types"
+))]
+use crate::types::InputSource;
 #[cfg(feature = "audio-types")]
 use crate::types::audio::AudioInput;
 #[cfg(any(feature = "chat-completion-types", feature = "completion-types"))]
@@ -10,12 +16,6 @@ use crate::types::files::FileInput;
 use crate::types::moderations::ModerationInput;
 #[cfg(feature = "image-types")]
 use crate::types::shared::ImageInput;
-#[cfg(any(
-    feature = "audio-types",
-    feature = "file-types",
-    feature = "image-types"
-))]
-use crate::types::InputSource;
 
 /// for `impl_from!(T, Enum)`, implements
 /// - `From<T>`

async-openai/src/types/input_source.rs

@@ -1,8 +1,5 @@
 #[derive(Debug, Clone, PartialEq)]
 pub enum InputSource {
-    Path {
-        path: std::path::PathBuf,
-    },
     Bytes {
         filename: String,
         bytes: bytes::Bytes,
@@ -15,8 +12,9 @@ pub enum InputSource {
 
 impl Default for InputSource {
     fn default() -> Self {
-        InputSource::Path {
-            path: std::path::PathBuf::new(),
+        InputSource::VecU8 {
+            filename: String::default(),
+            vec: Vec::new(),
         }
     }
 }