[Bugfix][Frontend] Check EC requirements for each metadata item (#56070)

Signed-off-by: 子华 <huaxi.shx@alibaba-inc.com>
Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
shaohuaxi
2026-09-10 19:23:34 +00:00
committed by GitHub
co-authored by Codex
parent a36dfc93cb
commit ae71862c51
2 changed files with 56 additions and 6 deletions
@@ -5,6 +5,7 @@ Roundtrip tests for multimodal serde used by the
token_in_token_out generate endpoint.
"""
import pytest
import torch
from pydantic import ValidationError
@@ -241,6 +242,50 @@ def test_metadata_only_generate_requires_ec_transfer_params():
assert set(item) == {"image_grid_thw"}
@pytest.mark.parametrize("modality", ["image", "video"])
@pytest.mark.parametrize(
("has_metadata", "has_ec"),
[(True, False), (True, True), (False, False)],
ids=["metadata-without-ec", "metadata-with-ec", "cache-hit-without-ec"],
)
def test_mixed_items_require_ec_only_for_metadata_only(
modality: str, has_metadata: bool, has_ec: bool
):
"""A full item must not bypass the EC requirement for another item."""
engine_input, _, image_grid_thw = _image_engine_input()
rendered = extract_mm_features(engine_input)
assert rendered is not None
features = rendered.model_dump()
metadata = (
encode_mm_kwargs_item(
MultiModalKwargsItem({f"{modality}_grid_thw": image_grid_thw})
)
if has_metadata
else None
)
second_item = {
"mm_hashes": "second-item",
"mm_placeholders": {"offset": 2, "length": 1},
"kwargs_data": None,
"mm_metadata": metadata,
}
for key, value in second_item.items():
features[key].setdefault(modality, []).append(value)
payload = {
"token_ids": [1, 2, 3],
"sampling_params": {"max_tokens": 1},
"features": features,
}
if has_ec:
payload["ec_transfer_params"] = {"second-item": {"peer_host": "10.0.0.1"}}
if has_metadata and not has_ec:
with pytest.raises(ValidationError, match="ec_transfer_params"):
GenerateRequest.model_validate(payload)
else:
GenerateRequest.model_validate(payload)
def test_kwargs_and_metadata_generate_does_not_require_ec():
engine_input, pixel_values, image_grid_thw = _image_engine_input()
rendered = extract_mm_features(engine_input)
@@ -192,14 +192,19 @@ class GenerateRequest(BaseModel):
return self
if not _has_serialized_mm_items(features.mm_metadata):
return self
if _has_serialized_mm_items(features.kwargs_data):
return self
if self.ec_transfer_params:
return self
raise ValueError(
"features.mm_metadata without features.kwargs_data requires "
"ec_transfer_params so embeddings can be loaded by the EC connector"
)
kwargs_data = features.kwargs_data or {}
for modality, metadata_items in (features.mm_metadata or {}).items():
kwargs_items = kwargs_data.get(modality, [None] * len(metadata_items))
if any(
metadata is not None and kwargs is None
for metadata, kwargs in zip(metadata_items, kwargs_items, strict=True)
):
raise ValueError(
"metadata-only multimodal items require ec_transfer_params"
)
return self
sampling_params: SamplingParams
"""The sampling parameters for the model."""