fix: Address comments

Signed-off-by: Ce Gao <cegao@tensorchord.ai>

tests/entrypoints/openai/test_cli_args.py

@@ -116,6 +116,35 @@ def test_enable_auto_choice_passes_with_tool_call_parser(serve_parser):
     validate_parsed_serve_args(args)
 
 
+def test_enable_auto_choice_fails_with_enable_reasoning(serve_parser):
+    """Ensure validation fails if reasoning is enabled with auto tool choice"""
+    args = serve_parser.parse_args(args=[
+        "--enable-auto-tool-choice",
+        "--enable-reasoning",
+    ])
+    with pytest.raises(TypeError):
+        validate_parsed_serve_args(args)
+
+
+def test_enable_reasoning_passes_with_reasoning_parser(serve_parser):
+    """Ensure validation passes if reasoning is enabled 
+    with a reasoning parser"""
+    args = serve_parser.parse_args(args=[
+        "--enable-reasoning",
+        "--reasoning-parser",
+        "deepseek_r1",
+    ])
+    validate_parsed_serve_args(args)
+
+
+def test_enable_reasoning_fails_without_reasoning_parser(serve_parser):
+    """Ensure validation fails if reasoning is enabled 
+    without a reasoning parser"""
+    args = serve_parser.parse_args(args=["--enable-reasoning"])
+    with pytest.raises(TypeError):
+        validate_parsed_serve_args(args)
+
+
 def test_chat_template_validation_for_happy_paths(serve_parser):
     """Ensure validation passes if the chat template exists"""
     args = serve_parser.parse_args(

vllm/entrypoints/openai/cli_args.py

@@ -211,7 +211,7 @@ def make_arg_parser(parser: FlexibleArgumentParser) -> FlexibleArgumentParser:
         "``--tool-call-parser`` to specify which parser to use.")
     parser.add_argument(
         "--enable-reasoning",
-        type=bool,
+        action="store_true",
         default=False,
         help="Whether to enable reasoning_content for the model."
         "If enabled, the model will be able to generate reasoning content.")
@@ -292,7 +292,7 @@ def validate_parsed_serve_args(args: argparse.Namespace):
 
     # Ref https://api-docs.deepseek.com/guides/reasoning_model
     # tool call and reasoning cannot be enabled at the same time.
-    if args.enable_auto_tool_choice and args.enable_auto_tool_choice:
+    if args.enable_auto_tool_choice and args.enable_reasoning:
         raise TypeError(
             "Error: --enable-auto-tool-choice and "
             "--enable-reasoning cannot be enabled at the same time")

vllm/entrypoints/openai/reasoning_parsers/deepseek_r1_reasoning_parser.py

@@ -72,8 +72,8 @@ def extract_reasoning_content_streaming(
                 end_index = delta_text.find(self.think_end_token)
                 reasoning_content = delta_text[:end_index]
                 content = delta_text[end_index + len(self.think_end_token):]
-                return DeltaMessage(reasoning_content,
-                                    content if content else None)
+                return DeltaMessage(reasoning_content=reasoning_content,
+                                    content=content if content else None)
             elif self.think_end_token_id in previous_token_ids:
                 # <think> in previous, </think> in previous,
                 # reasoning content continues
@@ -92,8 +92,8 @@ def extract_reasoning_content_streaming(
                                                len(self.think_start_token
                                                    ):end_index]
                 content = delta_text[end_index + len(self.think_end_token):]
-                return DeltaMessage(reasoning_content,
-                                    content if content else None)
+                return DeltaMessage(reasoning_content=reasoning_content,
+                                    content=content if content else None)
             else:
                 # <think> in delta, no </think> in delta,
                 # reasoning content continues