Revert "[Bugfix] Fix Qwen3CoderToolParser anyOf/oneOf type resolution for nullable params (#37831)" (#38751)
This commit is contained in:
Kevin H. Luu
@@ -429,208 +429,6 @@ hello world
|
||||
assert args["obj_param"] == {"key": "value"}
|
||||
|
||||
|
||||
def test_extract_tool_calls_anyof_type_conversion(qwen3_tool_parser):
|
||||
"""Test type conversion for anyOf/oneOf nullable schemas (Pydantic v2).
|
||||
|
||||
Pydantic v2 emits anyOf for Optional[T] fields, e.g.:
|
||||
Optional[int] -> {"anyOf": [{"type": "integer"}, {"type": "null"}]}
|
||||
The parser must extract the non-null type and apply the correct
|
||||
conversion (int(), float(), etc.) instead of returning a raw string.
|
||||
"""
|
||||
tools = [
|
||||
ChatCompletionToolsParam(
|
||||
type="function",
|
||||
function={
|
||||
"name": "test_anyof",
|
||||
"parameters": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"anyof_int": {
|
||||
"anyOf": [
|
||||
{"type": "integer"},
|
||||
{"type": "null"},
|
||||
],
|
||||
"default": 5,
|
||||
},
|
||||
"anyof_str": {
|
||||
"anyOf": [
|
||||
{"type": "string"},
|
||||
{"type": "null"},
|
||||
],
|
||||
},
|
||||
"anyof_array": {
|
||||
"anyOf": [
|
||||
{"type": "array", "items": {"type": "string"}},
|
||||
{"type": "null"},
|
||||
],
|
||||
},
|
||||
"anyof_obj": {
|
||||
"anyOf": [
|
||||
{"type": "object"},
|
||||
{"type": "null"},
|
||||
],
|
||||
},
|
||||
"type_as_array": {
|
||||
"type": ["integer", "null"],
|
||||
},
|
||||
"multi_non_null": {
|
||||
"anyOf": [
|
||||
{"type": "string"},
|
||||
{"type": "integer"},
|
||||
{"type": "null"},
|
||||
],
|
||||
},
|
||||
"ref_param": {
|
||||
"$ref": "#/$defs/ToolInput",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
)
|
||||
]
|
||||
|
||||
model_output = """<tool_call>
|
||||
<function=test_anyof>
|
||||
<parameter=anyof_int>
|
||||
5
|
||||
</parameter>
|
||||
<parameter=anyof_str>
|
||||
hello
|
||||
</parameter>
|
||||
<parameter=anyof_array>
|
||||
["a", "b", "c"]
|
||||
</parameter>
|
||||
<parameter=anyof_obj>
|
||||
{"key": "value"}
|
||||
</parameter>
|
||||
<parameter=type_as_array>
|
||||
42
|
||||
</parameter>
|
||||
<parameter=multi_non_null>
|
||||
some text
|
||||
</parameter>
|
||||
<parameter=ref_param>
|
||||
{"city": "Paris"}
|
||||
</parameter>
|
||||
</function>
|
||||
</tool_call>"""
|
||||
|
||||
request = ChatCompletionRequest(model=MODEL, messages=[], tools=tools)
|
||||
extracted = qwen3_tool_parser.extract_tool_calls(model_output, request=request)
|
||||
|
||||
args = json.loads(extracted.tool_calls[0].function.arguments)
|
||||
assert args["anyof_int"] == 5
|
||||
assert isinstance(args["anyof_int"], int)
|
||||
assert args["anyof_str"] == "hello"
|
||||
assert isinstance(args["anyof_str"], str)
|
||||
assert args["anyof_array"] == ["a", "b", "c"]
|
||||
assert isinstance(args["anyof_array"], list)
|
||||
assert args["anyof_obj"] == {"key": "value"}
|
||||
assert isinstance(args["anyof_obj"], dict)
|
||||
assert args["type_as_array"] == 42
|
||||
assert isinstance(args["type_as_array"], int)
|
||||
# Multi non-null: anyOf[string, integer, null] → first non-null is string
|
||||
assert args["multi_non_null"] == "some text"
|
||||
assert isinstance(args["multi_non_null"], str)
|
||||
# $ref: treated as object, parsed via json.loads
|
||||
assert args["ref_param"] == {"city": "Paris"}
|
||||
assert isinstance(args["ref_param"], dict)
|
||||
|
||||
|
||||
def test_extract_tool_calls_anyof_type_conversion_streaming(
|
||||
qwen3_tool_parser, qwen3_tokenizer
|
||||
):
|
||||
"""Test streaming e2e for anyOf/oneOf nullable schemas (Pydantic v2).
|
||||
|
||||
Verifies that the full streaming pipeline — tokenize, incrementally
|
||||
decode, extract_tool_calls_streaming — correctly resolves types from
|
||||
anyOf schemas and produces valid JSON with properly typed values.
|
||||
"""
|
||||
tools = [
|
||||
ChatCompletionToolsParam(
|
||||
type="function",
|
||||
function={
|
||||
"name": "search_web",
|
||||
"parameters": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"query": {
|
||||
"anyOf": [
|
||||
{"type": "string"},
|
||||
{"type": "null"},
|
||||
],
|
||||
},
|
||||
"count": {
|
||||
"anyOf": [
|
||||
{"type": "integer"},
|
||||
{"type": "null"},
|
||||
],
|
||||
"default": 5,
|
||||
},
|
||||
"verbose": {
|
||||
"anyOf": [
|
||||
{"type": "boolean"},
|
||||
{"type": "null"},
|
||||
],
|
||||
},
|
||||
"filters": {
|
||||
"$ref": "#/$defs/SearchFilters",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
)
|
||||
]
|
||||
|
||||
model_output = """<tool_call>
|
||||
<function=search_web>
|
||||
<parameter=query>
|
||||
vllm tool parser
|
||||
</parameter>
|
||||
<parameter=count>
|
||||
10
|
||||
</parameter>
|
||||
<parameter=verbose>
|
||||
true
|
||||
</parameter>
|
||||
<parameter=filters>
|
||||
{"lang": "en", "year": 2025}
|
||||
</parameter>
|
||||
</function>
|
||||
</tool_call>"""
|
||||
|
||||
request = ChatCompletionRequest(model=MODEL, messages=[], tools=tools)
|
||||
|
||||
tool_states = {}
|
||||
for delta_message in stream_delta_message_generator(
|
||||
qwen3_tool_parser, qwen3_tokenizer, model_output, request
|
||||
):
|
||||
if delta_message.tool_calls:
|
||||
for tool_call in delta_message.tool_calls:
|
||||
idx = tool_call.index
|
||||
if idx not in tool_states:
|
||||
tool_states[idx] = {"name": None, "arguments": ""}
|
||||
if tool_call.function:
|
||||
if tool_call.function.name:
|
||||
tool_states[idx]["name"] = tool_call.function.name
|
||||
if tool_call.function.arguments is not None:
|
||||
tool_states[idx]["arguments"] += tool_call.function.arguments
|
||||
|
||||
assert len(tool_states) == 1
|
||||
assert tool_states[0]["name"] == "search_web"
|
||||
assert tool_states[0]["arguments"] is not None
|
||||
args = json.loads(tool_states[0]["arguments"])
|
||||
assert args["query"] == "vllm tool parser"
|
||||
assert isinstance(args["query"], str)
|
||||
assert args["count"] == 10
|
||||
assert isinstance(args["count"], int)
|
||||
assert args["verbose"] is True
|
||||
assert isinstance(args["verbose"], bool)
|
||||
# $ref: treated as object, parsed via json.loads
|
||||
assert args["filters"] == {"lang": "en", "year": 2025}
|
||||
assert isinstance(args["filters"], dict)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
ids=[
|
||||
"no_tools",
|
||||
|
||||
Reference in New Issue
Block a user