fix issues due to cherry-pick

Author: ifsheldon

Cargo.toml

@@ -5,4 +5,4 @@ default-members = ["async-openai-wasm", "async-openai-*"]
 resolver = "2"
 
 [workspace.package]
-rust-version = "1.75"
+rust-version = "1.85"

async-openai-macros/src/lib.rs

@@ -13,13 +13,15 @@ struct BoundArgs {
     bounds: Vec<(String, syn::TypeParamBound)>,
     where_clause: Option<String>,
     stream: bool, // Add stream flag
+    use_mapped_events: bool,
 }
 
 impl Parse for BoundArgs {
     fn parse(input: ParseStream) -> syn::Result<Self> {
         let mut bounds = Vec::new();
         let mut where_clause = None;
         let mut stream = false; // Default to false
+        let mut use_mapped_events = false; // Default to false
         let vars = Punctuated::<syn::MetaNameValue, Comma>::parse_terminated(input)?;
 
         for var in vars {
@@ -31,6 +33,9 @@ impl Parse for BoundArgs {
                 "stream" => {
                     stream = var.value.into_token_stream().to_string().contains("true");
                 }
+                "use_mapped_events" => {
+                    use_mapped_events = var.value.into_token_stream().to_string().contains("true");
+                }
                 _ => {
                     let bound: syn::TypeParamBound =
                         syn::parse_str(&var.value.into_token_stream().to_string())?;
@@ -42,6 +47,7 @@ impl Parse for BoundArgs {
             bounds,
             where_clause,
             stream,
+            use_mapped_events,
         })
     }
 }
@@ -124,7 +130,11 @@ pub fn byot(args: TokenStream, item: TokenStream) -> TokenStream {
 
     // Generate return type based on stream flag
     let return_type = if bounds_args.stream {
-        quote! { Result<::std::pin::Pin<Box<dyn ::futures::Stream<Item = Result<R, OpenAIError>> + Send>>, OpenAIError> }
+        if bounds_args.use_mapped_events {
+            quote! { Result<crate::client::OpenAIEventMappedStream<R>, OpenAIError> }
+        } else {
+            quote! { Result<crate::client::OpenAIEventStream<R>, OpenAIError> }
+        }
     } else {
         quote! { Result<R, OpenAIError> }
     };

async-openai-wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "async-openai-wasm"
-version = "0.27.4"
+version = "0.28.0"
 authors = [
     "Contributors of the async-openai crate",
     "ifsheldon <async_openai_wasm@reify.ing>"
@@ -9,7 +9,7 @@ categories = ["api-bindings", "web-programming", "asynchronous"]
 keywords = ["openai", "async", "openapi", "ai", "wasm"]
 description = "Rust library for OpenAI on WASM"
 edition = "2024"
-rust-version = "1.85"
+rust-version = {workspace = true}
 license = "MIT"
 readme = "README.md"
 homepage = "https://github.com/ifsheldon/async-openai-wasm"
@@ -26,8 +26,10 @@ native-tls = ["reqwest/native-tls"]
 # Remove dependency on OpenSSL
 native-tls-vendored = ["reqwest/native-tls-vendored"]
 realtime = []
+byot = []
 
 [dependencies]
+async-openai-macros = { path = "../async-openai-macros", version = "0.1.0" }
 base64 = "0.22"
 futures = "0.3"
 reqwest = { version = "0.12", features = ["json", "stream", "multipart"], default-features = false }
@@ -50,6 +52,11 @@ getrandom = { version = "0.2", features = ["js"] }
 [dev-dependencies]
 tokio-test = "0.4"
 tokio = { version = "1.43", features = ["fs", "macros"] }
+serde_json = "1.0"
+
+[[test]]
+name = "bring-your-own-type"
+required-features = ["byot"]
 
 [package.metadata.docs.rs]
 all-features = true

async-openai-wasm/src/assistants.rs

@@ -1,13 +1,13 @@
 use serde::Serialize;
 
 use crate::{
+    Client,
     config::Config,
     error::OpenAIError,
     types::{
         AssistantObject, CreateAssistantRequest, DeleteAssistantResponse, ListAssistantsResponse,
         ModifyAssistantRequest,
     },
-    Client,
 };
 
 /// Build assistants that can call models and use tools to perform tasks.

async-openai-wasm/src/audio.rs

@@ -1,6 +1,7 @@
 use bytes::Bytes;
 
 use crate::{
+    Client,
     config::Config,
     error::OpenAIError,
     types::{
@@ -9,7 +10,6 @@ use crate::{
         CreateTranslationRequest, CreateTranslationResponseJson,
         CreateTranslationResponseVerboseJson,
     },
-    Client,
 };
 
 /// Turn audio into text or text into audio.

async-openai-wasm/src/audit_logs.rs

@@ -1,6 +1,6 @@
 use serde::Serialize;
 
-use crate::{config::Config, error::OpenAIError, types::ListAuditLogsResponse, Client};
+use crate::{Client, config::Config, error::OpenAIError, types::ListAuditLogsResponse};
 
 /// Logs of user actions and configuration changes within this organization.
 /// To log events, you must activate logging in the [Organization Settings](https://platform.openai.com/settings/organization/general).

async-openai-wasm/src/batches.rs

@@ -1,10 +1,10 @@
 use serde::Serialize;
 
 use crate::{
+    Client,
     config::Config,
     error::OpenAIError,
     types::{Batch, BatchRequest, ListBatchesResponse},
-    Client,
 };
 
 /// Create large batches of API requests for asynchronous processing. The Batch API returns completions within 24 hours for a 50% discount.

async-openai-wasm/src/chat.rs

@@ -1,10 +1,10 @@
 use crate::{
+    Client,
     config::Config,
     error::OpenAIError,
     types::{
         ChatCompletionResponseStream, CreateChatCompletionRequest, CreateChatCompletionResponse,
     },
-    Client,
 };
 
 /// Given a list of messages comprising a conversation, the model will return a response.

async-openai-wasm/src/client.rs

@@ -5,22 +5,21 @@ use std::task::{Context, Poll};
 
 use bytes::Bytes;
 use futures::stream::Filter;
-use futures::{stream::StreamExt, Stream};
+use futures::{Stream, stream::StreamExt};
 use pin_project::pin_project;
 use reqwest::multipart::Form;
 use reqwest_eventsource::{Event, EventSource, RequestBuilderExt};
-use serde::{de::DeserializeOwned, Serialize};
+use serde::{Serialize, de::DeserializeOwned};
 
-use crate::util::async_convert::AsyncTryFrom;
 use crate::{
+    Assistants, Audio, AuditLogs, Batches, Chat, Completions, Embeddings, FineTuning, Invites,
+    Models, Projects, Threads, Uploads, Users, VectorStores,
     config::{Config, OpenAIConfig},
-    error::{map_deserialization_error, OpenAIError, WrappedError},
+    error::{OpenAIError, WrappedError, map_deserialization_error},
     file::Files,
     image::Images,
     moderation::Moderations,
     traits::AsyncTryFrom,
-    Assistants, Audio, AuditLogs, Batches, Chat, Completions, Embeddings, FineTuning, Invites,
-    Models, Projects, Threads, Uploads, Users, VectorStores,
 };
 
 #[derive(Debug, Clone)]

async-openai-wasm/src/config.rs

@@ -1,5 +1,5 @@
 //! Client configurations: [OpenAIConfig] for OpenAI, [AzureConfig] for Azure OpenAI Service.
-use reqwest::header::{HeaderMap, AUTHORIZATION};
+use reqwest::header::{AUTHORIZATION, HeaderMap};
 use secrecy::{ExposeSecret, SecretString};
 use serde::Deserialize;