[Refactor] to simplify and extract the shared logic between chat completion and responses

chaunceyjiang · chaunceyjiang · commit c46a8c829efc · 2025-11-03T08:36:09.000Z
Signed-off-by: chaunceyjiang &lt;chaunceyjiang@gmail.com&gt;
diff --git a/vllm/entrypoints/openai/serving_engine.py b/vllm/entrypoints/openai/serving_engine.py
@@ -1356,6 +1356,8 @@ def _parse_tool_calls_from_content(
             )
             content = None  # Clear content since tool is called.
         elif request.tool_choice == "auto" or request.tool_choice == "none":
+            assert tool_parser_cls is not None
+            # Automatic Tool Call Parsing
             try:
                 tool_parser = tool_parser_cls(tokenizer)
             except RuntimeError as e:

Original file line number	Diff line number	Diff line change
`@@ -1356,6 +1356,8 @@ def _parse_tool_calls_from_content(`
`1356`	`1356`	`)`
`1357`	`1357`	`content = None # Clear content since tool is called.`
`1358`	`1358`	`elif request.tool_choice == "auto" or request.tool_choice == "none":`
	`1359`	`+ assert tool_parser_cls is not None`
	`1360`	`+ # Automatic Tool Call Parsing`
`1359`	`1361`	`try:`
`1360`	`1362`	`tool_parser = tool_parser_cls(tokenizer)`
`1361`	`1363`	`except RuntimeError as e:`