[Bugfix][Pooling] Handle multimodal cache misses without crashing (#58975)
Signed-off-by: linchaoying6 <linchaoying6@jd.com> Co-authored-by: linchaoying6 <linchaoying6@jd.com> Co-authored-by: OpenAI Codex <codex@openai.com>
This commit is contained in:
co-authored by
linchaoying6
OpenAI Codex
parent
443dccd3c9
commit
592c6f3fbc
@@ -1,20 +1,25 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
"""Unit tests for ScoringIOProcessor post-tokenization helpers."""
|
||||
"""Unit tests for ScoringIOProcessor helpers."""
|
||||
|
||||
from dataclasses import dataclass
|
||||
from types import SimpleNamespace
|
||||
|
||||
import pytest
|
||||
import torch
|
||||
from tokenizers import Tokenizer, models, pre_tokenizers, processors
|
||||
from transformers import TokenizersBackend
|
||||
|
||||
from vllm import TokensPrompt
|
||||
from vllm.entrypoints.pooling.scoring.io_processor import (
|
||||
BiEncoderIOProcessor,
|
||||
CrossEncoderIOProcessor,
|
||||
JinaRankingIOProcessor,
|
||||
LateInteractionIOProcessor,
|
||||
_apply_post_tokenization_to_token_type_ids,
|
||||
)
|
||||
from vllm.entrypoints.pooling.scoring.utils import compress_token_type_ids
|
||||
from vllm.outputs import PoolingOutput, PoolingRequestOutput, RequestError
|
||||
from vllm.renderers import TokenizeParams
|
||||
|
||||
pytestmark = pytest.mark.skip_global_cleanup
|
||||
@@ -113,3 +118,59 @@ def test_token_type_ids_stay_aligned_with_a_truncated_padded_prompt():
|
||||
assert first_doc == 10
|
||||
assert prompt_token_ids[:first_doc] == list(range(10, num_query))
|
||||
assert prompt_token_ids[first_doc:40] == list(range(num_query, 50))
|
||||
|
||||
|
||||
def _pooling_output(
|
||||
request_id: str,
|
||||
data: torch.Tensor,
|
||||
error: RequestError | None = None,
|
||||
) -> PoolingRequestOutput:
|
||||
return PoolingRequestOutput(
|
||||
request_id=request_id,
|
||||
outputs=PoolingOutput(data),
|
||||
prompt_token_ids=[1],
|
||||
num_cached_tokens=0,
|
||||
finished=True,
|
||||
error=error,
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"processor_type", [BiEncoderIOProcessor, LateInteractionIOProcessor]
|
||||
)
|
||||
@pytest.mark.parametrize("failed_index", [0, 1])
|
||||
def test_paired_scoring_preserves_request_error(processor_type, failed_index):
|
||||
processor = processor_type.__new__(processor_type)
|
||||
processor.pad_token_id = None
|
||||
error = RequestError(
|
||||
code="multimodal_cache_miss",
|
||||
message="Multi-modal processor cache miss.",
|
||||
retryable=True,
|
||||
)
|
||||
outputs = [
|
||||
_pooling_output("query", torch.tensor([1.0, 2.0])),
|
||||
_pooling_output("document", torch.tensor([3.0, 4.0])),
|
||||
]
|
||||
outputs[failed_index] = _pooling_output(
|
||||
outputs[failed_index].request_id,
|
||||
torch.empty(0),
|
||||
error,
|
||||
)
|
||||
|
||||
(result,) = processor._post_process(outputs, n_queries=1)
|
||||
|
||||
assert result.request_id == "query_document"
|
||||
assert result.error is error
|
||||
assert result.outputs is outputs[failed_index].outputs
|
||||
|
||||
|
||||
def test_jina_scoring_preserves_request_error_before_indexing_output():
|
||||
processor = JinaRankingIOProcessor.__new__(JinaRankingIOProcessor)
|
||||
error = RequestError(
|
||||
code="multimodal_cache_miss",
|
||||
message="Multi-modal processor cache miss.",
|
||||
retryable=True,
|
||||
)
|
||||
failed = _pooling_output("request", torch.empty(0), error)
|
||||
|
||||
assert processor._post_process([failed], n_queries=1) == [failed]
|
||||
|
||||
@@ -49,10 +49,60 @@ def _query_key(context: PoolingServeContext) -> str:
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_colliding_request_ids_use_distinct_query_cache_keys(
|
||||
@pytest.mark.skip_global_cleanup
|
||||
@pytest.mark.parametrize("failed_stage", ["query", "doc"])
|
||||
async def test_flash_late_interaction_cleans_up_queries_on_failure(
|
||||
failed_stage: str,
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
):
|
||||
serving = object.__new__(ServingScores)
|
||||
serving.io_processor = Mock()
|
||||
serving.engine_client = Mock(abort=AsyncMock(), collective_rpc=AsyncMock())
|
||||
|
||||
context = _make_context()
|
||||
monkeypatch.setattr(serving, "_init_ctx", AsyncMock(return_value=context))
|
||||
monkeypatch.setattr(serving, "_preprocessing", AsyncMock())
|
||||
|
||||
async def encode_queries(ctx):
|
||||
ctx.late_interaction_query_keys = ["query-key"]
|
||||
if failed_stage == "query":
|
||||
raise RuntimeError("query failed")
|
||||
|
||||
async def encode_docs(ctx):
|
||||
ctx.late_interaction_doc_keys = ["doc-key"]
|
||||
if failed_stage == "doc":
|
||||
raise RuntimeError("doc failed")
|
||||
|
||||
monkeypatch.setattr(
|
||||
serving,
|
||||
"_flash_late_interaction_encode_queries",
|
||||
AsyncMock(side_effect=encode_queries),
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
serving,
|
||||
"_flash_late_interaction_encode_docs",
|
||||
AsyncMock(side_effect=encode_docs),
|
||||
)
|
||||
|
||||
with pytest.raises(RuntimeError, match=f"{failed_stage} failed"):
|
||||
await serving.flash_late_interaction()
|
||||
|
||||
expected_doc_keys = [] if failed_stage == "query" else ["doc-key"]
|
||||
serving.engine_client.abort.assert_awaited_once_with(
|
||||
["query-key", *expected_doc_keys]
|
||||
)
|
||||
serving.engine_client.collective_rpc.assert_awaited_once_with(
|
||||
"release_late_interaction_query_cache",
|
||||
args=(["query-key"],),
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_colliding_request_ids_use_distinct_late_interaction_keys(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
):
|
||||
serving = object.__new__(ServingScores)
|
||||
serving.engine_client = Mock(abort=AsyncMock(), collective_rpc=AsyncMock())
|
||||
prepare_generators = AsyncMock()
|
||||
monkeypatch.setattr(serving, "_prepare_generators", prepare_generators)
|
||||
monkeypatch.setattr(serving, "_collect_batch", AsyncMock())
|
||||
@@ -68,9 +118,24 @@ async def test_colliding_request_ids_use_distinct_query_cache_keys(
|
||||
first_doc_key = _query_key(prepared_contexts[1])
|
||||
second_query_key = _query_key(prepared_contexts[2])
|
||||
second_doc_key = _query_key(prepared_contexts[3])
|
||||
first_doc_request_ids = prepared_contexts[1].prompt_request_ids
|
||||
second_doc_request_ids = prepared_contexts[3].prompt_request_ids
|
||||
|
||||
assert first_query_key == first_doc_key
|
||||
assert second_query_key == second_doc_key
|
||||
assert first_query_key != second_query_key
|
||||
assert "caller-controlled-id" not in first_query_key
|
||||
assert "caller-controlled-id" not in second_query_key
|
||||
assert first_doc_request_ids is not None
|
||||
assert second_doc_request_ids is not None
|
||||
assert first.late_interaction_doc_keys == first_doc_request_ids
|
||||
assert second.late_interaction_doc_keys == second_doc_request_ids
|
||||
assert first_doc_request_ids != second_doc_request_ids
|
||||
assert all("caller-controlled-id" not in key for key in first_doc_request_ids)
|
||||
assert all("caller-controlled-id" not in key for key in second_doc_request_ids)
|
||||
|
||||
assert first.late_interaction_query_keys is not None
|
||||
await serving._cleanup_flash_late_interaction(first)
|
||||
serving.engine_client.abort.assert_awaited_once_with(
|
||||
[*first.late_interaction_query_keys, *first_doc_request_ids]
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user