EngineX-Hygon/sglang
5
0
Fork 0
Code Issues Pull Requests Actions 7 Projects Releases Wiki Activity

[router][grpc] Add dependencies in Cargo.toml to support chat template rendering (#11342)

Browse Source
This commit is contained in:
Chang Su
2025-10-08 15:38:37 -07:00
committed by GitHub
parent 7ac6b900f4
commit fccac7d126
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sgl-router/Cargo.toml
View File

@@ -57,7 +57,7 @@ tokio-stream = { version = "0.1", features = ["sync"] }
anyhow = "1.0" anyhow = "1.0"
tokenizers = { version = "0.22.0" } tokenizers = { version = "0.22.0" }
tiktoken-rs = { version = "0.7.0" } tiktoken-rs = { version = "0.7.0" }
minijinja = { version = "2.0", features = ["unstable_machinery"] } minijinja = { version = "2.0", features = ["unstable_machinery", "json", "builtins"] }
rustls = { version = "0.23", default-features = false, features = ["ring", "std"] } rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
hf-hub = { version = "0.4.3", features = ["tokio"] } hf-hub = { version = "0.4.3", features = ["tokio"] }
rmcp = { version = "0.6.3", features = ["client", "server", rmcp = { version = "0.6.3", features = ["client", "server",

9
sgl-router/src/tool_parser/parsers/json_parser.rs
View File

@@ -174,11 +174,6 @@ impl JsonParser {
Ok(tools) Ok(tools)
} }
/// Check if text contains tool calls
fn has_tool_call(&self, text: &str) -> bool {
text.contains('[') || text.contains('{')
}
} }
impl Default for JsonParser { impl Default for JsonParser {
@@ -216,7 +211,7 @@ impl ToolParser for JsonParser {
let current_text = &self.buffer.clone(); let current_text = &self.buffer.clone();
// Check if current_text has tool_call // Check if current_text has tool_call
let has_tool_start = self.has_tool_call(current_text) let has_tool_start = self.has_tool_markers(current_text)
|| (self.current_tool_id >= 0 && current_text.starts_with(self.tool_call_separator)); || (self.current_tool_id >= 0 && current_text.starts_with(self.tool_call_separator));
if !has_tool_start { if !has_tool_start {
@@ -263,7 +258,7 @@ impl ToolParser for JsonParser {
fn has_tool_markers(&self, text: &str) -> bool { fn has_tool_markers(&self, text: &str) -> bool {
let trimmed = text.trim(); let trimmed = text.trim();
(trimmed.starts_with('[') || trimmed.starts_with('{')) && trimmed.contains(r#""name""#) trimmed.starts_with('[') || trimmed.starts_with('{')
} }
fn get_unstreamed_tool_args(&self) -> Option<Vec<ToolCallItem>> { fn get_unstreamed_tool_args(&self) -> Option<Vec<ToolCallItem>> {

10
sgl-router/src/tool_parser/parsers/llama_parser.rs
View File

@@ -121,11 +121,6 @@ impl LlamaParser {
Ok(all_tools) Ok(all_tools)
} }
/// Check if text has tool call
fn has_tool_call(&self, text: &str) -> bool {
text.contains("<|python_tag|>") || text.contains('{')
}
} }
impl Default for LlamaParser { impl Default for LlamaParser {
@@ -184,7 +179,7 @@ impl ToolParser for LlamaParser {
let current_text = &self.buffer.clone(); let current_text = &self.buffer.clone();
// Check if current_text has tool_call // Check if current_text has tool_call
let has_tool_start = self.has_tool_call(current_text) let has_tool_start = self.has_tool_markers(current_text)
|| (self.current_tool_id >= 0 && current_text.starts_with(self.tool_call_separator)); || (self.current_tool_id >= 0 && current_text.starts_with(self.tool_call_separator));
if !has_tool_start { if !has_tool_start {
@@ -230,8 +225,7 @@ impl ToolParser for LlamaParser {
fn has_tool_markers(&self, text: &str) -> bool { fn has_tool_markers(&self, text: &str) -> bool {
// Llama format if contains python_tag or starts with JSON object // Llama format if contains python_tag or starts with JSON object
text.contains("<|python_tag|>") text.contains("<|python_tag|>") || text.trim_start().starts_with('{')
|| (text.trim_start().starts_with('{') && text.contains(r#""name""#))
} }
fn get_unstreamed_tool_args(&self) -> Option<Vec<crate::tool_parser::types::ToolCallItem>> { fn get_unstreamed_tool_args(&self) -> Option<Vec<crate::tool_parser::types::ToolCallItem>> {

1
sgl-router/tests/tool_parser_llama.rs
View File

@@ -119,7 +119,6 @@ async fn test_llama_format_detection() {
assert!(parser.has_tool_markers(r#"<|python_tag|>{"name": "test"}"#)); assert!(parser.has_tool_markers(r#"<|python_tag|>{"name": "test"}"#));
assert!(parser.has_tool_markers(r#"{"name": "test", "parameters": {}}"#)); assert!(parser.has_tool_markers(r#"{"name": "test", "parameters": {}}"#));
assert!(!parser.has_tool_markers("plain text")); assert!(!parser.has_tool_markers("plain text"));
assert!(!parser.has_tool_markers(r#"{"key": "value"}"#)); // No name field
} }
#[tokio::test] #[tokio::test]