From 5c9ff5366b039a69b344773bdfead8466ed9a097 Mon Sep 17 00:00:00 2001 From: Yufeng He <40085740+he-yufeng@users.noreply.github.com> Date: Tue, 18 Aug 2026 16:22:13 +0800 Subject: [PATCH] [Bugfix] Accept logprobs=-1 in the Completion API (#46175) Signed-off-by: Yufeng He <40085740+he-yufeng@users.noreply.github.com> --- .../completion/test_completion_error.py | 24 +++++++++++++++++++ .../entrypoints/openai/completion/protocol.py | 8 +++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/tests/entrypoints/openai/completion/test_completion_error.py b/tests/entrypoints/openai/completion/test_completion_error.py index 2f3db9f697..79fd6206d6 100644 --- a/tests/entrypoints/openai/completion/test_completion_error.py +++ b/tests/entrypoints/openai/completion/test_completion_error.py @@ -476,6 +476,30 @@ def test_negative_prompt_token_ids_flat(): ) +def test_logprobs_minus_one_allowed(): + """logprobs=-1 means "return all logprobs". The sampling layer and the chat + top_logprobs / prompt_logprobs validators all accept -1, so the completion + logprobs validator must accept it too instead of rejecting it as negative.""" + request = CompletionRequest( + model=MODEL_NAME, + prompt="Test prompt", + max_tokens=10, + logprobs=-1, + ) + assert request.logprobs == -1 + + +def test_logprobs_below_minus_one_rejected(): + """Values more negative than -1 stay invalid.""" + with pytest.raises(Exception, match="must be a positive value or -1"): + CompletionRequest( + model=MODEL_NAME, + prompt="Test prompt", + max_tokens=10, + logprobs=-2, + ) + + class TestCompletionPromptListLimit: """Regression tests for CVE: unbounded prompt list fan-out.""" diff --git a/vllm/entrypoints/openai/completion/protocol.py b/vllm/entrypoints/openai/completion/protocol.py index 0cb8302946..2fc6ce1cd9 100644 --- a/vllm/entrypoints/openai/completion/protocol.py +++ b/vllm/entrypoints/openai/completion/protocol.py @@ -526,9 +526,13 @@ class CompletionRequest(OpenAIBaseModel): parameter="prompt_logprobs", value=prompt_logprobs, ) - if (logprobs := data.get("logprobs")) is not None and logprobs < 0: + if ( + (logprobs := data.get("logprobs")) is not None + and logprobs < 0 + and logprobs != -1 + ): raise VLLMValidationError( - "`logprobs` must be a positive value.", + "`logprobs` must be a positive value or -1.", parameter="logprobs", value=logprobs, )