[WIP] SSE working

Author: wdoppenberg

rust-sdk/crates/ag-ui-client/src/http.rs

@@ -57,7 +57,7 @@ impl<StateT: AgentState, FwdPropsT: FwdProps> Agent<StateT, FwdPropsT> for HttpA
             .await
             .map(|result| match result {
                 Ok(event) => {
-                    trace!("Received event: {event:?}");
+                    // trace!("Received event: {event:?}");
                     let event_data: Event<StateT> = serde_json::from_str(&event.data)?;
                     trace!("Deserialized event: {event_data:?}");
                     Ok(event_data)

rust-sdk/crates/ag-ui-client/src/sse.rs

@@ -1,7 +1,6 @@
 use bytes::Bytes;
 use futures::{Stream, StreamExt};
 use reqwest::Response;
-use serde::de::DeserializeOwned;
 use thiserror::Error;
 use std::future::Future;
 

rust-sdk/crates/ag-ui-client/tests/http_agent_test.rs

@@ -1,7 +1,3 @@
-use std::process::{Child, Command};
-use std::time::Duration;
-use std::thread::sleep;
-
 use ag_ui_client::HttpAgent;
 use ag_ui_client::agent::{Agent, RunAgentParams};
 use ag_ui_core::types::message::{Message, Role};
@@ -11,45 +7,11 @@ use reqwest::header::{HeaderMap, HeaderValue};
 use serde_json::json;
 use uuid::Uuid;
 
-struct ServerProcess {
-    process: Child,
-}
-
-impl ServerProcess {
-    fn new() -> Self {
-        // Start the Python server
-        println!("Starting pydantic_ai_server.py...");
-        
-        // Get the current directory
-        let current_dir = std::env::current_dir().expect("Failed to get current directory");
-        let script_path = current_dir.join("scripts").join("pydantic_ai_server.py");
-        
-        println!("Script path: {:?}", script_path);
-
-        
-        let process = Command::new("uv")
-            .args(["run", &script_path.to_str().unwrap()])
-            .spawn()
-            .expect("Failed to start pydantic_ai_server.py");
-        
-        // Give the server some time to start up
-        sleep(Duration::from_secs(5));
-        
-        Self { process }
-    }
-}
-
-impl Drop for ServerProcess {
-    fn drop(&mut self) {
-        println!("Stopping pydantic_ai_server.py...");
-        let _ = self.process.kill();
-    }
-}
 
 #[tokio::test]
 async fn test_http_agent_basic_functionality() {
     env_logger::init();
-    
+
     // Create an HttpAgent
     let mut headers = HeaderMap::new();
     headers.insert("Content-Type", HeaderValue::from_static("application/json"));
@@ -105,9 +67,6 @@ async fn test_http_agent_basic_functionality() {
 
 #[tokio::test]
 async fn test_http_agent_tool_calls() {
-    // Start the server
-    let _server = ServerProcess::new();
-    
     // Create an HttpAgent
     let mut headers = HeaderMap::new();
     headers.insert("Content-Type", HeaderValue::from_static("application/json"));

rust-sdk/crates/ag-ui-core/src/types/ids.rs

@@ -1,3 +1,4 @@
+use std::ops::Deref;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
@@ -81,4 +82,37 @@ define_id_type!(AgentId);
 define_id_type!(ThreadId);
 define_id_type!(RunId);
 define_id_type!(MessageId);
-define_id_type!(ToolCallId);
+
+#[derive(Debug, PartialEq, Eq, Deserialize, Serialize, Clone)]
+pub struct ToolCallId(String);
+
+
+/// Tool Call ID
+///
+/// Does not follow UUID format, instead uses "call_xxxxxxxx"
+impl ToolCallId {
+    pub fn random() -> Self {
+        let uuid = &Uuid::new_v4().to_string()[..8];
+        let id = format!("call_{uuid}");
+        Self(id)
+    }
+}
+
+impl Deref for ToolCallId {
+    type Target = str;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    // Test whether tool call ID has same format as rest of AG-UI
+    #[test]
+    fn test_tool_call_random() {
+        let id = super::ToolCallId::random();
+        assert_eq!(id.0.len(), 5 + 8);
+        assert!(id.0.starts_with("call_"));
+        dbg!(id);
+    }
+}

rust-sdk/crates/ag-ui-core/src/types/message.rs

@@ -10,7 +10,7 @@ pub struct FunctionCall {
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(tag = "role", rename_all = "lowercase")]
+#[serde(rename_all = "lowercase")]
 pub enum Role {
     Developer,
     System,

rust-sdk/crates/ag-ui-core/tests/unit.rs

@@ -66,7 +66,7 @@ mod tests {
             arguments: "{}".to_string(),
         };
 
-        let tool_call = ToolCall::new(Uuid::new_v4(), function_call);
+        let tool_call = ToolCall::new(ToolCallId::random(), function_call);
         assert_eq!(tool_call.call_type, "function");
     }