[Refactor] Suppress SyntaxWarning from ast.literal_eval in tool parsers (#44346)

Signed-off-by: sfeng33 <4florafeng@gmail.com>
This commit is contained in:
Flora Feng
2026-06-03 10:42:19 -04:00
committed by GitHub
parent e5232679a3
commit e3e132d2dd
7 changed files with 20 additions and 15 deletions
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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
+2 -3
View File
@@ -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
+2 -2
View File
@@ -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
+2 -3
View File
@@ -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
+2 -2
View File
@@ -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
+7
View File
@@ -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*.