dc55f493be
The V3.1 parser had the same issue — .*? without re.DOTALL fails to match multi-line JSON arguments. Found during review of PR #444.
73 lines
2.2 KiB
Python
73 lines
2.2 KiB
Python
"""
|
||
DeepSeek V3.1 tool call parser.
|
||
|
||
Similar to V3 but with a slightly different format:
|
||
<｜tool▁call▁begin｜>function_name<｜tool▁sep｜>arguments<｜tool▁call▁end｜>
|
||
|
||
Note: V3 has type+name before the separator, V3.1 has name before and args after.
|
||
|
||
Based on VLLM's DeepSeekV31ToolParser.extract_tool_calls()
|
||
"""
|
||
|
||
import re
|
||
import uuid
|
||
from typing import List, Optional
|
||
|
||
from openai.types.chat.chat_completion_message_tool_call import (
|
||
ChatCompletionMessageToolCall,
|
||
Function,
|
||
)
|
||
|
||
from environments.tool_call_parsers import ParseResult, ToolCallParser, register_parser
|
||
|
||
|
||
@register_parser("deepseek_v3_1")
|
||
@register_parser("deepseek_v31")
|
||
class DeepSeekV31ToolCallParser(ToolCallParser):
|
||
"""
|
||
Parser for DeepSeek V3.1 tool calls.
|
||
|
||
Slightly different regex than V3: function_name comes before the separator,
|
||
arguments come after (no type field, no json code block wrapper).
|
||
"""
|
||
|
||
START_TOKEN = "<｜tool▁calls▁begin｜>"
|
||
|
||
# Regex captures: function_name, function_arguments
|
||
PATTERN = re.compile(
|
||
r"<｜tool▁call▁begin｜>(?P<function_name>.*?)<｜tool▁sep｜>(?P<function_arguments>.*?)<｜tool▁call▁end｜>",
|
||
re.DOTALL,
|
||
)
|
||
|
||
def parse(self, text: str) -> ParseResult:
|
||
if self.START_TOKEN not in text:
|
||
return text, None
|
||
|
||
try:
|
||
matches = self.PATTERN.findall(text)
|
||
if not matches:
|
||
return text, None
|
||
|
||
tool_calls: List[ChatCompletionMessageToolCall] = []
|
||
for match in matches:
|
||
func_name, func_args = match
|
||
tool_calls.append(
|
||
ChatCompletionMessageToolCall(
|
||
id=f"call_{uuid.uuid4().hex[:8]}",
|
||
type="function",
|
||
function=Function(
|
||
name=func_name.strip(),
|
||
arguments=func_args.strip(),
|
||
),
|
||
)
|
||
)
|
||
|
||
if not tool_calls:
|
||
return text, None
|
||
|
||
content = text[: text.find(self.START_TOKEN)].strip()
|
||
return content if content else None, tool_calls
|
||
|
||
except Exception:
|
||
return text, None
|