fix(pooling): validate BGE-M3 combined task ownership (#51823)
Signed-off-by: Zhe Li <2843409461@qq.com> Co-authored-by: OpenAI Codex <noreply@openai.com>
This commit is contained in:
@@ -0,0 +1,94 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
|
||||
from vllm.entrypoints.pooling import factories
|
||||
from vllm.entrypoints.pooling.factories import init_pooling_io_processors
|
||||
from vllm.entrypoints.pooling.pooling.io_processor import (
|
||||
PluginWithIOProcessorPlugins,
|
||||
UnsupportedCombinedTaskIOProcessor,
|
||||
)
|
||||
|
||||
|
||||
def _bge_m3_config(io_processor_plugin=None):
|
||||
model_config = MagicMock()
|
||||
model_config.get_pooling_task.return_value = "embed&token_classify"
|
||||
model_config.io_processor_plugin = io_processor_plugin
|
||||
model_config.hf_config.to_dict.return_value = {}
|
||||
model_config.architecture = "BgeM3EmbeddingModel"
|
||||
|
||||
vllm_config = MagicMock(model_config=model_config)
|
||||
renderer = MagicMock()
|
||||
renderer._executor = MagicMock()
|
||||
chat_template_config = MagicMock(
|
||||
chat_template=None,
|
||||
chat_template_content_format="auto",
|
||||
trust_request_chat_template=False,
|
||||
)
|
||||
return vllm_config, renderer, chat_template_config
|
||||
|
||||
|
||||
def test_combined_task_without_plugin_uses_rejection_processor():
|
||||
vllm_config, renderer, chat_template_config = _bge_m3_config()
|
||||
|
||||
processors = init_pooling_io_processors(
|
||||
supported_tasks=("embed", "embed&token_classify"),
|
||||
vllm_config=vllm_config,
|
||||
renderer=renderer,
|
||||
chat_template_config=chat_template_config,
|
||||
)
|
||||
|
||||
assert processors.keys() == {"embed&token_classify"}
|
||||
assert isinstance(
|
||||
processors["embed&token_classify"], UnsupportedCombinedTaskIOProcessor
|
||||
)
|
||||
|
||||
|
||||
def test_combined_task_with_plugin_uses_plugin_processor(monkeypatch):
|
||||
vllm_config, renderer, chat_template_config = _bge_m3_config("bge_m3_sparse_plugin")
|
||||
monkeypatch.setattr(factories, "has_io_processor", lambda *_: True)
|
||||
monkeypatch.setattr(
|
||||
"vllm.entrypoints.pooling.pooling.io_processor.get_io_processor",
|
||||
lambda *_: MagicMock(),
|
||||
)
|
||||
|
||||
processors = init_pooling_io_processors(
|
||||
supported_tasks=("embed", "embed&token_classify"),
|
||||
vllm_config=vllm_config,
|
||||
renderer=renderer,
|
||||
chat_template_config=chat_template_config,
|
||||
)
|
||||
|
||||
assert processors.keys() == {"embed&token_classify", "plugin"}
|
||||
assert isinstance(processors["plugin"], PluginWithIOProcessorPlugins)
|
||||
|
||||
|
||||
def test_combined_task_plain_pooling_request_has_actionable_error(monkeypatch):
|
||||
from vllm.entrypoints.pooling.pooling.protocol import PoolingCompletionRequest
|
||||
from vllm.entrypoints.pooling.pooling.serving import ServingPooling
|
||||
|
||||
vllm_config, renderer, chat_template_config = _bge_m3_config("bge_m3_sparse_plugin")
|
||||
monkeypatch.setattr(factories, "has_io_processor", lambda *_: True)
|
||||
monkeypatch.setattr(
|
||||
"vllm.entrypoints.pooling.pooling.io_processor.get_io_processor",
|
||||
lambda *_: MagicMock(),
|
||||
)
|
||||
|
||||
engine_client = MagicMock(renderer=renderer, vllm_config=vllm_config)
|
||||
models = MagicMock(model_config=vllm_config.model_config)
|
||||
serving = ServingPooling(
|
||||
engine_client,
|
||||
models,
|
||||
supported_tasks=("embed", "embed&token_classify"),
|
||||
request_logger=None,
|
||||
chat_template_config=chat_template_config,
|
||||
)
|
||||
request = PoolingCompletionRequest(model="BAAI/bge-m3", input=["hola"])
|
||||
|
||||
assert serving.io_processors.keys() == {"embed&token_classify", "plugin"}
|
||||
io_processor = serving.get_io_processor(request)
|
||||
with pytest.raises(ValueError, match="plugin request with a 'data' field"):
|
||||
io_processor.create_pooling_params(request)
|
||||
Reference in New Issue
Block a user