forked from Karylab-cklius/vllm
+86






![mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)


Wojciech Wais
GitHub
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Michael Goin
Xinyu Chen
Ekagra Ranjan
Rishi Puri
zzaebok
Cyrus Leung
Yuwei An
yuwei
Artem Perevedentsev
Ibrahim Arshad
Chuan Li
Chauncey
Kunshang Ji
Ganesh R
Lucas Wilkinson
Robert Shaw
Kyungmin Lee
Ronen Schaffer
Srreyansh Sethi
vnadathur
vnadathur
Isotr0py
Elham
Yan Ma
Nick Hill
Chaofan Wang
Chendi.Xue
Injae Ryou
Richard Zou
milesial
Elvir Crnčević
Claude Sonnet 4
Hexiang Wang
Lalithnarayan C
gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Luka Govedič
PatchyTIS
PatchouliTaisa
jatseng-ai
Matthias Gehre
xaguilar-amd
Ravitez Dondeti
Nicolò Lucchesi
Peter Nguyen
wang.yuqi
zhrrr
Jee Jee Li
TJian
Jesus Federico
Manu
zhanqiuhu
yzong-rh
Fynn Schmitt-Ulms
Rahul-Tuli
Harry Mellor
Benjamin Chislett
Tianyu Guo
Lee Yongjun
z1ying
Li, Jiang <jiang1.li@intel.com>
Vibhav Agarwal
vibhav-agarwal
ShubyM
Wei Zhao
Itay Etelis
Itay Etelis
EdalatiAli
Andreas Karatzas
r266-tech
Roger Wang
Martin Hickey
Or Ozeri
Mark McLoughlin
Le Yang
Animesh Jain
Yongye Zhu
Zhengxu Chen
Kaicheng Yang
maobaolong
sihao_li
Flora Feng
Yufeng He
zofia
Tihomir Elek
Yi Liu
Wentao Ye
Santino Ramos
haosdent
JartX
Yuyi Ao
Tyler Michael Smith
mukesh-hai
Pedram Razavi
431cea3eea
Signed-off-by: Wojciech Wais <wojciech.wais@gmail.com> Signed-off-by: mgoin <mgoin64@gmail.com> Signed-off-by: Xinyu Chen <xinyu1.chen@intel.com> Signed-off-by: Ekagra Ranjan <3116519+ekagra-ranjan@users.noreply.github.com> Signed-off-by: Rishi Puri <riship@nvidia.com> Signed-off-by: Jaebok Lee <jaebok9541@naver.com> Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk> Signed-off-by: yuwei <yuwei@dev.local> Signed-off-by: Artem Perevedentsev <aperevedents@nvidia.com> Signed-off-by: Ibrahim Arshad <38925737+ibrahim1023@users.noreply.github.com> Signed-off-by: Li <chuali@amd.com> Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com> Signed-off-by: Kunshang Ji <kunshang.ji@intel.com> Signed-off-by: Kunshang Ji <jikunshang95@gmail.com> Signed-off-by: R <Ganesh.R@amd.com> Signed-off-by: Lucas Wilkinson <lwilkins@redhat.com> Signed-off-by: lkm2835 <lkm2835@gmail.com> Signed-off-by: Ronen Schaffer <ronen.schaffer@ibm.com> Signed-off-by: vnadathur <glvikramn@gmail.com> Signed-off-by: WorldExplored <srreyansh.sethi@gmail.com> Signed-off-by: Srreyansh Sethi <107075589+WorldExplored@users.noreply.github.com> Signed-off-by: Isotr0py <mozf@mail2.sysu.edu.cn> Signed-off-by: Elham Harirpoush <elham.harirpoush@arm.com> Signed-off-by: Yan Ma <yan.ma@intel.com> Signed-off-by: Nick Hill <nickhill123@gmail.com> Signed-off-by: jackcfwang <jackcfwang@tencent.com> Signed-off-by: Chendi Xue <chendi.xue@intel.com> Signed-off-by: Injae Ryou <injaeryou@gmail.com> Signed-off-by: Richard Zou <zou3519@gmail.com> Signed-off-by: milesial <milesial@users.noreply.github.com> Signed-off-by: Elvir Crncevic <elvircrn@gmail.com> Signed-off-by: whx-sjtu <2952154980@qq.com> Signed-off-by: Lalithnarayan C <Lalithnarayan.C@amd.com> Signed-off-by: PatchouliTaisa <patchychen@tencent.com> Signed-off-by: jatseng-ai <jatseng@amd.com> Signed-off-by: jatseng-ai <janet.tseng@amd.com> Signed-off-by: Matthias Gehre <matthias.gehre@amd.com> Signed-off-by: xaguilar-amd <xaguilar@amd.com> Signed-off-by: rdondeti <ravitez.dondeti@gmail.com> Signed-off-by: Ravitez Dondeti <ravitez.dondeti@gmail.com> Signed-off-by: NickLucche <nlucches@redhat.com> Signed-off-by: Peter Nguyen <petern0408@gmail.com> Signed-off-by: wang.yuqi <yuqi.wang@daocloud.io> Signed-off-by: zhuhaoran <zhuhaoran.zhr@alibaba-inc.com> Signed-off-by: Jee Jee Li <pandaleefree@gmail.com> Signed-off-by: tjtanaa <tunjian.tan@embeddedllm.com> Signed-off-by: Jesus Federico <jefp@amazon.com> Signed-off-by: manu <fortin.emmanuel@gmail.com> Signed-off-by: ZhanqiuHu <zhu@redhat.com> Signed-off-by: Yifan Zong <yzong@redhat.com> Signed-off-by: Rahul-Tuli <rtuli@redhat.com> Signed-off-by: Fynn Schmitt-Ulms <fschmitt@redhat.com> Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Signed-off-by: Michael Goin <mgoin64@gmail.com> Signed-off-by: Benjamin Chislett <bchislett@nvidia.com> Signed-off-by: Tianyu Guo <guoty9@mail2.sysu.edu.cn> Signed-off-by: leeyongjun <jqueen.astro@gmail.com> Signed-off-by: Ziying Tao <tzzying@outlook.com> Signed-off-by: jiang1.li <jiang1.li@intel.com> Signed-off-by: Vibhav Agarwal <vibhavagarwal5@gmail.com> Signed-off-by: ShubyM <shubymishra20@gmail.com> Signed-off-by: wzhao18 <wzhao18.sz@gmail.com> Signed-off-by: Itay Etelis <itay.etelis@ibm.com> Signed-off-by: EdalatiAli <aliedalati@cohere.com> Signed-off-by: Andreas Karatzas <akaratza@amd.com> Signed-off-by: r266-tech <r266.tech@gmail.com> Signed-off-by: Roger Wang <hey@rogerw.io> Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com> Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Animesh Jain <anijain@umich.edu> Signed-off-by: Yongye Zhu <zyy1102000@gmail.com> Signed-off-by: zhxchen17 <zhxchen17@fb.com> Signed-off-by: EricccYang <yangyang4991@gmail.com> Signed-off-by: Kaicheng Yang <53411596+EricccYang@users.noreply.github.com> Signed-off-by: baoloongmao <baoloongmao@tencent.com> Signed-off-by: sihao.li <sihao.li@intel.com> Signed-off-by: sfeng33 <4florafeng@gmail.com> Signed-off-by: Yufeng He <40085740+he-yufeng@users.noreply.github.com> Signed-off-by: Zhu, Zufang <zufang.zhu@intel.com> Signed-off-by: Tihomir Elek <tiho.elek@gmail.com> Signed-off-by: yiliu30 <yi4.liu@intel.com> Signed-off-by: yewentao256 <zhyanwentao@126.com> Signed-off-by: Santino Ramos <santinor@inferact.ai> Signed-off-by: haosdent <haosdent@gmail.com> Signed-off-by: JartX <sagformas@epdcenter.es> Signed-off-by: George-ao <yuyiao772@gmail.com> Signed-off-by: Yuyi Ao <yuyiao772@gmail.com> Signed-off-by: Tyler Michael Smith <tlrmchlsmth@gmail.com> Signed-off-by: Mukesh Baphna <mukesh@hippocraticai.com> Signed-off-by: Pedram Razavi <pedram.razavi@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Michael Goin <mgoin64@gmail.com> Co-authored-by: Xinyu Chen <xinyu1.chen@intel.com> Co-authored-by: Ekagra Ranjan <3116519+ekagra-ranjan@users.noreply.github.com> Co-authored-by: Rishi Puri <riship@nvidia.com> Co-authored-by: zzaebok <44357534+zzaebok@users.noreply.github.com> Co-authored-by: Cyrus Leung <tlleungac@connect.ust.hk> Co-authored-by: Yuwei An <ayw.sirius19@gmail.com> Co-authored-by: yuwei <yuwei@dev.local> Co-authored-by: Artem Perevedentsev <aperevedents@nvidia.com> Co-authored-by: Ibrahim Arshad <38925737+ibrahim1023@users.noreply.github.com> Co-authored-by: Chuan (Richard) Li <chuali@amd.com> Co-authored-by: Chauncey <chaunceyjiang@gmail.com> Co-authored-by: Kunshang Ji <kunshang.ji@intel.com> Co-authored-by: Ganesh R <ganesh.r@amd.com> Co-authored-by: Lucas Wilkinson <LucasWilkinson@users.noreply.github.com> Co-authored-by: Robert Shaw <114415538+robertgshaw2-redhat@users.noreply.github.com> Co-authored-by: Kyungmin Lee <30465912+lkm2835@users.noreply.github.com> Co-authored-by: Ronen Schaffer <ronen.schaffer@ibm.com> Co-authored-by: Srreyansh Sethi <107075589+WorldExplored@users.noreply.github.com> Co-authored-by: vnadathur <glvikramn@gmail.com> Co-authored-by: vnadathur <236933696+vnadathur@users.noreply.github.com> Co-authored-by: Isotr0py <mozf@mail2.sysu.edu.cn> Co-authored-by: Elham <elham.harirpoush@arm.com> Co-authored-by: Yan Ma <yan.ma@intel.com> Co-authored-by: Nick Hill <nickhill123@gmail.com> Co-authored-by: Chaofan Wang <jackcfwang@tencent.com> Co-authored-by: Chendi.Xue <chendi.xue@intel.com> Co-authored-by: Injae Ryou <injaeryou@gmail.com> Co-authored-by: Richard Zou <zou3519@users.noreply.github.com> Co-authored-by: milesial <milesial@users.noreply.github.com> Co-authored-by: Elvir Crnčević <elvircrn@gmail.com> Co-authored-by: Claude Sonnet 4 <noreply@anthropic.com> Co-authored-by: Hexiang Wang <56632993+whx-sjtu@users.noreply.github.com> Co-authored-by: Lalithnarayan C <Lalithnarayan.C@amd.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Luka Govedič <ProExpertProg@users.noreply.github.com> Co-authored-by: PatchyTIS <58251192+PatchouliTIS@users.noreply.github.com> Co-authored-by: PatchouliTaisa <patchychen@tencent.com> Co-authored-by: jatseng-ai <janet.tseng@amd.com> Co-authored-by: Matthias Gehre <matthias.gehre@amd.com> Co-authored-by: xaguilar-amd <xavier.aguilarfruto@amd.com> Co-authored-by: Ravitez Dondeti <dondetir@users.noreply.github.com> Co-authored-by: Nicolò Lucchesi <nlucches@redhat.com> Co-authored-by: Peter Nguyen <petern0408@gmail.com> Co-authored-by: wang.yuqi <yuqi.wang@daocloud.io> Co-authored-by: zhrrr <43847754+izhuhaoran@users.noreply.github.com> Co-authored-by: Jee Jee Li <pandaleefree@gmail.com> Co-authored-by: TJian <tunjian.tan@embeddedllm.com> Co-authored-by: Jesus Federico <14651+jefp@users.noreply.github.com> Co-authored-by: Manu <efortin@users.noreply.github.com> Co-authored-by: zhanqiuhu <49648934+ZhanqiuHu@users.noreply.github.com> Co-authored-by: yzong-rh <yzong@redhat.com> Co-authored-by: Fynn Schmitt-Ulms <fschmitt@redhat.com> Co-authored-by: Rahul-Tuli <rtuli@redhat.com> Co-authored-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Co-authored-by: Benjamin Chislett <bchislett@nvidia.com> Co-authored-by: Tianyu Guo <guoty9@mail2.sysu.edu.cn> Co-authored-by: Lee Yongjun <35302114+elwhyjay@users.noreply.github.com> Co-authored-by: z1ying <55220715+z1ying@users.noreply.github.com> Co-authored-by: Li, Jiang <jiang1.li@intel.com> Co-authored-by: Vibhav Agarwal <vibhavagarwal5@gmail.com> Co-authored-by: vibhav-agarwal <vibhav.agarwal@glance.com> Co-authored-by: ShubyM <shubymishra20@gmail.com> Co-authored-by: Wei Zhao <51183510+wzhao18@users.noreply.github.com> Co-authored-by: Itay Etelis <92247226+Etelis@users.noreply.github.com> Co-authored-by: Itay Etelis <itay.etelis@ibm.com> Co-authored-by: EdalatiAli <aliedalati@cohere.com> Co-authored-by: Andreas Karatzas <akaratza@amd.com> Co-authored-by: r266-tech <r2668940489@gmail.com> Co-authored-by: Roger Wang <hey@rogerw.io> Co-authored-by: Martin Hickey <martin.hickey@ie.ibm.com> Co-authored-by: Or Ozeri <or@ozery.com> Co-authored-by: Mark McLoughlin <markmc@redhat.com> Co-authored-by: Le Yang <562593859@qq.com> Co-authored-by: Animesh Jain <anijain@umich.edu> Co-authored-by: Yongye Zhu <zyy1102000@gmail.com> Co-authored-by: Zhengxu Chen <zhxchen17@fb.com> Co-authored-by: Kaicheng Yang <53411596+EricccYang@users.noreply.github.com> Co-authored-by: maobaolong <baoloongmao@tencent.com> Co-authored-by: sihao_li <165983188+1643661061leo@users.noreply.github.com> Co-authored-by: Flora Feng <4florafeng@gmail.com> Co-authored-by: Yufeng He <40085740+he-yufeng@users.noreply.github.com> Co-authored-by: zofia <110436990+zufangzhu@users.noreply.github.com> Co-authored-by: Tihomir Elek <tiho.elek@gmail.com> Co-authored-by: Yi Liu <yi4.liu@intel.com> Co-authored-by: Wentao Ye <44945378+yewentao256@users.noreply.github.com> Co-authored-by: Santino Ramos <51103228+santiramos27@users.noreply.github.com> Co-authored-by: haosdent <haosdent@gmail.com> Co-authored-by: JartX <sagformas@epdcenter.es> Co-authored-by: Yuyi Ao <yuyiao772@gmail.com> Co-authored-by: Tyler Michael Smith <tyler@neuralmagic.com> Co-authored-by: mukesh-hai <mukesh@hippocraticai.com> Co-authored-by: Pedram Razavi <pedram@sierra.ai>
151 lines
5.4 KiB
Python
151 lines
5.4 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
|
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
|
"""Unit tests for tool_calls Iterable → list materialisation.
|
|
|
|
Regression tests for https://github.com/vllm-project/vllm/issues/34792.
|
|
|
|
Setting VLLM_LOGGING_LEVEL=debug caused tool calling to break for Mistral
|
|
models because:
|
|
1. The OpenAI Python SDK types tool_calls as Iterable[...] in
|
|
ChatCompletionAssistantMessageParam.
|
|
2. Pydantic v2, when validating from Python objects (not from raw JSON),
|
|
wraps Iterable fields in a one-shot lazy iterator.
|
|
3. Debug logging called model_dump_json() which consumed that iterator.
|
|
4. The Mistral tokenizer then saw empty tool_calls and raised
|
|
"ValueError: Unexpected tool call id ...".
|
|
"""
|
|
|
|
import pytest
|
|
|
|
from vllm.entrypoints.openai.chat_completion.protocol import ChatCompletionRequest
|
|
|
|
|
|
def _make_tool_call(tc_id: str, name: str, args: str) -> dict:
|
|
return {
|
|
"id": tc_id,
|
|
"type": "function",
|
|
"function": {"name": name, "arguments": args},
|
|
}
|
|
|
|
|
|
def _make_request(messages: list) -> ChatCompletionRequest:
|
|
return ChatCompletionRequest(
|
|
model="test-model",
|
|
messages=messages,
|
|
)
|
|
|
|
|
|
def test_tool_calls_list_preserved_after_model_dump():
|
|
"""tool_calls in assistant messages must be readable after model_dump_json.
|
|
|
|
When the request is built from Python dicts (as in the Anthropic → OpenAI
|
|
conversion path), Pydantic v2 previously wrapped the Iterable tool_calls
|
|
in a one-shot iterator. model_dump_json() consumed it, leaving subsequent
|
|
readers (e.g. the Mistral tokenizer) with an empty sequence.
|
|
"""
|
|
tool_call = _make_tool_call("call_abc123", "get_weather", '{"city": "Paris"}')
|
|
messages = [
|
|
{"role": "user", "content": "What is the weather in Paris?"},
|
|
{"role": "assistant", "content": None, "tool_calls": [tool_call]},
|
|
{
|
|
"role": "tool",
|
|
"tool_call_id": "call_abc123",
|
|
"content": '{"temperature": 20}',
|
|
},
|
|
]
|
|
|
|
req = _make_request(messages)
|
|
|
|
# Simulate debug logging: serialize the model (this was the trigger)
|
|
_ = req.model_dump_json()
|
|
|
|
# The assistant message must still have accessible tool_calls afterwards
|
|
assistant_msg = req.messages[1]
|
|
assert isinstance(assistant_msg, dict)
|
|
tool_calls = assistant_msg.get("tool_calls")
|
|
assert tool_calls is not None, "tool_calls must not be None after model_dump_json"
|
|
assert isinstance(tool_calls, list), "tool_calls must be a list"
|
|
assert len(tool_calls) > 0, "tool_calls must not be empty after model_dump_json"
|
|
|
|
|
|
def test_tool_calls_from_generator_are_materialised():
|
|
"""tool_calls passed as a generator must be converted to list on validation."""
|
|
tool_call = _make_tool_call("call_gen1", "search", '{"query": "vllm"}')
|
|
|
|
def tool_calls_gen():
|
|
yield tool_call
|
|
|
|
messages = [
|
|
{"role": "user", "content": "Search for vllm"},
|
|
{
|
|
"role": "assistant",
|
|
"content": None,
|
|
"tool_calls": tool_calls_gen(), # one-shot generator
|
|
},
|
|
]
|
|
|
|
req = _make_request(messages)
|
|
assistant_msg = req.messages[1]
|
|
assert isinstance(assistant_msg, dict)
|
|
|
|
# Iterate twice — must not raise or return empty on second pass
|
|
tool_calls_first = list(assistant_msg.get("tool_calls", []))
|
|
tool_calls_second = list(assistant_msg.get("tool_calls", []))
|
|
|
|
assert len(tool_calls_first) == 1, "First read must return the tool call"
|
|
assert len(tool_calls_second) == 1, "Second read must also return the tool call"
|
|
|
|
|
|
def test_tool_calls_list_passthrough():
|
|
"""tool_calls already provided as a list must remain a list."""
|
|
tool_call = _make_tool_call("call_list1", "calculate", '{"expr": "2+2"}')
|
|
messages = [
|
|
{"role": "user", "content": "Calculate 2+2"},
|
|
{"role": "assistant", "content": None, "tool_calls": [tool_call]},
|
|
]
|
|
|
|
req = _make_request(messages)
|
|
assistant_msg = req.messages[1]
|
|
assert isinstance(assistant_msg, dict)
|
|
assert isinstance(assistant_msg.get("tool_calls"), list)
|
|
|
|
|
|
def test_messages_without_tool_calls_unaffected():
|
|
"""Messages without tool_calls must be handled correctly."""
|
|
messages = [
|
|
{"role": "system", "content": "You are a helpful assistant."},
|
|
{"role": "user", "content": "Hello!"},
|
|
{"role": "assistant", "content": "Hi there!"},
|
|
]
|
|
|
|
req = _make_request(messages)
|
|
# None of the messages should have tool_calls injected
|
|
for msg in req.messages:
|
|
assert isinstance(msg, dict)
|
|
assert msg.get("tool_calls") is None or msg.get("tool_calls") == []
|
|
|
|
|
|
@pytest.mark.parametrize("num_tool_calls", [1, 3])
|
|
def test_multiple_tool_calls_materialised(num_tool_calls: int):
|
|
"""Multiple tool calls in a single message are all preserved."""
|
|
tool_calls = [
|
|
_make_tool_call(f"call_{i}", f"func_{i}", f'{{"arg": {i}}}')
|
|
for i in range(num_tool_calls)
|
|
]
|
|
messages = [
|
|
{"role": "user", "content": "Do things"},
|
|
{"role": "assistant", "content": None, "tool_calls": iter(tool_calls)},
|
|
]
|
|
|
|
req = _make_request(messages)
|
|
assistant_msg = req.messages[1]
|
|
assert isinstance(assistant_msg, dict)
|
|
|
|
result_tool_calls = assistant_msg.get("tool_calls")
|
|
assert isinstance(result_tool_calls, list)
|
|
assert len(result_tool_calls) == num_tool_calls
|
|
|
|
# Verify after model_dump_json too
|
|
_ = req.model_dump_json()
|
|
assert len(assistant_msg.get("tool_calls", [])) == num_tool_calls
|