[Refactor] Simplify BOS/EOS token handling (#34435)
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
This commit is contained in:
@@ -9,6 +9,7 @@ from typing import Any, Literal
|
||||
import msgspec
|
||||
import numpy as np
|
||||
import torch
|
||||
from typing_extensions import deprecated
|
||||
|
||||
from vllm.lora.request import LoRARequest
|
||||
from vllm.multimodal.inputs import MultiModalFeatureSpec
|
||||
@@ -63,7 +64,6 @@ class EngineCoreRequest(
|
||||
mm_features: list[MultiModalFeatureSpec] | None
|
||||
sampling_params: SamplingParams | None
|
||||
pooling_params: PoolingParams | None
|
||||
eos_token_id: int | None
|
||||
arrival_time: float
|
||||
lora_request: LoRARequest | None
|
||||
cache_salt: str | None
|
||||
@@ -99,6 +99,17 @@ class EngineCoreRequest(
|
||||
assert self.pooling_params is not None
|
||||
return self.pooling_params
|
||||
|
||||
@property
|
||||
@deprecated(
|
||||
"EngineCoreRequest.eos_token_id will be removed in v0.18. "
|
||||
"Please use EngineCoreRequest.sampling_params.eos_token_id instead."
|
||||
)
|
||||
def eos_token_id(self) -> int | None:
|
||||
if self.sampling_params is None:
|
||||
return None
|
||||
|
||||
return self.sampling_params.eos_token_id
|
||||
|
||||
|
||||
class EngineCoreEventType(enum.IntEnum):
|
||||
"""The type of engine core request event."""
|
||||
|
||||
@@ -376,8 +376,6 @@ class InputProcessor:
|
||||
processed_inputs=processed_inputs,
|
||||
)
|
||||
|
||||
eos_token_id = self.input_preprocessor.get_eos_token_id()
|
||||
|
||||
encoder_inputs, decoder_inputs = split_enc_dec_inputs(processed_inputs)
|
||||
self._validate_model_inputs(encoder_inputs, decoder_inputs)
|
||||
|
||||
@@ -403,7 +401,7 @@ class InputProcessor:
|
||||
|
||||
sampling_params.update_from_generation_config(
|
||||
self.generation_config_fields,
|
||||
None if self.tokenizer is None else self.tokenizer.eos_token_id,
|
||||
self.renderer.get_eos_token_id(),
|
||||
)
|
||||
if self.tokenizer is not None:
|
||||
sampling_params.update_from_tokenizer(self.tokenizer)
|
||||
@@ -446,7 +444,6 @@ class InputProcessor:
|
||||
mm_features=mm_features,
|
||||
sampling_params=sampling_params,
|
||||
pooling_params=pooling_params,
|
||||
eos_token_id=eos_token_id,
|
||||
arrival_time=arrival_time,
|
||||
lora_request=lora_request,
|
||||
cache_salt=decoder_inputs.get("cache_salt"),
|
||||
|
||||
Reference in New Issue
Block a user