[Rust Frontend] Fix Kimi K3 reasoning_effort="none" handling (#53043)
Co-authored-by: Bugen Zhao <i@bugenzhao.com> Signed-off-by: reidliu41 <reid201711@gmail.com>
This commit is contained in:
@@ -236,11 +236,15 @@ fn thinking_enabled(request: &ChatRequest) -> Result<bool> {
|
||||
if let Some(enable_thinking) = request.parse_template_bool("enable_thinking")? {
|
||||
return Ok(enable_thinking);
|
||||
}
|
||||
if let Some(reasoning_effort) = request.chat_options.reasoning_effort {
|
||||
return Ok(reasoning_effort != crate::request::ReasoningEffort::None);
|
||||
}
|
||||
Ok(request
|
||||
.chat_options
|
||||
.reasoning_effort
|
||||
.map(|effort| effort != crate::request::ReasoningEffort::None)
|
||||
.unwrap_or(true))
|
||||
.template_kwargs
|
||||
.get("reasoning_effort")
|
||||
.and_then(Value::as_str)
|
||||
!= Some("none"))
|
||||
}
|
||||
|
||||
fn thinking_effort(request: &ChatRequest) -> Result<String> {
|
||||
@@ -251,13 +255,22 @@ fn thinking_effort(request: &ChatRequest) -> Result<String> {
|
||||
))
|
||||
})?
|
||||
} else if let Some(effort) = request.chat_options.reasoning_effort {
|
||||
effort.as_str()
|
||||
if effort == crate::request::ReasoningEffort::None {
|
||||
DEFAULT_THINKING_EFFORT
|
||||
} else {
|
||||
effort.as_str()
|
||||
}
|
||||
} else if let Some(value) = request.chat_options.template_kwargs.get("reasoning_effort") {
|
||||
value.as_str().ok_or_else(|| {
|
||||
let effort = value.as_str().ok_or_else(|| {
|
||||
Error::ChatTemplate(format!(
|
||||
"template kwarg `reasoning_effort` must be a string, got {value}"
|
||||
))
|
||||
})?
|
||||
})?;
|
||||
if effort == "none" {
|
||||
DEFAULT_THINKING_EFFORT
|
||||
} else {
|
||||
effort
|
||||
}
|
||||
} else {
|
||||
DEFAULT_THINKING_EFFORT
|
||||
};
|
||||
|
||||
@@ -330,10 +330,10 @@ fn native_k3_kwargs_take_precedence() {
|
||||
#[test]
|
||||
fn standard_none_disables_thinking() {
|
||||
let mut request = crate::request::ChatRequest::for_test();
|
||||
request.chat_options.template_kwargs.extend([
|
||||
("enable_thinking".to_string(), json!(false)),
|
||||
("reasoning_effort".to_string(), json!("none")),
|
||||
]);
|
||||
request
|
||||
.chat_options
|
||||
.template_kwargs
|
||||
.insert("reasoning_effort".to_string(), json!("none"));
|
||||
|
||||
let rendered = render_request(&request);
|
||||
|
||||
@@ -341,6 +341,34 @@ fn standard_none_disables_thinking() {
|
||||
assert!(rendered.ends_with("<|open|>response<|sep|>"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn native_thinking_true_overrides_standard_none() {
|
||||
let mut request = crate::request::ChatRequest::for_test();
|
||||
request.chat_options.template_kwargs.extend([
|
||||
("thinking".to_string(), json!(true)),
|
||||
("reasoning_effort".to_string(), json!("none")),
|
||||
]);
|
||||
|
||||
let rendered = render_request(&request);
|
||||
|
||||
assert!(rendered.contains("thinking_effort=max"));
|
||||
assert!(rendered.ends_with("<|open|>think<|sep|>"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn enable_thinking_true_overrides_standard_none() {
|
||||
let mut request = crate::request::ChatRequest::for_test();
|
||||
request.chat_options.template_kwargs.extend([
|
||||
("enable_thinking".to_string(), json!(true)),
|
||||
("reasoning_effort".to_string(), json!("none")),
|
||||
]);
|
||||
|
||||
let rendered = render_request(&request);
|
||||
|
||||
assert!(rendered.contains("thinking_effort=max"));
|
||||
assert!(rendered.ends_with("<|open|>think<|sep|>"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn typed_none_disables_thinking() {
|
||||
let mut request = crate::request::ChatRequest::for_test();
|
||||
|
||||
Reference in New Issue
Block a user