[MyPy][3/N] Fix MyPy errors in test groups (part 3) (#55939)

Signed-off-by: Taimys <ffy2281693949@gmail.com>
Signed-off-by: Luyi Xiao <81631911+luyixiao95@users.noreply.github.com>
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Luyi Xiao <81631911+luyixiao95@users.noreply.github.com>
Co-authored-by: Taimys <ffy2281693949@gmail.com>
Co-authored-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Taimys
2026-09-30 11:06:07 +00:00
committed by GitHub
co-authored by Codex Luyi Xiao Taimys Harry Mellor Claude Opus 5.5
parent c4fa6f36a7
commit 5225f1bacb
118 changed files with 948 additions and 605 deletions
@@ -1,10 +1,11 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
from typing import TypedDict
from typing import TypedDict, cast
import pytest
import regex as re
from transformers import PreTrainedTokenizerBase
from tests.reasoning.utils import run_reasoning_extraction
from vllm.entrypoints.openai.chat_completion.protocol import (
@@ -52,8 +53,8 @@ class GraniteThinkingTokenizer:
@pytest.fixture
def tokenizer():
return GraniteThinkingTokenizer()
def tokenizer() -> PreTrainedTokenizerBase:
return cast(PreTrainedTokenizerBase, GraniteThinkingTokenizer())
# ── Basic reasoning extraction (non-streaming + streaming) ───────────
@@ -173,7 +174,7 @@ def tokenizer():
],
)
def test_granite_thinking_reasoning(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
streaming: bool,
param_dict: ReasoningCase,
):
@@ -195,7 +196,7 @@ def test_granite_thinking_reasoning(
def test_granite_thinking_no_content_after_end_token(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
parser_cls = ReasoningParserManager.get_reasoning_parser(parser_name)
parser = parser_cls(tokenizer)
@@ -215,7 +216,7 @@ def test_granite_thinking_no_content_after_end_token(
@pytest.mark.parametrize("streaming", [False, True])
def test_granite_thinking_whitespace_only_content(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
streaming: bool,
):
parser_cls = ReasoningParserManager.get_reasoning_parser(parser_name)
@@ -235,7 +236,7 @@ def test_granite_thinking_whitespace_only_content(
def test_granite_thinking_unterminated_think_block(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
parser_cls = ReasoningParserManager.get_reasoning_parser(parser_name)
parser = parser_cls(tokenizer)
@@ -260,7 +261,7 @@ def test_granite_thinking_unterminated_think_block(
def test_granite_thinking_disabled_moves_into_content(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
parser_cls = ReasoningParserManager.get_reasoning_parser(parser_name)
parser = parser_cls(tokenizer)
@@ -285,7 +286,7 @@ def test_granite_thinking_disabled_moves_into_content(
def test_granite_thinking_disabled_with_leading_newline(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
# With enable_thinking=False, model output goes through the swap
# path: content is initially None (all text classified as
@@ -316,7 +317,7 @@ def test_granite_thinking_disabled_with_leading_newline(
def test_granite_thinking_force_nonempty_content_moves_into_content(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
parser_cls = ReasoningParserManager.get_reasoning_parser(parser_name)
parser = parser_cls(tokenizer)
@@ -338,7 +339,7 @@ def test_granite_thinking_force_nonempty_content_moves_into_content(
def test_granite_thinking_force_nonempty_no_swap_when_newlines_only(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
# When </think> IS present and content is newlines-only, lstrip
# removes them but the swap should NOT fire — content was present,
@@ -363,7 +364,7 @@ def test_granite_thinking_force_nonempty_no_swap_when_newlines_only(
def test_granite_thinking_force_nonempty_swaps_when_content_absent(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
# When </think> IS present but content is truly absent (zero
# characters after </think>, e.g. max_tokens cut), swap fires.
@@ -387,7 +388,7 @@ def test_granite_thinking_force_nonempty_swaps_when_content_absent(
def test_granite_thinking_force_nonempty_keeps_real_content(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
parser_cls = ReasoningParserManager.get_reasoning_parser(parser_name)
parser = parser_cls(tokenizer)
@@ -412,7 +413,7 @@ def test_granite_thinking_force_nonempty_keeps_real_content(
def test_granite_thinking_keeps_truncated_reasoning(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
parser_cls = ReasoningParserManager.get_reasoning_parser(parser_name)
parser = parser_cls(tokenizer)
@@ -472,7 +473,7 @@ def _run_parse_delta(parser, tokenizer, text, request):
def test_granite_thinking_streaming_enable_thinking_false(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
# With enable_thinking=False, the parser (constructed without
# kwargs) starts in REASONING state. All text streams as reasoning
@@ -494,7 +495,7 @@ def test_granite_thinking_streaming_enable_thinking_false(
def test_granite_thinking_streaming_strips_leading_newline(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
request = ChatCompletionRequest(
model="test-model",
@@ -511,7 +512,7 @@ def test_granite_thinking_streaming_strips_leading_newline(
def test_granite_thinking_streaming_promotes_reasoning_to_content(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
request = ChatCompletionRequest(
model="test-model",
@@ -527,7 +528,7 @@ def test_granite_thinking_streaming_promotes_reasoning_to_content(
def test_granite_thinking_streaming_no_promotion_with_real_content(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
request = ChatCompletionRequest(
model="test-model",
@@ -548,7 +549,7 @@ def test_granite_thinking_streaming_no_promotion_with_real_content(
def test_granite_thinking_streaming_no_promotion_without_opt_in(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
):
request = ChatCompletionRequest(model="test-model", messages=[])
parser = _make_reasoning_parser(tokenizer)
@@ -564,7 +565,7 @@ def test_granite_thinking_streaming_no_promotion_without_opt_in(
@pytest.mark.parametrize("streaming", [False, True])
def test_granite_thinking_empty_think_block(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
streaming: bool,
):
# <think></think>\nHello — empty reasoning, content after newline.
@@ -592,7 +593,7 @@ def test_granite_thinking_empty_think_block(
],
)
def test_granite_thinking_streaming_chunking_independent(
tokenizer: GraniteThinkingTokenizer,
tokenizer: PreTrainedTokenizerBase,
text: str,
expected_reasoning: str,
expected_content: str,