diff --git a/vllm/tool_parsers/glm4_moe_tool_parser.py b/vllm/tool_parsers/glm4_moe_tool_parser.py index 1779896e5b..213a774535 100644 --- a/vllm/tool_parsers/glm4_moe_tool_parser.py +++ b/vllm/tool_parsers/glm4_moe_tool_parser.py @@ -11,7 +11,6 @@ The fix streams string values incrementally as they arrive, providing a true streaming experience for long content. """ -import ast import json from collections.abc import Sequence from typing import Any @@ -42,6 +41,7 @@ from vllm.tool_parsers.utils import ( extract_types_from_schema, find_tool_properties, partial_tag_overlap, + safe_literal_eval, ) logger = init_logger(__name__) @@ -110,7 +110,7 @@ class Glm4MoeModelToolParser(ToolParser): pass try: - return ast.literal_eval(value) + return safe_literal_eval(value) except (ValueError, SyntaxError): pass diff --git a/vllm/tool_parsers/hy_v3_tool_parser.py b/vllm/tool_parsers/hy_v3_tool_parser.py index 496deb4f2d..619be5e9cc 100644 --- a/vllm/tool_parsers/hy_v3_tool_parser.py +++ b/vllm/tool_parsers/hy_v3_tool_parser.py @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project -import ast import json from collections.abc import Sequence from typing import Any @@ -27,6 +26,7 @@ from vllm.tool_parsers.abstract_tool_parser import ( Tool, ToolParser, ) +from vllm.tool_parsers.utils import safe_literal_eval logger = init_logger(__name__) @@ -183,13 +183,13 @@ class HYV3ToolParser(ToolParser): @staticmethod def _deserialize(value: str) -> Any: - """Deserialize a string value using json.loads then ast.literal_eval.""" + """Deserialize a string value using json.loads then safe_literal_eval.""" try: return json.loads(value) except Exception: pass try: - return ast.literal_eval(value) + return safe_literal_eval(value) except Exception: pass return value diff --git a/vllm/tool_parsers/minicpm5xml_tool_parser.py b/vllm/tool_parsers/minicpm5xml_tool_parser.py index fed9677411..a5b5252415 100644 --- a/vllm/tool_parsers/minicpm5xml_tool_parser.py +++ b/vllm/tool_parsers/minicpm5xml_tool_parser.py @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project -import ast import json from collections.abc import Sequence from typing import Any @@ -28,7 +27,7 @@ from vllm.tool_parsers.abstract_tool_parser import ( Tool, ToolParser, ) -from vllm.tool_parsers.utils import partial_tag_overlap +from vllm.tool_parsers.utils import partial_tag_overlap, safe_literal_eval from vllm.utils import random_uuid logger = init_logger(__name__) @@ -116,7 +115,7 @@ def _parse_arguments(json_value: str) -> tuple[Any, bool]: try: parsed_value = json.loads(json_value) except json.JSONDecodeError: - parsed_value = ast.literal_eval(json_value) + parsed_value = safe_literal_eval(json_value) return parsed_value, True except Exception: return json_value, False diff --git a/vllm/tool_parsers/poolside_v1_tool_parser.py b/vllm/tool_parsers/poolside_v1_tool_parser.py index f14b473629..e515e1ce63 100644 --- a/vllm/tool_parsers/poolside_v1_tool_parser.py +++ b/vllm/tool_parsers/poolside_v1_tool_parser.py @@ -11,7 +11,6 @@ The fix streams string values incrementally as they arrive, providing a true streaming experience for long content. """ -import ast import json from collections.abc import Sequence from typing import Any @@ -41,6 +40,7 @@ from vllm.tool_parsers.abstract_tool_parser import ( Tool, ToolParser, ) +from vllm.tool_parsers.utils import safe_literal_eval logger = init_logger(__name__) @@ -106,7 +106,7 @@ class PoolsideV1ToolParser(ToolParser): pass try: - return ast.literal_eval(value) + return safe_literal_eval(value) except (ValueError, SyntaxError): pass diff --git a/vllm/tool_parsers/qwen3xml_tool_parser.py b/vllm/tool_parsers/qwen3xml_tool_parser.py index d5b87ea074..e5d2b896e0 100644 --- a/vllm/tool_parsers/qwen3xml_tool_parser.py +++ b/vllm/tool_parsers/qwen3xml_tool_parser.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project -import ast import json from collections.abc import Sequence from typing import Any @@ -26,7 +25,7 @@ from vllm.tool_parsers.abstract_tool_parser import ( Tool, ToolParser, ) -from vllm.tool_parsers.utils import find_tool_properties +from vllm.tool_parsers.utils import find_tool_properties, safe_literal_eval logger = init_logger(__name__) @@ -824,7 +823,7 @@ class StreamingXMLToolCallParser: try: parsed_value = json.loads(raw_for_parse) except json.JSONDecodeError: - parsed_value = ast.literal_eval(raw_for_parse) + parsed_value = safe_literal_eval(raw_for_parse) output_arguments = json.dumps(parsed_value, ensure_ascii=False) except Exception: # Fallback: output as string as-is diff --git a/vllm/tool_parsers/step3p5_tool_parser.py b/vllm/tool_parsers/step3p5_tool_parser.py index b46f899ce2..8a48e2686e 100644 --- a/vllm/tool_parsers/step3p5_tool_parser.py +++ b/vllm/tool_parsers/step3p5_tool_parser.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project -import ast import json from collections.abc import Sequence from typing import Any @@ -23,6 +22,7 @@ from vllm.entrypoints.openai.engine.protocol import ( from vllm.logger import init_logger from vllm.tokenizers import TokenizerLike from vllm.tool_parsers.abstract_tool_parser import Tool, ToolParser +from vllm.tool_parsers.utils import safe_literal_eval logger = init_logger(__name__) @@ -1016,7 +1016,7 @@ class StreamingXMLToolCallParser: raw_for_parse = raw_text + "\n" else: raw_for_parse = raw_text - parsed_value = ast.literal_eval(raw_for_parse) + parsed_value = safe_literal_eval(raw_for_parse) output_arguments = json.dumps(parsed_value, ensure_ascii=False) except Exception: # Fallback: output as string as-is diff --git a/vllm/tool_parsers/utils.py b/vllm/tool_parsers/utils.py index 1c7830b320..6ee107433c 100644 --- a/vllm/tool_parsers/utils.py +++ b/vllm/tool_parsers/utils.py @@ -3,6 +3,7 @@ import ast import json +import warnings from json import JSONDecodeError, JSONDecoder from typing import Any, TypeAlias @@ -31,6 +32,12 @@ Tool: TypeAlias = ChatCompletionToolsParam | ResponsesTool logger = init_logger(__name__) +def safe_literal_eval(text: str): + with warnings.catch_warnings(): + warnings.simplefilter("ignore", SyntaxWarning) + return ast.literal_eval(text) + + def partial_tag_overlap(text: str, tag: str) -> int: """Length of the longest prefix of *tag* that matches a suffix of *text*.