From 7f1a5398e9610d96c473931a26c0e12bbe0d0423 Mon Sep 17 00:00:00 2001 From: aoshen02 Date: Thu, 24 Sep 2026 12:46:16 +0800 Subject: [PATCH] Fix full logprobs in token-in/token-out responses (#58488) Signed-off-by: aoshen02 --- .../token_in_token_out/test_tokens_logprobs.py | 10 ++++++++++ .../scale_out/token_in_token_out/serving.py | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/entrypoints/scale_out/token_in_token_out/test_tokens_logprobs.py b/tests/entrypoints/scale_out/token_in_token_out/test_tokens_logprobs.py index 80f08078da..f42a406f41 100644 --- a/tests/entrypoints/scale_out/token_in_token_out/test_tokens_logprobs.py +++ b/tests/entrypoints/scale_out/token_in_token_out/test_tokens_logprobs.py @@ -26,3 +26,13 @@ def test_logprobs_zero_emits_sampled_token(): num_output_top_logprobs=0, ) assert len(result.content[0].top_logprobs) == 1 + + +def test_logprobs_minus_one_emits_all_tokens(): + result = ServingTokens._create_tokens_logprobs( + None, + token_ids=[7], + top_logprobs=[{7: Logprob(-0.9), 8: Logprob(-1.1)}], + num_output_top_logprobs=-1, + ) + assert len(result.content[0].top_logprobs) == 2 diff --git a/vllm/entrypoints/scale_out/token_in_token_out/serving.py b/vllm/entrypoints/scale_out/token_in_token_out/serving.py index 59fda2dbf8..b480b802ec 100644 --- a/vllm/entrypoints/scale_out/token_in_token_out/serving.py +++ b/vllm/entrypoints/scale_out/token_in_token_out/serving.py @@ -590,7 +590,10 @@ class ServingTokens(GenerateBaseServing): step_top_logprobs.items() ) if num_output_top_logprobs is not None - and i < max(num_output_top_logprobs, 1) + and ( + num_output_top_logprobs == -1 + or i < max(num_output_top_logprobs, 1) + ) ], ) )