[Model] Consolidate score logic by introduce score_type (#36479)

Signed-off-by: wang.yuqi <yuqi.wang@daocloud.io>
This commit is contained in:
wang.yuqi
2026-03-10 13:32:25 +00:00
committed by GitHub
parent 409c4e632d
commit a3189a08b0
14 changed files with 213 additions and 194 deletions
+8 -8
View File
@@ -37,10 +37,10 @@ def register_pooling_api_routers(
app.include_router(embed_router)
# Score/rerank endpoints are available for:
# - "score" task (cross-encoder models)
# - "embed" task (bi-encoder models)
# - "token_embed" task (late interaction models like ColBERT)
# Score API handles score/rerank for:
# - "score" task (score_type: cross-encoder models)
# - "embed" task (score_type: bi-encoder models)
# - "token_embed" task (score_type: late interaction models)
if any(t in supported_tasks for t in ("score", "embed", "token_embed")):
from vllm.entrypoints.pooling.score.api_router import router as score_router
@@ -101,10 +101,10 @@ def init_pooling_state(
if "classify" in supported_tasks
else None
)
# ServingScores handles score/rerank for:
# - "score" task (cross-encoder models)
# - "embed" task (bi-encoder models)
# - "token_embed" task (late interaction models like ColBERT)
# Score API handles score/rerank for:
# - "score" task (score_type: cross-encoder models)
# - "embed" task (score_type: bi-encoder models)
# - "token_embed" task (score_type: late interaction models)
state.serving_scores = (
ServingScores(
engine_client,
+5 -6
View File
@@ -69,16 +69,15 @@ class ServingScores(OpenAIServing):
self._tokenizer_executor = ThreadPoolExecutor(max_workers=1)
self.is_cross_encoder = self.model_config.is_cross_encoder
self.is_multimodal_model = self.model_config.is_multimodal_model
self.score_type = self.model_config.score_type
self.architecture = self.model_config.architecture
self.is_late_interaction = self.model_config.is_late_interaction
self.is_multimodal_model = self.model_config.is_multimodal_model
if self.is_cross_encoder:
if self.score_type == "cross-encoder":
self._score_func = self._cross_encoding_score
elif self.is_late_interaction:
elif self.score_type == "late-interaction":
self._score_func = self._late_interaction_score
else:
else: # "bi-encoder"
self._score_func = self._embedding_score
async def _embedding_score(