From 43813e6361f3c0fd411f12ece9eab693e29860ff Mon Sep 17 00:00:00 2001 From: Reid <61492567+reidliu41@users.noreply.github.com> Date: Sun, 6 Jul 2025 18:25:29 +0800 Subject: [PATCH] [Misc] call the pre-defined func (#20518) Signed-off-by: reidliu41 --- .../entrypoints/openai/tool_parsers/deepseekv3_tool_parser.py | 4 ++-- vllm/entrypoints/openai/tool_parsers/xlam_tool_parser.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vllm/entrypoints/openai/tool_parsers/deepseekv3_tool_parser.py b/vllm/entrypoints/openai/tool_parsers/deepseekv3_tool_parser.py index 60025af2a6f33..da4760ad1b642 100644 --- a/vllm/entrypoints/openai/tool_parsers/deepseekv3_tool_parser.py +++ b/vllm/entrypoints/openai/tool_parsers/deepseekv3_tool_parser.py @@ -6,6 +6,7 @@ from typing import Union import regex as re +from vllm.entrypoints.chat_utils import random_tool_call_id from vllm.entrypoints.openai.protocol import (ChatCompletionRequest, DeltaFunctionCall, DeltaMessage, DeltaToolCall, @@ -15,7 +16,6 @@ from vllm.entrypoints.openai.tool_parsers.abstract_tool_parser import ( ToolParser, ToolParserManager) from vllm.logger import init_logger from vllm.transformers_utils.tokenizer import AnyTokenizer -from vllm.utils import random_uuid logger = init_logger(__name__) @@ -267,7 +267,7 @@ class DeepSeekV3ToolParser(ToolParser): DeltaToolCall( index=self.current_tool_id, type="function", - id=f"chatcmpl-tool-{random_uuid()}", + id=random_tool_call_id(), function=DeltaFunctionCall( name=function_name).model_dump( exclude_none=True), diff --git a/vllm/entrypoints/openai/tool_parsers/xlam_tool_parser.py b/vllm/entrypoints/openai/tool_parsers/xlam_tool_parser.py index 9392e4f0e1dc2..321718b1c950b 100644 --- a/vllm/entrypoints/openai/tool_parsers/xlam_tool_parser.py +++ b/vllm/entrypoints/openai/tool_parsers/xlam_tool_parser.py @@ -7,6 +7,7 @@ from typing import Any, Optional, Union import regex as re +from vllm.entrypoints.chat_utils import random_tool_call_id from vllm.entrypoints.openai.protocol import (ChatCompletionRequest, DeltaFunctionCall, DeltaMessage, DeltaToolCall, @@ -225,7 +226,7 @@ class xLAMToolParser(ToolParser): function_name = name_match.group(1) # The test expects us to send just the name first - tool_id = f"chatcmpl-tool-{random_uuid()}" + tool_id = random_tool_call_id() delta = DeltaMessage(tool_calls=[ DeltaToolCall( index=0,