Convert formatting to use ruff instead of yapf + isort (#26247)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
@@ -21,23 +21,28 @@ def parser(deepseekv31_tokenizer):
|
||||
|
||||
def test_extract_tool_calls_with_tool(parser):
|
||||
model_output = (
|
||||
"normal text" + "<|tool▁calls▁begin|>" +
|
||||
"<|tool▁call▁begin|>foo<|tool▁sep|>{\"x\":1}<|tool▁call▁end|>" +
|
||||
"<|tool▁calls▁end|>")
|
||||
"normal text"
|
||||
+ "<|tool▁calls▁begin|>"
|
||||
+ '<|tool▁call▁begin|>foo<|tool▁sep|>{"x":1}<|tool▁call▁end|>'
|
||||
+ "<|tool▁calls▁end|>"
|
||||
)
|
||||
result = parser.extract_tool_calls(model_output, None)
|
||||
assert result.tools_called
|
||||
assert len(result.tool_calls) == 1
|
||||
assert result.tool_calls[0].function.name == "foo"
|
||||
assert result.tool_calls[0].function.arguments == "{\"x\":1}"
|
||||
assert result.tool_calls[0].function.arguments == '{"x":1}'
|
||||
assert result.content == "normal text"
|
||||
|
||||
|
||||
def test_extract_tool_calls_with_multiple_tools(parser):
|
||||
model_output = (
|
||||
"some prefix text" + "<|tool▁calls▁begin|>" +
|
||||
"<|tool▁call▁begin|>foo<|tool▁sep|>{\"x\":1}<|tool▁call▁end|>" +
|
||||
"<|tool▁call▁begin|>bar<|tool▁sep|>{\"y\":2}<|tool▁call▁end|>" +
|
||||
"<|tool▁calls▁end|>" + " some suffix text")
|
||||
"some prefix text"
|
||||
+ "<|tool▁calls▁begin|>"
|
||||
+ '<|tool▁call▁begin|>foo<|tool▁sep|>{"x":1}<|tool▁call▁end|>'
|
||||
+ '<|tool▁call▁begin|>bar<|tool▁sep|>{"y":2}<|tool▁call▁end|>'
|
||||
+ "<|tool▁calls▁end|>"
|
||||
+ " some suffix text"
|
||||
)
|
||||
|
||||
result = parser.extract_tool_calls(model_output, None)
|
||||
|
||||
@@ -45,10 +50,10 @@ def test_extract_tool_calls_with_multiple_tools(parser):
|
||||
assert len(result.tool_calls) == 2
|
||||
|
||||
assert result.tool_calls[0].function.name == "foo"
|
||||
assert result.tool_calls[0].function.arguments == "{\"x\":1}"
|
||||
assert result.tool_calls[0].function.arguments == '{"x":1}'
|
||||
|
||||
assert result.tool_calls[1].function.name == "bar"
|
||||
assert result.tool_calls[1].function.arguments == "{\"y\":2}"
|
||||
assert result.tool_calls[1].function.arguments == '{"y":2}'
|
||||
|
||||
# prefix is content
|
||||
assert result.content == "some prefix text"
|
||||
|
||||
Reference in New Issue
Block a user