sglangv0.5.2 & support Qwen3-Next-80B-A3B-Instruct
This commit is contained in:
386
sgl-router/src/reasoning_parser/parsers/base.rs
Normal file
386
sgl-router/src/reasoning_parser/parsers/base.rs
Normal file
@@ -0,0 +1,386 @@
|
||||
// Base implementation of reasoning parser that handles common logic
|
||||
// for detecting and extracting reasoning blocks from text.
|
||||
|
||||
use crate::reasoning_parser::traits::{ParseError, ParserConfig, ParserResult, ReasoningParser};
|
||||
use tracing as log;
|
||||
|
||||
/// Base reasoning parser implementation.
|
||||
///
|
||||
/// This parser handles the common logic for detecting reasoning blocks
|
||||
/// delimited by start and end tokens (e.g., <think> and </think>).
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct BaseReasoningParser {
|
||||
config: ParserConfig,
|
||||
in_reasoning: bool,
|
||||
buffer: String,
|
||||
stripped_think_start: bool,
|
||||
model_type: String,
|
||||
}
|
||||
|
||||
impl BaseReasoningParser {
|
||||
/// Create a new BaseReasoningParser with the given configuration.
|
||||
pub fn new(config: ParserConfig) -> Self {
|
||||
let in_reasoning = config.initial_in_reasoning;
|
||||
Self {
|
||||
config,
|
||||
in_reasoning,
|
||||
buffer: String::new(),
|
||||
stripped_think_start: false,
|
||||
model_type: "base".to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Create with custom model type identifier.
|
||||
pub fn with_model_type(mut self, model_type: String) -> Self {
|
||||
self.model_type = model_type;
|
||||
self
|
||||
}
|
||||
|
||||
/// Check if the current buffer is a prefix of one of the tokens.
|
||||
fn is_partial_token(&self, text: &str) -> bool {
|
||||
(self.config.think_start_token.starts_with(text) && self.config.think_start_token != text)
|
||||
|| (self.config.think_end_token.starts_with(text)
|
||||
&& self.config.think_end_token != text)
|
||||
}
|
||||
}
|
||||
|
||||
impl ReasoningParser for BaseReasoningParser {
|
||||
fn detect_and_parse_reasoning(&mut self, text: &str) -> Result<ParserResult, ParseError> {
|
||||
log::debug!("detect_and_parse_reasoning called with text: {:?}", text);
|
||||
|
||||
// Check input size against buffer limit
|
||||
if text.len() > self.config.max_buffer_size {
|
||||
return Err(ParseError::BufferOverflow(text.len()));
|
||||
}
|
||||
|
||||
let in_reasoning = self.in_reasoning || text.contains(&self.config.think_start_token);
|
||||
log::debug!("in_reasoning: {}", in_reasoning);
|
||||
|
||||
if !in_reasoning {
|
||||
log::debug!("No reasoning detected, returning normal text.");
|
||||
return Ok(ParserResult::normal(text.to_string()));
|
||||
}
|
||||
|
||||
// The text is considered to be in a reasoning block.
|
||||
let processed_text = text
|
||||
.replace(&self.config.think_start_token, "")
|
||||
.trim()
|
||||
.to_string();
|
||||
log::debug!(
|
||||
"Processed text after removing think_start_token: {:?}",
|
||||
processed_text
|
||||
);
|
||||
|
||||
if !processed_text.contains(&self.config.think_end_token) {
|
||||
log::debug!(
|
||||
"Reasoning truncated, think_end_token not found. Returning reasoning text."
|
||||
);
|
||||
// Assume reasoning was truncated before end token
|
||||
return Ok(ParserResult::reasoning(processed_text));
|
||||
}
|
||||
|
||||
// Extract reasoning content
|
||||
let splits: Vec<&str> = processed_text
|
||||
.splitn(2, &self.config.think_end_token)
|
||||
.collect();
|
||||
let reasoning_text = splits.first().unwrap_or(&"").to_string();
|
||||
let normal_text = splits
|
||||
.get(1)
|
||||
.map(|s| s.trim().to_string())
|
||||
.unwrap_or_default();
|
||||
|
||||
log::debug!("Extracted reasoning_text: {:?}", reasoning_text);
|
||||
log::debug!("Extracted normal_text: {:?}", normal_text);
|
||||
|
||||
Ok(ParserResult::new(normal_text, reasoning_text))
|
||||
}
|
||||
|
||||
fn parse_reasoning_streaming_incremental(
|
||||
&mut self,
|
||||
text: &str,
|
||||
) -> Result<ParserResult, ParseError> {
|
||||
// Check if adding this text would exceed buffer limit
|
||||
if self.buffer.len() + text.len() > self.config.max_buffer_size {
|
||||
return Err(ParseError::BufferOverflow(self.buffer.len() + text.len()));
|
||||
}
|
||||
|
||||
// Incrementally parse the streaming text
|
||||
self.buffer.push_str(text);
|
||||
let mut current_text = self.buffer.clone();
|
||||
|
||||
log::debug!(
|
||||
"parse_reasoning_streaming_incremental called with text: {:?}",
|
||||
text
|
||||
);
|
||||
log::debug!("current buffer: {:?}", self.buffer);
|
||||
log::debug!("current_text: {:?}", current_text);
|
||||
log::debug!(
|
||||
"in_reasoning: {}, stripped_think_start: {}, stream_reasoning: {}",
|
||||
self.in_reasoning,
|
||||
self.stripped_think_start,
|
||||
self.config.stream_reasoning
|
||||
);
|
||||
|
||||
// If the current text is a prefix of a token, keep buffering
|
||||
if self.is_partial_token(¤t_text) {
|
||||
return Ok(ParserResult::default());
|
||||
}
|
||||
|
||||
// Strip start token if present
|
||||
if !self.stripped_think_start && current_text.contains(&self.config.think_start_token) {
|
||||
current_text = current_text.replace(&self.config.think_start_token, "");
|
||||
self.buffer = current_text.clone();
|
||||
self.stripped_think_start = true;
|
||||
self.in_reasoning = true;
|
||||
}
|
||||
|
||||
// Handle end of reasoning block
|
||||
let think_end_idx = if self.in_reasoning {
|
||||
current_text
|
||||
.find(&self.config.think_end_token)
|
||||
.unwrap_or(current_text.len())
|
||||
} else {
|
||||
current_text.len()
|
||||
};
|
||||
|
||||
if self.in_reasoning && think_end_idx < current_text.len() {
|
||||
let reasoning_text = ¤t_text[..think_end_idx];
|
||||
self.buffer.clear();
|
||||
self.in_reasoning = false;
|
||||
let start_idx = think_end_idx + self.config.think_end_token.len();
|
||||
let normal_text = if start_idx < current_text.len() {
|
||||
¤t_text[start_idx..]
|
||||
} else {
|
||||
""
|
||||
};
|
||||
return Ok(ParserResult::new(
|
||||
normal_text.to_string(),
|
||||
reasoning_text.trim().to_string(),
|
||||
));
|
||||
}
|
||||
|
||||
// Continue with reasoning content
|
||||
if self.in_reasoning && self.config.stream_reasoning {
|
||||
// Stream the content immediately
|
||||
let reasoning_text = current_text;
|
||||
self.buffer.clear();
|
||||
Ok(ParserResult::reasoning(reasoning_text))
|
||||
} else if !self.in_reasoning {
|
||||
// If we're not in a reasoning block, return as normal text
|
||||
// CRITICAL FIX: Return current_text (with buffer) not just text
|
||||
// This prevents buffer loss when partial tokens are followed by normal text
|
||||
let normal_text = current_text;
|
||||
self.buffer.clear();
|
||||
Ok(ParserResult::normal(normal_text))
|
||||
} else {
|
||||
// If we are in a reasoning block but no end token is found, buffer it
|
||||
Ok(ParserResult::default())
|
||||
}
|
||||
}
|
||||
|
||||
fn reset(&mut self) {
|
||||
self.in_reasoning = self.config.initial_in_reasoning;
|
||||
self.buffer.clear();
|
||||
self.stripped_think_start = false;
|
||||
}
|
||||
|
||||
fn model_type(&self) -> &str {
|
||||
&self.model_type
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn create_test_parser(
|
||||
initial_in_reasoning: bool,
|
||||
stream_reasoning: bool,
|
||||
) -> BaseReasoningParser {
|
||||
let config = ParserConfig {
|
||||
think_start_token: "<think>".to_string(),
|
||||
think_end_token: "</think>".to_string(),
|
||||
stream_reasoning,
|
||||
max_buffer_size: 65536,
|
||||
initial_in_reasoning,
|
||||
};
|
||||
BaseReasoningParser::new(config)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_detect_and_parse_reasoning() {
|
||||
let mut parser = create_test_parser(false, true);
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("<think>with reasoning</think> and more text.")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "and more text.");
|
||||
assert_eq!(result.reasoning_text, "with reasoning");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_detect_and_parse_no_reasoning() {
|
||||
let mut parser = create_test_parser(false, true);
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("This is a test without reasoning.")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "This is a test without reasoning.");
|
||||
assert_eq!(result.reasoning_text, "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_detect_and_parse_truncated_reasoning() {
|
||||
let mut parser = create_test_parser(false, true);
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("<think>with truncated reasoning")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "");
|
||||
assert_eq!(result.reasoning_text, "with truncated reasoning");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_parse_streaming_partial_token() {
|
||||
let mut parser = create_test_parser(false, true);
|
||||
let result = parser
|
||||
.parse_reasoning_streaming_incremental("<thi")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "");
|
||||
assert_eq!(result.reasoning_text, "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_parse_streaming_complete() {
|
||||
let mut parser = create_test_parser(false, true);
|
||||
let result = parser
|
||||
.parse_reasoning_streaming_incremental("<think>with reasoning</think> and more text.")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, " and more text.");
|
||||
assert_eq!(result.reasoning_text, "with reasoning");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_parse_streaming_no_end_token() {
|
||||
let mut parser = create_test_parser(true, true);
|
||||
let result = parser
|
||||
.parse_reasoning_streaming_incremental("<think>with reasoning")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "");
|
||||
assert_eq!(result.reasoning_text, "with reasoning");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_initial_in_reasoning_true() {
|
||||
// Parser starts with in_reasoning=true (like DeepSeek-R1)
|
||||
let mut parser = create_test_parser(true, true);
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("no think tags here")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "");
|
||||
assert_eq!(result.reasoning_text, "no think tags here");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_buffer_loss_bug_fix() {
|
||||
// Critical test for buffer preservation
|
||||
let mut parser = create_test_parser(false, true);
|
||||
|
||||
// Step 1: Send partial end tag when not in reasoning mode
|
||||
let result1 = parser.parse_reasoning_streaming_incremental("</").unwrap();
|
||||
assert_eq!(result1.normal_text, "");
|
||||
assert_eq!(result1.reasoning_text, "");
|
||||
|
||||
// Step 2: Send normal text that doesn't complete the end tag
|
||||
// Must return "</answer" not just "answer"
|
||||
let result2 = parser
|
||||
.parse_reasoning_streaming_incremental("answer")
|
||||
.unwrap();
|
||||
assert_eq!(result2.normal_text, "</answer");
|
||||
assert_eq!(result2.reasoning_text, "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_streaming_with_stream_reasoning_enabled() {
|
||||
let mut parser = create_test_parser(false, true);
|
||||
|
||||
// Start reasoning block
|
||||
let result1 = parser
|
||||
.parse_reasoning_streaming_incremental("<think>reasoning ")
|
||||
.unwrap();
|
||||
assert_eq!(result1.normal_text, "");
|
||||
assert_eq!(result1.reasoning_text, "reasoning ");
|
||||
|
||||
// Continue streaming reasoning
|
||||
let result2 = parser
|
||||
.parse_reasoning_streaming_incremental("content ")
|
||||
.unwrap();
|
||||
assert_eq!(result2.normal_text, "");
|
||||
assert_eq!(result2.reasoning_text, "content ");
|
||||
|
||||
// End reasoning block
|
||||
let result3 = parser
|
||||
.parse_reasoning_streaming_incremental("more</think> normal")
|
||||
.unwrap();
|
||||
assert_eq!(result3.normal_text, " normal");
|
||||
assert_eq!(result3.reasoning_text, "more");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_reset_state() {
|
||||
let mut parser = create_test_parser(false, true);
|
||||
|
||||
// Process some text
|
||||
parser
|
||||
.parse_reasoning_streaming_incremental("<think>reasoning</think> normal")
|
||||
.unwrap();
|
||||
|
||||
// Reset and verify state
|
||||
parser.reset();
|
||||
assert!(!parser.in_reasoning);
|
||||
assert!(parser.buffer.is_empty());
|
||||
assert!(!parser.stripped_think_start);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_buffer_overflow_detect_and_parse() {
|
||||
let config = ParserConfig {
|
||||
max_buffer_size: 10, // Set a very small buffer
|
||||
..Default::default()
|
||||
};
|
||||
let mut parser = BaseReasoningParser::new(config);
|
||||
|
||||
let large_text = "a".repeat(20);
|
||||
let result = parser.detect_and_parse_reasoning(&large_text);
|
||||
|
||||
assert!(result.is_err());
|
||||
match result {
|
||||
Err(ParseError::BufferOverflow(size)) => {
|
||||
assert_eq!(size, 20);
|
||||
}
|
||||
_ => panic!("Expected BufferOverflow error"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_buffer_overflow_streaming() {
|
||||
let config = ParserConfig {
|
||||
max_buffer_size: 10, // Set a very small buffer
|
||||
..Default::default()
|
||||
};
|
||||
let mut parser = BaseReasoningParser::new(config);
|
||||
|
||||
// Send a partial token that will be buffered
|
||||
let result1 = parser.parse_reasoning_streaming_incremental("<thi");
|
||||
assert!(result1.is_ok());
|
||||
assert_eq!(result1.unwrap().normal_text, "");
|
||||
|
||||
// Second chunk would exceed buffer
|
||||
// Buffer has "<thi" (4 chars) + "this_is_too_large" (17 chars) = 21 total
|
||||
let result2 = parser.parse_reasoning_streaming_incremental("this_is_too_large");
|
||||
assert!(result2.is_err());
|
||||
match result2 {
|
||||
Err(ParseError::BufferOverflow(size)) => {
|
||||
assert_eq!(size, 21); // 4 + 17
|
||||
}
|
||||
_ => panic!("Expected BufferOverflow error"),
|
||||
}
|
||||
}
|
||||
}
|
||||
112
sgl-router/src/reasoning_parser/parsers/deepseek_r1.rs
Normal file
112
sgl-router/src/reasoning_parser/parsers/deepseek_r1.rs
Normal file
@@ -0,0 +1,112 @@
|
||||
// DeepSeek-R1 specific reasoning parser.
|
||||
// This parser starts with in_reasoning=true, assuming all text is reasoning
|
||||
// until an end token is encountered.
|
||||
|
||||
use crate::reasoning_parser::parsers::BaseReasoningParser;
|
||||
use crate::reasoning_parser::traits::{ParseError, ParserConfig, ParserResult, ReasoningParser};
|
||||
|
||||
/// DeepSeek-R1 reasoning parser.
|
||||
///
|
||||
/// This parser assumes reasoning from the start of text (in_reasoning=true)
|
||||
/// and uses <think> and </think> tokens.
|
||||
pub struct DeepSeekR1Parser {
|
||||
base: BaseReasoningParser,
|
||||
}
|
||||
|
||||
impl DeepSeekR1Parser {
|
||||
/// Create a new DeepSeek-R1 parser.
|
||||
pub fn new() -> Self {
|
||||
let config = ParserConfig {
|
||||
think_start_token: "<think>".to_string(),
|
||||
think_end_token: "</think>".to_string(),
|
||||
stream_reasoning: true,
|
||||
max_buffer_size: 65536,
|
||||
initial_in_reasoning: true, // Always starts with reasoning
|
||||
};
|
||||
|
||||
Self {
|
||||
base: BaseReasoningParser::new(config).with_model_type("deepseek_r1".to_string()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for DeepSeekR1Parser {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
impl ReasoningParser for DeepSeekR1Parser {
|
||||
fn detect_and_parse_reasoning(&mut self, text: &str) -> Result<ParserResult, ParseError> {
|
||||
self.base.detect_and_parse_reasoning(text)
|
||||
}
|
||||
|
||||
fn parse_reasoning_streaming_incremental(
|
||||
&mut self,
|
||||
text: &str,
|
||||
) -> Result<ParserResult, ParseError> {
|
||||
self.base.parse_reasoning_streaming_incremental(text)
|
||||
}
|
||||
|
||||
fn reset(&mut self) {
|
||||
self.base.reset()
|
||||
}
|
||||
|
||||
fn model_type(&self) -> &str {
|
||||
self.base.model_type()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_deepseek_r1_initial_state() {
|
||||
let mut parser = DeepSeekR1Parser::new();
|
||||
|
||||
// Should treat text as reasoning even without start token
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("This is reasoning content")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "");
|
||||
assert_eq!(result.reasoning_text, "This is reasoning content");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_deepseek_r1_with_end_token() {
|
||||
let mut parser = DeepSeekR1Parser::new();
|
||||
|
||||
// Should extract reasoning until end token
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("reasoning content</think>normal content")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "normal content");
|
||||
assert_eq!(result.reasoning_text, "reasoning content");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_deepseek_r1_streaming() {
|
||||
let mut parser = DeepSeekR1Parser::new();
|
||||
|
||||
// First chunk - all reasoning
|
||||
let result1 = parser
|
||||
.parse_reasoning_streaming_incremental("thinking about")
|
||||
.unwrap();
|
||||
assert_eq!(result1.reasoning_text, "thinking about");
|
||||
assert_eq!(result1.normal_text, "");
|
||||
|
||||
// Second chunk - ends reasoning
|
||||
let result2 = parser
|
||||
.parse_reasoning_streaming_incremental(" the problem</think>answer")
|
||||
.unwrap();
|
||||
assert_eq!(result2.reasoning_text, "the problem"); // Text is trimmed
|
||||
assert_eq!(result2.normal_text, "answer");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_model_type() {
|
||||
let parser = DeepSeekR1Parser::new();
|
||||
assert_eq!(parser.model_type(), "deepseek_r1");
|
||||
}
|
||||
}
|
||||
118
sgl-router/src/reasoning_parser/parsers/glm45.rs
Normal file
118
sgl-router/src/reasoning_parser/parsers/glm45.rs
Normal file
@@ -0,0 +1,118 @@
|
||||
// GLM45 specific reasoning parser.
|
||||
// Uses the same format as Qwen3 but has its own implementation for debugging.
|
||||
|
||||
use crate::reasoning_parser::parsers::BaseReasoningParser;
|
||||
use crate::reasoning_parser::traits::{ParseError, ParserConfig, ParserResult, ReasoningParser};
|
||||
|
||||
/// GLM45 reasoning parser.
|
||||
///
|
||||
/// This parser uses the same format as Qwen3 (<think>...</think>) but has
|
||||
/// its own implementation for better debugging and potential future customization.
|
||||
pub struct Glm45Parser {
|
||||
base: BaseReasoningParser,
|
||||
}
|
||||
|
||||
impl Glm45Parser {
|
||||
/// Create a new GLM45 parser.
|
||||
pub fn new() -> Self {
|
||||
let config = ParserConfig {
|
||||
think_start_token: "<think>".to_string(),
|
||||
think_end_token: "</think>".to_string(),
|
||||
stream_reasoning: true,
|
||||
max_buffer_size: 65536,
|
||||
initial_in_reasoning: false, // Requires explicit start token like Qwen3
|
||||
};
|
||||
|
||||
Self {
|
||||
base: BaseReasoningParser::new(config).with_model_type("glm45".to_string()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Glm45Parser {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
impl ReasoningParser for Glm45Parser {
|
||||
fn detect_and_parse_reasoning(&mut self, text: &str) -> Result<ParserResult, ParseError> {
|
||||
self.base.detect_and_parse_reasoning(text)
|
||||
}
|
||||
|
||||
fn parse_reasoning_streaming_incremental(
|
||||
&mut self,
|
||||
text: &str,
|
||||
) -> Result<ParserResult, ParseError> {
|
||||
self.base.parse_reasoning_streaming_incremental(text)
|
||||
}
|
||||
|
||||
fn reset(&mut self) {
|
||||
self.base.reset()
|
||||
}
|
||||
|
||||
fn model_type(&self) -> &str {
|
||||
self.base.model_type()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_glm45_initial_state() {
|
||||
let mut parser = Glm45Parser::new();
|
||||
|
||||
// Should NOT treat text as reasoning without start token
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("This is normal content")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "This is normal content");
|
||||
assert_eq!(result.reasoning_text, "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_glm45_with_tokens() {
|
||||
let mut parser = Glm45Parser::new();
|
||||
|
||||
// Should extract reasoning with proper tokens
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("<think>reasoning content</think>answer")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "answer");
|
||||
assert_eq!(result.reasoning_text, "reasoning content");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_glm45_streaming() {
|
||||
let mut parser = Glm45Parser::new();
|
||||
|
||||
// First chunk - normal text
|
||||
let result1 = parser
|
||||
.parse_reasoning_streaming_incremental("normal text ")
|
||||
.unwrap();
|
||||
assert_eq!(result1.normal_text, "normal text ");
|
||||
assert_eq!(result1.reasoning_text, "");
|
||||
|
||||
// Second chunk - enters reasoning
|
||||
let result2 = parser
|
||||
.parse_reasoning_streaming_incremental("<think>reasoning")
|
||||
.unwrap();
|
||||
assert_eq!(result2.normal_text, "");
|
||||
assert_eq!(result2.reasoning_text, "reasoning");
|
||||
|
||||
// Third chunk - exits reasoning
|
||||
let result3 = parser
|
||||
.parse_reasoning_streaming_incremental("</think>answer")
|
||||
.unwrap();
|
||||
assert_eq!(result3.normal_text, "answer");
|
||||
assert_eq!(result3.reasoning_text, "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_model_type() {
|
||||
let parser = Glm45Parser::new();
|
||||
assert_eq!(parser.model_type(), "glm45");
|
||||
}
|
||||
}
|
||||
137
sgl-router/src/reasoning_parser/parsers/kimi.rs
Normal file
137
sgl-router/src/reasoning_parser/parsers/kimi.rs
Normal file
@@ -0,0 +1,137 @@
|
||||
// Kimi specific reasoning parser.
|
||||
// This parser uses Unicode tokens and starts with in_reasoning=false.
|
||||
|
||||
use crate::reasoning_parser::parsers::BaseReasoningParser;
|
||||
use crate::reasoning_parser::traits::{ParseError, ParserConfig, ParserResult, ReasoningParser};
|
||||
|
||||
/// Kimi reasoning parser.
|
||||
///
|
||||
/// This parser uses Unicode tokens (◁think▷ and ◁/think▷) and requires
|
||||
/// explicit start tokens to enter reasoning mode.
|
||||
pub struct KimiParser {
|
||||
base: BaseReasoningParser,
|
||||
}
|
||||
|
||||
impl KimiParser {
|
||||
/// Create a new Kimi parser.
|
||||
pub fn new() -> Self {
|
||||
let config = ParserConfig {
|
||||
think_start_token: "◁think▷".to_string(),
|
||||
think_end_token: "◁/think▷".to_string(),
|
||||
stream_reasoning: true,
|
||||
max_buffer_size: 65536,
|
||||
initial_in_reasoning: false, // Requires explicit start token
|
||||
};
|
||||
|
||||
Self {
|
||||
base: BaseReasoningParser::new(config).with_model_type("kimi".to_string()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for KimiParser {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
impl ReasoningParser for KimiParser {
|
||||
fn detect_and_parse_reasoning(&mut self, text: &str) -> Result<ParserResult, ParseError> {
|
||||
self.base.detect_and_parse_reasoning(text)
|
||||
}
|
||||
|
||||
fn parse_reasoning_streaming_incremental(
|
||||
&mut self,
|
||||
text: &str,
|
||||
) -> Result<ParserResult, ParseError> {
|
||||
self.base.parse_reasoning_streaming_incremental(text)
|
||||
}
|
||||
|
||||
fn reset(&mut self) {
|
||||
self.base.reset()
|
||||
}
|
||||
|
||||
fn model_type(&self) -> &str {
|
||||
self.base.model_type()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_kimi_initial_state() {
|
||||
let mut parser = KimiParser::new();
|
||||
|
||||
// Should NOT treat text as reasoning without start token
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("This is normal content")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "This is normal content");
|
||||
assert_eq!(result.reasoning_text, "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_kimi_with_unicode_tokens() {
|
||||
let mut parser = KimiParser::new();
|
||||
|
||||
// Should extract reasoning with Unicode tokens
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("◁think▷reasoning content◁/think▷answer")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "answer");
|
||||
assert_eq!(result.reasoning_text, "reasoning content");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_kimi_partial_unicode() {
|
||||
let mut parser = KimiParser::new();
|
||||
|
||||
// Test partial Unicode token buffering
|
||||
let result1 = parser
|
||||
.parse_reasoning_streaming_incremental("◁thi")
|
||||
.unwrap();
|
||||
assert_eq!(result1.normal_text, "");
|
||||
assert_eq!(result1.reasoning_text, "");
|
||||
|
||||
// Complete the token
|
||||
let result2 = parser
|
||||
.parse_reasoning_streaming_incremental("nk▷reasoning")
|
||||
.unwrap();
|
||||
assert_eq!(result2.normal_text, "");
|
||||
assert_eq!(result2.reasoning_text, "reasoning");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_kimi_streaming() {
|
||||
let mut parser = KimiParser::new();
|
||||
|
||||
// Normal text first
|
||||
let result1 = parser
|
||||
.parse_reasoning_streaming_incremental("normal ")
|
||||
.unwrap();
|
||||
assert_eq!(result1.normal_text, "normal ");
|
||||
assert_eq!(result1.reasoning_text, "");
|
||||
|
||||
// Enter reasoning with Unicode token
|
||||
let result2 = parser
|
||||
.parse_reasoning_streaming_incremental("◁think▷thinking")
|
||||
.unwrap();
|
||||
assert_eq!(result2.normal_text, "");
|
||||
assert_eq!(result2.reasoning_text, "thinking");
|
||||
|
||||
// Exit reasoning
|
||||
let result3 = parser
|
||||
.parse_reasoning_streaming_incremental("◁/think▷answer")
|
||||
.unwrap();
|
||||
assert_eq!(result3.normal_text, "answer");
|
||||
assert_eq!(result3.reasoning_text, ""); // Already returned in stream mode
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_model_type() {
|
||||
let parser = KimiParser::new();
|
||||
assert_eq!(parser.model_type(), "kimi");
|
||||
}
|
||||
}
|
||||
13
sgl-router/src/reasoning_parser/parsers/mod.rs
Normal file
13
sgl-router/src/reasoning_parser/parsers/mod.rs
Normal file
@@ -0,0 +1,13 @@
|
||||
pub mod base;
|
||||
pub mod deepseek_r1;
|
||||
pub mod glm45;
|
||||
pub mod kimi;
|
||||
pub mod qwen3;
|
||||
pub mod step3;
|
||||
|
||||
pub use base::BaseReasoningParser;
|
||||
pub use deepseek_r1::DeepSeekR1Parser;
|
||||
pub use glm45::Glm45Parser;
|
||||
pub use kimi::KimiParser;
|
||||
pub use qwen3::{Qwen3Parser, QwenThinkingParser};
|
||||
pub use step3::Step3Parser;
|
||||
178
sgl-router/src/reasoning_parser/parsers/qwen3.rs
Normal file
178
sgl-router/src/reasoning_parser/parsers/qwen3.rs
Normal file
@@ -0,0 +1,178 @@
|
||||
// Qwen3 specific reasoning parser.
|
||||
// This parser starts with in_reasoning=false, requiring an explicit
|
||||
// start token to enter reasoning mode.
|
||||
|
||||
use crate::reasoning_parser::parsers::BaseReasoningParser;
|
||||
use crate::reasoning_parser::traits::{ParseError, ParserConfig, ParserResult, ReasoningParser};
|
||||
|
||||
/// Qwen3 reasoning parser.
|
||||
///
|
||||
/// This parser requires explicit <think> tokens to enter reasoning mode
|
||||
/// (in_reasoning=false initially).
|
||||
pub struct Qwen3Parser {
|
||||
base: BaseReasoningParser,
|
||||
}
|
||||
|
||||
impl Qwen3Parser {
|
||||
/// Create a new Qwen3 parser.
|
||||
pub fn new() -> Self {
|
||||
let config = ParserConfig {
|
||||
think_start_token: "<think>".to_string(),
|
||||
think_end_token: "</think>".to_string(),
|
||||
stream_reasoning: true,
|
||||
max_buffer_size: 65536,
|
||||
initial_in_reasoning: false, // Requires explicit start token
|
||||
};
|
||||
|
||||
Self {
|
||||
base: BaseReasoningParser::new(config).with_model_type("qwen3".to_string()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Qwen3Parser {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
impl ReasoningParser for Qwen3Parser {
|
||||
fn detect_and_parse_reasoning(&mut self, text: &str) -> Result<ParserResult, ParseError> {
|
||||
self.base.detect_and_parse_reasoning(text)
|
||||
}
|
||||
|
||||
fn parse_reasoning_streaming_incremental(
|
||||
&mut self,
|
||||
text: &str,
|
||||
) -> Result<ParserResult, ParseError> {
|
||||
self.base.parse_reasoning_streaming_incremental(text)
|
||||
}
|
||||
|
||||
fn reset(&mut self) {
|
||||
self.base.reset()
|
||||
}
|
||||
|
||||
fn model_type(&self) -> &str {
|
||||
self.base.model_type()
|
||||
}
|
||||
}
|
||||
|
||||
/// QwenThinking parser - variant that assumes reasoning from start.
|
||||
///
|
||||
/// This is for qwen*thinking models that behave like DeepSeek-R1.
|
||||
pub struct QwenThinkingParser {
|
||||
base: BaseReasoningParser,
|
||||
}
|
||||
|
||||
impl QwenThinkingParser {
|
||||
/// Create a new QwenThinking parser.
|
||||
pub fn new() -> Self {
|
||||
let config = ParserConfig {
|
||||
think_start_token: "<think>".to_string(),
|
||||
think_end_token: "</think>".to_string(),
|
||||
stream_reasoning: true,
|
||||
max_buffer_size: 65536,
|
||||
initial_in_reasoning: true, // Assumes reasoning from start
|
||||
};
|
||||
|
||||
Self {
|
||||
base: BaseReasoningParser::new(config).with_model_type("qwen_thinking".to_string()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for QwenThinkingParser {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
impl ReasoningParser for QwenThinkingParser {
|
||||
fn detect_and_parse_reasoning(&mut self, text: &str) -> Result<ParserResult, ParseError> {
|
||||
self.base.detect_and_parse_reasoning(text)
|
||||
}
|
||||
|
||||
fn parse_reasoning_streaming_incremental(
|
||||
&mut self,
|
||||
text: &str,
|
||||
) -> Result<ParserResult, ParseError> {
|
||||
self.base.parse_reasoning_streaming_incremental(text)
|
||||
}
|
||||
|
||||
fn reset(&mut self) {
|
||||
self.base.reset()
|
||||
}
|
||||
|
||||
fn model_type(&self) -> &str {
|
||||
self.base.model_type()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_qwen3_initial_state() {
|
||||
let mut parser = Qwen3Parser::new();
|
||||
|
||||
// Should NOT treat text as reasoning without start token
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("This is normal content")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "This is normal content");
|
||||
assert_eq!(result.reasoning_text, "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_qwen3_with_tokens() {
|
||||
let mut parser = Qwen3Parser::new();
|
||||
|
||||
// Should extract reasoning with proper tokens
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("<think>reasoning</think>answer")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "answer");
|
||||
assert_eq!(result.reasoning_text, "reasoning");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_qwen_thinking_initial_state() {
|
||||
let mut parser = QwenThinkingParser::new();
|
||||
|
||||
// Should treat text as reasoning even without start token
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("This is reasoning content")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "");
|
||||
assert_eq!(result.reasoning_text, "This is reasoning content");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_qwen3_streaming() {
|
||||
let mut parser = Qwen3Parser::new();
|
||||
|
||||
// First chunk - normal text (no start token yet)
|
||||
let result1 = parser
|
||||
.parse_reasoning_streaming_incremental("normal text ")
|
||||
.unwrap();
|
||||
assert_eq!(result1.normal_text, "normal text ");
|
||||
assert_eq!(result1.reasoning_text, "");
|
||||
|
||||
// Second chunk - enters reasoning
|
||||
let result2 = parser
|
||||
.parse_reasoning_streaming_incremental("<think>reasoning")
|
||||
.unwrap();
|
||||
assert_eq!(result2.normal_text, "");
|
||||
assert_eq!(result2.reasoning_text, "reasoning");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_model_types() {
|
||||
let qwen3 = Qwen3Parser::new();
|
||||
assert_eq!(qwen3.model_type(), "qwen3");
|
||||
|
||||
let qwen_thinking = QwenThinkingParser::new();
|
||||
assert_eq!(qwen_thinking.model_type(), "qwen_thinking");
|
||||
}
|
||||
}
|
||||
123
sgl-router/src/reasoning_parser/parsers/step3.rs
Normal file
123
sgl-router/src/reasoning_parser/parsers/step3.rs
Normal file
@@ -0,0 +1,123 @@
|
||||
// Step3 specific reasoning parser.
|
||||
// Uses the same format as DeepSeek-R1 but has its own implementation for debugging.
|
||||
|
||||
use crate::reasoning_parser::parsers::BaseReasoningParser;
|
||||
use crate::reasoning_parser::traits::{ParseError, ParserConfig, ParserResult, ReasoningParser};
|
||||
|
||||
/// Step3 reasoning parser.
|
||||
///
|
||||
/// This parser uses the same format as DeepSeek-R1 (<think>...</think>) but has
|
||||
/// its own implementation for better debugging and potential future customization.
|
||||
pub struct Step3Parser {
|
||||
base: BaseReasoningParser,
|
||||
}
|
||||
|
||||
impl Step3Parser {
|
||||
/// Create a new Step3 parser.
|
||||
pub fn new() -> Self {
|
||||
let config = ParserConfig {
|
||||
think_start_token: "<think>".to_string(),
|
||||
think_end_token: "</think>".to_string(),
|
||||
stream_reasoning: true,
|
||||
max_buffer_size: 65536,
|
||||
initial_in_reasoning: true, // Assumes reasoning from start like DeepSeek-R1
|
||||
};
|
||||
|
||||
Self {
|
||||
base: BaseReasoningParser::new(config).with_model_type("step3".to_string()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Step3Parser {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
impl ReasoningParser for Step3Parser {
|
||||
fn detect_and_parse_reasoning(&mut self, text: &str) -> Result<ParserResult, ParseError> {
|
||||
self.base.detect_and_parse_reasoning(text)
|
||||
}
|
||||
|
||||
fn parse_reasoning_streaming_incremental(
|
||||
&mut self,
|
||||
text: &str,
|
||||
) -> Result<ParserResult, ParseError> {
|
||||
self.base.parse_reasoning_streaming_incremental(text)
|
||||
}
|
||||
|
||||
fn reset(&mut self) {
|
||||
self.base.reset()
|
||||
}
|
||||
|
||||
fn model_type(&self) -> &str {
|
||||
self.base.model_type()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_step3_initial_state() {
|
||||
let mut parser = Step3Parser::new();
|
||||
|
||||
// Should treat text as reasoning even without start token
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("This is reasoning content")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "");
|
||||
assert_eq!(result.reasoning_text, "This is reasoning content");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_step3_with_end_token() {
|
||||
let mut parser = Step3Parser::new();
|
||||
|
||||
// Should handle text with end token
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("reasoning content</think>answer")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "answer");
|
||||
assert_eq!(result.reasoning_text, "reasoning content");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_step3_with_both_tokens() {
|
||||
let mut parser = Step3Parser::new();
|
||||
|
||||
// Should handle both start and end tokens
|
||||
let result = parser
|
||||
.detect_and_parse_reasoning("<think>reasoning content</think>answer")
|
||||
.unwrap();
|
||||
assert_eq!(result.normal_text, "answer");
|
||||
assert_eq!(result.reasoning_text, "reasoning content");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_step3_streaming() {
|
||||
let mut parser = Step3Parser::new();
|
||||
|
||||
// First chunk - treated as reasoning (initial_in_reasoning=true)
|
||||
let result1 = parser
|
||||
.parse_reasoning_streaming_incremental("reasoning text ")
|
||||
.unwrap();
|
||||
assert_eq!(result1.normal_text, "");
|
||||
assert_eq!(result1.reasoning_text, "reasoning text ");
|
||||
|
||||
// Second chunk - continues reasoning until end token
|
||||
let result2 = parser
|
||||
.parse_reasoning_streaming_incremental("more reasoning</think>answer")
|
||||
.unwrap();
|
||||
assert_eq!(result2.normal_text, "answer");
|
||||
assert_eq!(result2.reasoning_text, "more reasoning");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_model_type() {
|
||||
let parser = Step3Parser::new();
|
||||
assert_eq!(parser.model_type(), "step3");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user