diff --git a/tests/test_sampling_params.py b/tests/test_sampling_params.py index 65ab0738c9..cd23ea9938 100644 --- a/tests/test_sampling_params.py +++ b/tests/test_sampling_params.py @@ -49,3 +49,25 @@ def test_diffusion_accepts_top_k_top_p(): def test_non_diffusion_models_unaffected(): params = SamplingParams(temperature=0.7, top_k=10, seed=42) params.verify(MockModelConfig(), None, None, None) + + +@pytest.mark.parametrize("value", [-(2**63) - 1, 2**64]) +def test_extra_args_rejects_nested_integer_overflow(value): + """Reject extension values before they reach the engine transport.""" + with pytest.raises(VLLMValidationError, match="extra_args integers"): + SamplingParams(extra_args={"ec_transfer_params": {"nested": [{"x": value}]}}) + + +@pytest.mark.parametrize("value", [-(2**63), 2**63 - 1, 2**63, 2**64 - 1, True]) +def test_extra_args_accepts_messagepack_integer_boundaries(value): + extra_args = {"kv_transfer_params": {"nested": [{"x": value}]}} + assert SamplingParams(extra_args=extra_args).extra_args == extra_args + + +def test_extra_args_preserves_custom_objects_and_shared_containers(): + custom = object() + shared = [custom, (None, "value", 1.5)] + extra_args = {"first": shared, "second": shared} + params = SamplingParams(extra_args=extra_args) + assert params.extra_args["first"][0] is custom + assert params.extra_args["first"] is params.extra_args["second"] diff --git a/vllm/sampling_params.py b/vllm/sampling_params.py index 7cf152fc7d..7108803065 100644 --- a/vllm/sampling_params.py +++ b/vllm/sampling_params.py @@ -544,6 +544,8 @@ class SamplingParams( def _verify_args(self) -> None: _verify_num_sequences(self.n, "n") + if self.extra_args: + self._verify_extra_args() if not -2.0 <= self.presence_penalty <= 2.0: raise VLLMValidationError( f"presence_penalty must be in [-2, 2], got {self.presence_penalty}." @@ -655,6 +657,26 @@ class SamplingParams( f"Got bad_words={self.bad_words}" ) + def _verify_extra_args(self) -> None: + # JSON accepts arbitrary integers, but the engine's MessagePack + # transport only supports signed/unsigned 64-bit integers. + pending: list[Any] = [self.extra_args] + visited: set[int] = set() + while pending: + value = pending.pop() + if isinstance(value, int) and not -(2**63) <= value < 2**64: + raise VLLMValidationError( + "extra_args integers must be between -2**63 and 2**64 - 1.", + parameter="extra_args", + ) + if isinstance(value, (dict, list, tuple)) and id(value) not in visited: + visited.add(id(value)) + if isinstance(value, dict): + pending.extend(value.keys()) + pending.extend(value.values()) + else: + pending.extend(value) + def _verify_greedy_sampling(self) -> None: if self.n > 1: raise VLLMValidationError(