Skip to content

[router][tool call] Full support for ToolChoice #11085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slin1237 merged 7 commits into from
Sep 30, 2025
Merged

[router][tool call] Full support for ToolChoice #11085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ba5e47
Full support for ToolChoice
CatherineSue Sep 30, 2025
386b69a
Extract helper functions for tool call parsing
CatherineSue Sep 30, 2025
6df3189
Put all imports at the top
CatherineSue Sep 30, 2025
4ced3da
Organize imports
CatherineSue Sep 30, 2025
eb735fc
Merge branch 'main' into chang/tool-call-grpc
slin1237 Sep 30, 2025
37ec9a5
Merge branch 'main' into chang/tool-call-grpc
slin1237 Sep 30, 2025
2d9c564
[router] fix import
slin1237 Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions sgl-router/src/protocols/spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,6 +1491,7 @@ impl ResponsesResponse {
ToolChoice::Value(ToolChoiceValue::Required) => "required".to_string(),
ToolChoice::Value(ToolChoiceValue::None) => "none".to_string(),
ToolChoice::Function { .. } => "function".to_string(),
ToolChoice::AllowedTools { mode, .. } => mode.clone(),
},
tools: request.tools.clone(),
top_p: request.top_p,
Expand Down Expand Up @@ -1718,6 +1719,12 @@ pub enum ToolChoice {
tool_type: String, // "function"
function: FunctionChoice,
},
AllowedTools {
#[serde(rename = "type")]
tool_type: String, // "allowed_tools"
mode: String, // "auto" | "required" TODO: need validation
tools: Vec<ToolReference>,
},
}

impl Default for ToolChoice {
Expand All @@ -1732,6 +1739,14 @@ pub struct FunctionChoice {
pub name: String,
}

/// Tool reference for ToolChoice::AllowedTools
#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct ToolReference {
#[serde(rename = "type")]
pub tool_type: String, // "function"
pub name: String,
}

#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct Tool {
#[serde(rename = "type")]
Expand Down
Loading
Loading