rebase

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

Author: gaocegege

tests/reasoning/test_deepseekr1_reasoning_parser.py

@@ -94,21 +94,25 @@ def deepseek_r1_qwen_tokenizer():
     "output": "<think>This is a reasoning section",
     "reasoning_content": "This is a reasoning section",
     "content": None,
+    "is_reasoning_end": False,
 }
 EMPTY = {
     "output": "",
     "reasoning_content": "",
     "content": None,
+    "is_reasoning_end": False,
 }
 EMPTY_STREAMING = {
     "output": "",
     "reasoning_content": None,
     "content": None,
+    "is_reasoning_end": False,
 }
 NEW_LINE = {
     "output": "\n<think>This is a reasoning section</think>\nThis is the rest",
     "reasoning_content": "This is a reasoning section",
     "content": "\nThis is the rest",
+    "is_reasoning_end": True,
 }
 # Streaming cannot handle new lines at the beginning of the output
 # because we need to support <think>...</think> and </think>...
@@ -118,6 +122,7 @@ def deepseek_r1_qwen_tokenizer():
     "output": "\n<think>This is a reasoning section</think>\nThis is the rest",
     "reasoning_content": "\nThis is a reasoning section",
     "content": "\nThis is the rest",
+    "is_reasoning_end": True,
 }
 
 TEST_CASES = [

vllm/reasoning/deepseek_r1_reasoning_parser.py

@@ -152,7 +152,7 @@ def extract_reasoning_content(
 
         # Check if the start token is present in the model output, remove it
         # if it is present.
-        model_output_parts = model_output.partition(self.think_start_token)
+        model_output_parts = model_output.partition(self.start_token)
         model_output = model_output_parts[2] if model_output_parts[
             1] else model_output_parts[0]
 
@@ -163,7 +163,7 @@ def extract_reasoning_content(
             return model_output, None
         else:
             reasoning_content, _, content = model_output.partition(
-                self.think_end_token)
+                self.end_token)
             # If the end token is not found, return the model output as is.
             # It should not happen since we already checked for the presence
             # of the end token.