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

Fix the GPT function calling regex to allow dash in the name (#10577)

Browse Source
This commit is contained in:
Antoine Roux
2025-10-12 14:34:58 +02:00
committed by GitHub
parent 1103dc6204
commit ec1cd90ac9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/sglang/srt/function_call/gpt_oss_detector.py
View File

@@ -31,7 +31,7 @@ class GptOssDetector(BaseFormatDetector):
# Pattern to extract function name and JSON from tool_call event content # Pattern to extract function name and JSON from tool_call event content
self.tool_extract_pattern = re.compile( self.tool_extract_pattern = re.compile(
r"to=([a-zA-Z_][a-zA-Z0-9_.]*)\s*<\|constrain\|>json<\|message\|>(.*?)(?:<\|call\|>|$)", r"to=([a-zA-Z_][a-zA-Z0-9_.-]*)\s*<\|constrain\|>json<\|message\|>(.*?)(?:<\|call\|>|$)",
re.DOTALL, re.DOTALL,
) )

4
sgl-router/src/tool_parser/parsers/gpt_oss_parser.rs
View File

@@ -40,12 +40,12 @@ impl GptOssParser {
pub fn new() -> Self { pub fn new() -> Self {
// Pattern for complete function calls with to= parameter // Pattern for complete function calls with to= parameter
// Handles optional <|start|>assistant prefix and whitespace after function name // Handles optional <|start|>assistant prefix and whitespace after function name
let function_call_pattern = r"(?s)(?:<\|start\|>assistant)?<\|channel\|>commentary to=([a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_]*)*)\s*<\|constrain\|>json<\|message\|>(.*?)<\|call\|>(?:commentary)?"; let function_call_pattern = r"(?s)(?:<\|start\|>assistant)?<\|channel\|>commentary to=([a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_-]*)*)\s*<\|constrain\|>json<\|message\|>(.*?)<\|call\|>(?:commentary)?";
let function_call_extractor = let function_call_extractor =
Regex::new(function_call_pattern).expect("Valid regex pattern"); Regex::new(function_call_pattern).expect("Valid regex pattern");
// Pattern for streaming function calls (incomplete) // Pattern for streaming function calls (incomplete)
let streaming_pattern = r"(?s)(?:<\|start\|>assistant)?<\|channel\|>commentary to=([a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_]*)*)\s*<\|constrain\|>json<\|message\|>(.*)"; let streaming_pattern = r"(?s)(?:<\|start\|>assistant)?<\|channel\|>commentary to=([a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_-]*)*)\s*<\|constrain\|>json<\|message\|>(.*)";
let streaming_extractor = Regex::new(streaming_pattern).expect("Valid regex pattern"); let streaming_extractor = Regex::new(streaming_pattern).expect("Valid regex pattern");
Self { Self {