fix: wasm missing generic + fmt

rig-core/examples/anthropic_streaming.rs

@@ -19,13 +19,11 @@ async fn main() -> Result<(), anyhow::Error> {
 
     stream_to_stdout(agent, &mut stream).await?;
 
-
     if let Some(response) = stream.response {
         println!("Usage: {:?} tokens", response.usage.output_tokens);
     };
 
     println!("Message: {:?}", stream.message);
-    
-    
+
     Ok(())
 }

rig-core/examples/gemini_streaming.rs

@@ -20,7 +20,10 @@ async fn main() -> Result<(), anyhow::Error> {
     stream_to_stdout(agent, &mut stream).await?;
 
     if let Some(response) = stream.response {
-        println!("Usage: {:?} tokens", response.usage_metadata.total_token_count);
+        println!(
+            "Usage: {:?} tokens",
+            response.usage_metadata.total_token_count
+        );
     };
 
     println!("Message: {:?}", stream.message);

rig-core/examples/gemini_streaming_with_tools.rs

@@ -109,10 +109,13 @@ async fn main() -> Result<(), anyhow::Error> {
     stream_to_stdout(calculator_agent, &mut stream).await?;
 
     if let Some(response) = stream.response {
-        println!("Usage: {:?} tokens", response.usage_metadata.total_token_count);
+        println!(
+            "Usage: {:?} tokens",
+            response.usage_metadata.total_token_count
+        );
     };
 
     println!("Message: {:?}", stream.message);
-    
+
     Ok(())
 }

rig-core/examples/ollama_streaming_with_tools.rs

@@ -113,6 +113,6 @@ async fn main() -> Result<(), anyhow::Error> {
     };
 
     println!("Message: {:?}", stream.message);
-    
+
     Ok(())
 }

rig-core/examples/openai_streaming.rs

@@ -16,11 +16,11 @@ async fn main() -> Result<(), anyhow::Error> {
         .await?;
 
     stream_to_stdout(agent, &mut stream).await?;
-    
+
     if let Some(response) = stream.response {
         println!("Usage: {:?}", response.usage)
     };
-    
+
     println!("Message: {:?}", stream.message);
 
     Ok(())

rig-core/examples/openai_streaming_with_tools.rs

@@ -107,12 +107,12 @@ async fn main() -> Result<(), anyhow::Error> {
     println!("Calculate 2 - 5");
     let mut stream = calculator_agent.stream_prompt("Calculate 2 - 5").await?;
     stream_to_stdout(calculator_agent, &mut stream).await?;
-    
+
     if let Some(response) = stream.response {
         println!("Usage: {:?}", response.usage)
     };
 
     println!("Message: {:?}", stream.message);
-    
+
     Ok(())
 }

rig-core/src/providers/gemini/streaming.rs

@@ -3,7 +3,6 @@ use futures::StreamExt;
 use serde::Deserialize;
 
 use super::completion::{create_request_body, gemini_api_types::ContentCandidate, CompletionModel};
-use crate::providers::gemini::completion::gemini_api_types::UsageMetadata;
 use crate::{
     completion::{CompletionError, CompletionRequest},
     streaming::{self, StreamingCompletionModel},

rig-core/src/providers/ollama.rs

@@ -486,7 +486,7 @@ impl StreamingCompletionModel for CompletionModel {
                             continue;
                         }
                     }
-                    
+
                     if response.done {
                         yield Ok(RawStreamingChoice::FinalResponse(StreamingCompletionResponse {
                             total_duration: response.total_duration,

rig-core/src/providers/openai/streaming.rs

@@ -92,7 +92,7 @@ pub async fn send_compatible_streaming_request(
             prompt_tokens: 0,
             total_tokens: 0
         };
-        
+
         let mut partial_data = None;
         let mut calls: HashMap<usize, (String, String)> = HashMap::new();
 
@@ -183,9 +183,12 @@ pub async fn send_compatible_streaming_request(
                         }
                     }
 
-                 
+                    if let Some(content) = &choice.delta.content {
+                        yield Ok(streaming::RawStreamingChoice::Message(content.clone()))
+                    }
                 }
 
+
                 if let Some(usage) = data.usage {
                     final_usage = usage.clone();
                 }

rig-core/src/streaming.rs

@@ -61,7 +61,8 @@ pub type StreamingResult<R> =
     Pin<Box<dyn Stream<Item = Result<RawStreamingChoice<R>, CompletionError>> + Send>>;
 
 #[cfg(target_arch = "wasm32")]
-pub type StreamingResult = Pin<Box<dyn Stream<Item = Result<RawStreamingChoice, CompletionError>>>>;
+pub type StreamingResult<R> =
+    Pin<Box<dyn Stream<Item = Result<RawStreamingChoice<R>, CompletionError>>>>;
 
 pub struct StreamingCompletionResponse<R: Clone + Unpin> {
     inner: StreamingResult<R>,
@@ -92,14 +93,13 @@ impl<R: Clone + Unpin> Stream for StreamingCompletionResponse<R> {
         match stream.inner.as_mut().poll_next(cx) {
             Poll::Pending => Poll::Pending,
             Poll::Ready(None) => {
-
                 let mut content = vec![];
 
                 stream.tool_calls.iter().for_each(|(n, d, a)| {
                     content.push(AssistantContent::tool_call(n, d, a.clone()));
                 });
 
-                if content.len() == 0 || stream.text.len() > 0 {
+                if content.is_empty() || !stream.text.is_empty() {
                     content.insert(0, AssistantContent::text(stream.text.clone()));
                 }
 
@@ -107,9 +107,9 @@ impl<R: Clone + Unpin> Stream for StreamingCompletionResponse<R> {
                     content: OneOrMany::many(content)
                         .expect("There should be at least one assistant message"),
                 };
-                
+
                 Poll::Ready(None)
-            },
+            }
             Poll::Ready(Some(Err(err))) => Poll::Ready(Some(Err(err))),
             Poll::Ready(Some(Ok(choice))) => match choice {
                 RawStreamingChoice::Message(text) => {