mirror of
https://git.datalinker.icu/vllm-project/vllm.git
synced 2026-05-06 00:05:43 +08:00
[openai] Fix missing tool usage check (system message) (#24768)
Signed-off-by: kyt <eluban4532@gmail.com> Signed-off-by: yewentao256 <zhyanwentao@126.com>
This commit is contained in:
parent
2168fc8fae
commit
fa29d31f0d
@ -698,6 +698,22 @@ async def test_function_calling_required(client: OpenAI, model_name: str):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
@pytest.mark.parametrize("model_name", [MODEL_NAME])
|
||||||
|
async def test_system_message_with_tools(client: OpenAI, model_name: str):
|
||||||
|
from vllm.entrypoints.harmony_utils import get_system_message
|
||||||
|
|
||||||
|
# Test with custom tools enabled - commentary channel should be available
|
||||||
|
sys_msg = get_system_message(with_custom_tools=True)
|
||||||
|
valid_channels = sys_msg.content[0].channel_config.valid_channels
|
||||||
|
assert "commentary" in valid_channels
|
||||||
|
|
||||||
|
# Test with custom tools disabled - commentary channel should be removed
|
||||||
|
sys_msg = get_system_message(with_custom_tools=False)
|
||||||
|
valid_channels = sys_msg.content[0].channel_config.valid_channels
|
||||||
|
assert "commentary" not in valid_channels
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
@pytest.mark.parametrize("model_name", [MODEL_NAME])
|
@pytest.mark.parametrize("model_name", [MODEL_NAME])
|
||||||
async def test_function_calling_full_history(client: OpenAI, model_name: str):
|
async def test_function_calling_full_history(client: OpenAI, model_name: str):
|
||||||
|
|||||||
@ -1575,7 +1575,9 @@ class OpenAIServingChat(OpenAIServing):
|
|||||||
sys_msg = get_system_message(
|
sys_msg = get_system_message(
|
||||||
reasoning_effort=request.reasoning_effort,
|
reasoning_effort=request.reasoning_effort,
|
||||||
browser_description=None,
|
browser_description=None,
|
||||||
python_description=None)
|
python_description=None,
|
||||||
|
with_custom_tools=request.tools is not None
|
||||||
|
)
|
||||||
messages.append(sys_msg)
|
messages.append(sys_msg)
|
||||||
|
|
||||||
# Add developer message.
|
# Add developer message.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user