fix fmt

key4ng · key4ng · commit 1655cc3db822 · 2025-11-25T08:24:45.000Z
diff --git a/sgl-router/src/routers/openai/context.rs b/sgl-router/src/routers/openai/context.rs
@@ -10,6 +10,7 @@ use dashmap::DashMap;
 use reqwest::StatusCode;
 use serde_json::Value;
 
+use super::mcp::ToolLoopState;
 use crate::{
     core::CircuitBreaker,
     data_connector::{ConversationItemStorage, ConversationStorage, ResponseStorage},
@@ -20,8 +21,6 @@ use crate::{
     },
 };
 
-use super::mcp::ToolLoopState;
-
 // ============================================================================
 // Main Request Context
 // ============================================================================
@@ -253,9 +252,7 @@ impl RequestContext {
     pub fn model(&self) -> &str {
         match &self.input.request_type {
             RequestType::Chat(req) => &req.model,
-            RequestType::Responses(req) => {
-                self.input.model_id.as_deref().unwrap_or(&req.model)
-            }
+            RequestType::Responses(req) => self.input.model_id.as_deref().unwrap_or(&req.model),
         }
     }
 }
diff --git a/sgl-router/src/routers/openai/pipeline.rs b/sgl-router/src/routers/openai/pipeline.rs
@@ -103,14 +103,9 @@ impl RequestPipeline {
 
         // Return final response
         match ctx.state.final_response {
-            Some(final_resp) => {
-                (StatusCode::OK, Json(final_resp.json_response)).into_response()
-            }
+            Some(final_resp) => (StatusCode::OK, Json(final_resp.json_response)).into_response(),
             None => {
-                error!(
-                    function = "execute",
-                    "No response produced by pipeline"
-                );
+                error!(function = "execute", "No response produced by pipeline");
                 (
                     StatusCode::INTERNAL_SERVER_ERROR,
                     Json(serde_json::json!({
diff --git a/sgl-router/src/routers/openai/router.rs b/sgl-router/src/routers/openai/router.rs
@@ -29,9 +29,7 @@ use super::{
 };
 use crate::{
     core::{CircuitBreaker, CircuitBreakerConfig as CoreCircuitBreakerConfig},
-    data_connector::{
-        ConversationItemStorage, ConversationStorage, ResponseId, ResponseStorage,
-    },
+    data_connector::{ConversationItemStorage, ConversationStorage, ResponseId, ResponseStorage},
     mcp::McpManager,
     protocols::{
         chat::ChatCompletionRequest,
diff --git a/sgl-router/src/routers/openai/stages/context_loading.rs b/sgl-router/src/routers/openai/stages/context_loading.rs
@@ -6,7 +6,11 @@
 //! - Builds conversation context for the request
 
 use async_trait::async_trait;
-use axum::{http::StatusCode, response::{IntoResponse, Response}, Json};
+use axum::{
+    http::StatusCode,
+    response::{IntoResponse, Response},
+    Json,
+};
 use serde_json::json;
 use tracing::warn;
 
@@ -150,10 +154,7 @@ impl PipelineStage for ContextLoadingStage {
                                         });
                                     }
                                     Err(e) => {
-                                        warn!(
-                                            "Failed to deserialize message content: {}",
-                                            e
-                                        );
+                                        warn!("Failed to deserialize message content: {}", e);
                                     }
                                 }
                             }
@@ -164,10 +165,7 @@ impl PipelineStage for ContextLoadingStage {
                                 ) {
                                     Ok(func_call) => conversation_items.push(func_call),
                                     Err(e) => {
-                                        warn!(
-                                            "Failed to deserialize function_call: {}",
-                                            e
-                                        );
+                                        warn!("Failed to deserialize function_call: {}", e);
                                     }
                                 }
                             }
@@ -180,10 +178,7 @@ impl PipelineStage for ContextLoadingStage {
                                         conversation_items.push(func_output);
                                     }
                                     Err(e) => {
-                                        warn!(
-                                            "Failed to deserialize function_call_output: {}",
-                                            e
-                                        );
+                                        warn!("Failed to deserialize function_call_output: {}", e);
                                     }
                                 }
                             }
diff --git a/sgl-router/src/routers/openai/stages/discovery.rs b/sgl-router/src/routers/openai/stages/discovery.rs
@@ -8,7 +8,10 @@
 use std::time::{Duration, Instant};
 
 use async_trait::async_trait;
-use axum::{http::StatusCode, response::{IntoResponse, Response}};
+use axum::{
+    http::StatusCode,
+    response::{IntoResponse, Response},
+};
 
 use super::PipelineStage;
 use crate::routers::openai::{
@@ -243,7 +246,10 @@ mod tests {
 
     #[tokio::test]
     async fn test_discovery_stage_cache_hit() {
-        let worker_urls = vec!["http://localhost:8000".to_string(), "http://localhost:8001".to_string()];
+        let worker_urls = vec![
+            "http://localhost:8000".to_string(),
+            "http://localhost:8001".to_string(),
+        ];
         let components = create_test_components(worker_urls.clone()).await;
 
         // Pre-populate cache
diff --git a/sgl-router/src/routers/openai/stages/execution.rs b/sgl-router/src/routers/openai/stages/execution.rs
@@ -10,10 +10,7 @@
 use async_trait::async_trait;
 use axum::{
     body::Body,
-    http::{
-        header::CONTENT_TYPE,
-        HeaderValue, StatusCode,
-    },
+    http::{header::CONTENT_TYPE, HeaderValue, StatusCode},
     response::{IntoResponse, Response},
 };
 use futures::StreamExt;
@@ -89,8 +86,8 @@ impl PipelineStage for RequestExecutionStage {
             }
         };
 
-        let status =
-            StatusCode::from_u16(resp.status().as_u16()).unwrap_or(StatusCode::INTERNAL_SERVER_ERROR);
+        let status = StatusCode::from_u16(resp.status().as_u16())
+            .unwrap_or(StatusCode::INTERNAL_SERVER_ERROR);
 
         // Handle streaming responses - return early
         if payload_output.is_streaming {
@@ -115,8 +112,7 @@ impl PipelineStage for RequestExecutionStage {
                 }
             });
 
-            let mut response =
-                Response::new(Body::from_stream(UnboundedReceiverStream::new(rx)));
+            let mut response = Response::new(Body::from_stream(UnboundedReceiverStream::new(rx)));
             *response.status_mut() = status;
             response
                 .headers_mut()
diff --git a/sgl-router/src/routers/openai/stages/mcp_preparation.rs b/sgl-router/src/routers/openai/stages/mcp_preparation.rs
@@ -57,10 +57,7 @@ impl McpPreparationStage {
 
             if !tools_json.is_empty() {
                 obj.insert("tools".to_string(), Value::Array(tools_json));
-                obj.insert(
-                    "tool_choice".to_string(),
-                    Value::String("auto".to_string()),
-                );
+                obj.insert("tool_choice".to_string(), Value::String("auto".to_string()));
             }
         }
     }
diff --git a/sgl-router/src/routers/openai/stages/mod.rs b/sgl-router/src/routers/openai/stages/mod.rs
@@ -31,21 +31,21 @@ pub trait PipelineStage: Send + Sync {
 // Stage Modules (imported here)
 // ============================================================================
 
-mod validation;
-mod discovery;
 mod context_loading;
-mod request_building;
-mod mcp_preparation;
+mod discovery;
 mod execution;
-mod response_processing;
+mod mcp_preparation;
 mod persistence;
+mod request_building;
+mod response_processing;
+mod validation;
 
 // Export stage implementations
-pub use validation::ValidationStage;
-pub use discovery::ModelDiscoveryStage;
 pub use context_loading::ContextLoadingStage;
-pub use request_building::RequestBuildingStage;
-pub use mcp_preparation::McpPreparationStage;
+pub use discovery::ModelDiscoveryStage;
 pub use execution::RequestExecutionStage;
-pub use response_processing::ResponseProcessingStage;
+pub use mcp_preparation::McpPreparationStage;
 pub use persistence::PersistenceStage;
+pub use request_building::RequestBuildingStage;
+pub use response_processing::ResponseProcessingStage;
+pub use validation::ValidationStage;
diff --git a/sgl-router/src/routers/openai/stages/persistence.rs b/sgl-router/src/routers/openai/stages/persistence.rs
@@ -7,7 +7,11 @@
 //! - Returns final JSON response
 
 use async_trait::async_trait;
-use axum::{http::StatusCode, response::{IntoResponse, Response}, Json};
+use axum::{
+    http::StatusCode,
+    response::{IntoResponse, Response},
+    Json,
+};
 use tracing::warn;
 
 use super::PipelineStage;
@@ -37,7 +41,9 @@ impl PipelineStage for PersistenceStage {
             RequestType::Responses(req) => req,
             RequestType::Chat(_) => {
                 // For chat requests, just return the JSON response
-                return Ok(Some((StatusCode::OK, Json(processed.json_response)).into_response()));
+                return Ok(Some(
+                    (StatusCode::OK, Json(processed.json_response)).into_response(),
+                ));
             }
         };
 
@@ -100,9 +106,7 @@ mod tests {
             chat::{ChatCompletionRequest, ChatMessage, MessageContent},
             responses::{ResponseInput, ResponsesRequest},
         },
-        routers::openai::context::{
-            ProcessedResponse, RequestInput, SharedComponents,
-        },
+        routers::openai::context::{ProcessedResponse, RequestInput, SharedComponents},
     };
 
     async fn create_test_components(worker_urls: Vec<String>) -> Arc<SharedComponents> {
diff --git a/sgl-router/src/routers/openai/stages/request_building.rs b/sgl-router/src/routers/openai/stages/request_building.rs
@@ -10,7 +10,10 @@
 use std::collections::HashSet;
 
 use async_trait::async_trait;
-use axum::{http::StatusCode, response::{IntoResponse, Response}};
+use axum::{
+    http::StatusCode,
+    response::{IntoResponse, Response},
+};
 use once_cell::sync::Lazy;
 use serde_json::{to_value, Value};
 
@@ -408,7 +411,10 @@ mod tests {
 
         // First item should be the conversation history
         let first_item = input_arr[0].as_object().unwrap();
-        assert_eq!(first_item.get("role").and_then(|v| v.as_str()), Some("user"));
+        assert_eq!(
+            first_item.get("role").and_then(|v| v.as_str()),
+            Some("user")
+        );
 
         // Second item should be current request
         let second_item = input_arr[1].as_object().unwrap();
diff --git a/sgl-router/src/routers/openai/stages/response_processing.rs b/sgl-router/src/routers/openai/stages/response_processing.rs
@@ -7,7 +7,11 @@
 //! - Stores parsed JSON response
 
 use async_trait::async_trait;
-use axum::{http::StatusCode, response::{IntoResponse, Response}, Json};
+use axum::{
+    http::StatusCode,
+    response::{IntoResponse, Response},
+    Json,
+};
 use serde_json::{json, Value};
 
 use super::PipelineStage;
@@ -141,7 +145,9 @@ impl PipelineStage for ResponseProcessingStage {
         ctx.components.circuit_breaker.record_success();
 
         // Store processed response
-        ctx.state.processed = Some(ProcessedResponse { json_response: response_json });
+        ctx.state.processed = Some(ProcessedResponse {
+            json_response: response_json,
+        });
 
         Ok(None)
     }
@@ -168,10 +174,10 @@ mod tests {
             chat::{ChatCompletionRequest, ChatMessage, MessageContent},
             responses::{ResponseInput, ResponsesRequest},
         },
-        routers::openai::context::{
-            DiscoveryOutput, McpOutput, PayloadOutput, RequestInput, SharedComponents,
+        routers::openai::{
+            context::{DiscoveryOutput, McpOutput, PayloadOutput, RequestInput, SharedComponents},
+            mcp::ToolLoopState,
         },
-        routers::openai::mcp::ToolLoopState,
     };
 
     async fn create_test_components(worker_urls: Vec<String>) -> Arc<SharedComponents> {
diff --git a/sgl-router/src/routers/openai/stages/validation.rs b/sgl-router/src/routers/openai/stages/validation.rs
@@ -8,7 +8,10 @@
 use std::time::Instant;
 
 use async_trait::async_trait;
-use axum::{http::StatusCode, response::{IntoResponse, Response}};
+use axum::{
+    http::StatusCode,
+    response::{IntoResponse, Response},
+};
 
 use super::PipelineStage;
 use crate::routers::openai::{
diff --git a/sgl-router/src/routers/openai/tests.rs b/sgl-router/src/routers/openai/tests.rs
@@ -6,6 +6,10 @@ use std::sync::Arc;
 
 use dashmap::DashMap;
 
+use super::{
+    context::{RequestType, SharedComponents},
+    pipeline::RequestPipeline,
+};
 use crate::{
     core::CircuitBreaker,
     data_connector::{
@@ -15,11 +19,6 @@ use crate::{
     protocols::chat::ChatCompletionRequest,
 };
 
-use super::{
-    context::{RequestType, SharedComponents},
-    pipeline::RequestPipeline,
-};
-
 /// Helper to create test components
 async fn create_test_components() -> Arc<SharedComponents> {
     let client = reqwest::Client::new();
@@ -119,12 +118,7 @@ async fn test_pipeline_executes_without_panic() {
     // Execute pipeline (will fail at some stage since we don't have a real server,
     // but should not panic)
     let response = pipeline
-        .execute(
-            RequestType::Chat(Arc::new(request)),
-            None,
-            None,
-            components,
-        )
+        .execute(RequestType::Chat(Arc::new(request)), None, None, components)
         .await;
 
     // Response should be an error (since we're hitting localhost with no server)

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,11 @@`
`6`	`6`	`//! - Builds conversation context for the request`
`7`	`7`
`8`	`8`	`use async_trait::async_trait;`
`9`		`-use axum::{http::StatusCode, response::{IntoResponse, Response}, Json};`
	`9`	`+use axum::{`
	`10`	`+ http::StatusCode,`
	`11`	`+ response::{IntoResponse, Response},`
	`12`	`+ Json,`
	`13`	`+};`
`10`	`14`	`use serde_json::json;`
`11`	`15`	`use tracing::warn;`
`12`	`16`
`@@ -150,10 +154,7 @@ impl PipelineStage for ContextLoadingStage {`
`150`	`154`	`});`
`151`	`155`	`}`
`152`	`156`	`Err(e) => {`
`153`		`- warn!(`
`154`		`- "Failed to deserialize message content: {}",`
`155`		`- e`
`156`		`- );`
	`157`	`+ warn!("Failed to deserialize message content: {}", e);`
`157`	`158`	`}`
`158`	`159`	`}`
`159`	`160`	`}`
`@@ -164,10 +165,7 @@ impl PipelineStage for ContextLoadingStage {`
`164`	`165`	`) {`
`165`	`166`	`Ok(func_call) => conversation_items.push(func_call),`
`166`	`167`	`Err(e) => {`
`167`		`- warn!(`
`168`		`- "Failed to deserialize function_call: {}",`
`169`		`- e`
`170`		`- );`
	`168`	`+ warn!("Failed to deserialize function_call: {}", e);`
`171`	`169`	`}`
`172`	`170`	`}`
`173`	`171`	`}`
`@@ -180,10 +178,7 @@ impl PipelineStage for ContextLoadingStage {`
`180`	`178`	`conversation_items.push(func_output);`
`181`	`179`	`}`
`182`	`180`	`Err(e) => {`
`183`		`- warn!(`
`184`		`- "Failed to deserialize function_call_output: {}",`
`185`		`- e`
`186`		`- );`
	`181`	`+ warn!("Failed to deserialize function_call_output: {}", e);`
`187`	`182`	`}`
`188`	`183`	`}`
`189`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,7 @@ impl McpPreparationStage {`
`57`	`57`
`58`	`58`	`if !tools_json.is_empty() {`
`59`	`59`	`obj.insert("tools".to_string(), Value::Array(tools_json));`
`60`		`- obj.insert(`
`61`		`- "tool_choice".to_string(),`
`62`		`- Value::String("auto".to_string()),`
`63`		`- );`
	`60`	`+ obj.insert("tool_choice".to_string(), Value::String("auto".to_string()));`
`64`	`61`	`}`
`65`	`62`	`}`
`66`	`63`	`}`