Rename field and nullify empty lists

Signed-off-by: Qier Li <[email protected]>

Author: QierLi

tests/v1/worker/test_gpu_model_runner.py

@@ -249,7 +249,7 @@ def test_update_states_request_resumed(model_runner, dist_init):
         req_ids=[req_id],
         resumed_from_preemption=[False],
         new_token_ids=[[]],
-        token_ids=[[]],
+        resumed_req_token_ids=[[]],
         new_block_ids=([[0]], ),
         num_computed_tokens=[0],
     )

vllm/v1/core/sched/output.py

@@ -89,7 +89,7 @@ class CachedRequestData:
     new_token_ids: list[list[int]]
     # If resumed_from_preemption is True, propogate the token ids to the
     # connector, otherwise will be empty.
-    token_ids: list[list[int]]
+    resumed_req_token_ids: list[Optional[list[int]]]
     new_block_ids: list[Optional[tuple[list[int], ...]]]
     num_computed_tokens: list[int]
 
@@ -103,7 +103,7 @@ def make_empty(cls) -> CachedRequestData:
             req_ids=[],
             resumed_from_preemption=[],
             new_token_ids=[],
-            token_ids=[],
+            resumed_req_token_ids=[],
             new_block_ids=[],
             num_computed_tokens=[],
         )

vllm/v1/core/sched/scheduler.py

@@ -669,7 +669,7 @@ def _make_cached_request_data(
         req_ids: list[str] = []
         new_token_ids: list[list[int]] = []
         new_block_ids: list[Optional[tuple[list[int], ...]]] = []
-        token_ids: list[list[int]] = []
+        resumed_req_token_ids: list[Optional[list[int]]] = []
         num_computed_tokens: list[int] = []
 
         use_connector = self.connector is not None
@@ -688,21 +688,22 @@ def _make_cached_request_data(
                 # stage worker and the last-stage worker. Otherwise, we don't
                 # need to send the sampled tokens back because the model runner
                 # will cache them.
-                tokens = req.all_token_ids[req.num_computed_tokens:req.
-                                           num_computed_tokens + num_tokens]
-                new_token_ids.append(tokens)
-                token_ids.append([])
+                token_ids = req.all_token_ids[req.num_computed_tokens:req.
+                                              num_computed_tokens + num_tokens]
+                new_token_ids.append(token_ids)
+                resumed_req_token_ids.append(None)
             elif use_connector:
                 # When using a KVConnector, we add a placeholder to avoid index
                 # out of bounds errors. TODO: Remove this once the KVConnector
                 # is updated to handle token IDs properly.
                 new_token_ids.append([])
                 if resumed_from_preemption[idx]:
-                    tokens = req.all_token_ids[:req.num_computed_tokens +
-                                               num_tokens]
-                    token_ids.append(tokens)
+                    resumed_token_ids = req.all_token_ids[:req.
+                                                          num_computed_tokens +
+                                                          num_tokens]
+                    resumed_req_token_ids.append(resumed_token_ids)
                 else:
-                    token_ids.append([])
+                    resumed_req_token_ids.append(None)
             new_block_ids.append(
                 req_to_new_blocks[req_id].get_block_ids(allow_none=True))
             num_computed_tokens.append(req.num_computed_tokens)
@@ -711,7 +712,7 @@ def _make_cached_request_data(
             req_ids=req_ids,
             resumed_from_preemption=resumed_from_preemption,
             new_token_ids=new_token_ids,
-            token_ids=token_ids,
+            resumed_req_token_ids=resumed_req_token_ids,
             new_block_ids=new_block_ids,
             num_computed_tokens=num_computed_tokens,
         )