[Rust Frontend] Support parallel_tool_calls = false (#44760)
Signed-off-by: zhoujinyu <2319109590@qq.com>
This commit is contained in:
@@ -142,6 +142,7 @@ pub(super) fn prepare_chat_request(
|
||||
},
|
||||
tools: convert_tools(request.tools)?,
|
||||
tool_choice: convert_tool_choice(request.tool_choice.as_ref())?,
|
||||
parallel_tool_calls: request.parallel_tool_calls.unwrap_or(true),
|
||||
decode_options: vllm_text::output::TextDecodeOptions {
|
||||
skip_special_tokens: request.skip_special_tokens,
|
||||
include_stop_str_in_output: request.include_stop_str_in_output,
|
||||
@@ -412,6 +413,33 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn prepare_chat_request_maps_parallel_tool_calls() {
|
||||
let mut request = base_request();
|
||||
request.parallel_tool_calls = Some(false);
|
||||
|
||||
let prepared = prepare_chat_request(
|
||||
request,
|
||||
&served(&["Qwen/Qwen1.5-0.5B-Chat"]),
|
||||
ResolvedRequestContext::default(),
|
||||
)
|
||||
.expect("request is valid");
|
||||
|
||||
assert!(!prepared.chat_request.parallel_tool_calls);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn prepare_chat_request_defaults_parallel_tool_calls_to_true() {
|
||||
let prepared = prepare_chat_request(
|
||||
base_request(),
|
||||
&served(&["Qwen/Qwen1.5-0.5B-Chat"]),
|
||||
ResolvedRequestContext::default(),
|
||||
)
|
||||
.expect("request is valid");
|
||||
|
||||
assert!(prepared.chat_request.parallel_tool_calls);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn prepare_chat_request_maps_text_parts() {
|
||||
let mut request = base_request();
|
||||
|
||||
@@ -93,13 +93,6 @@ pub(super) fn validate_request_compat(
|
||||
// ---- Reject parameters that are accepted for deserialization but not yet
|
||||
// implemented ----
|
||||
|
||||
if request.parallel_tool_calls.is_some() {
|
||||
bail_invalid_request!(
|
||||
param = "parallel_tool_calls",
|
||||
"parallel_tool_calls is not supported."
|
||||
);
|
||||
}
|
||||
|
||||
reject_non_default(
|
||||
request.length_penalty.as_ref(),
|
||||
"length_penalty",
|
||||
|
||||
@@ -83,6 +83,7 @@ impl TokenizeChatRequest {
|
||||
},
|
||||
tools: convert_tools(self.tools)?,
|
||||
tool_choice: ChatToolChoice::Auto,
|
||||
parallel_tool_calls: true,
|
||||
decode_options: TextDecodeOptions::default(),
|
||||
intermediate: false,
|
||||
priority: 0,
|
||||
|
||||
Reference in New Issue
Block a user