[refactor] Refactor guardrail error handling - add 400 error code (#4297)
Signed-off-by: Maciej Bala <mbala@nvidia.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
This commit is contained in:
1 parent
e27fd46ab9
commit
03cc888485
19 files changed
+608
-16
No files matched your search
@@ -29,6 +29,7 @@ from vllm_omni.entrypoints.openai.image_api_utils import (
|
||||
parse_size,
|
||||
)
|
||||
from vllm_omni.entrypoints.openai.serving_chat import OmniOpenAIServingChat
|
||||
from vllm_omni.errors import GuardrailViolationError
|
||||
from vllm_omni.inputs.data import OmniDiffusionSamplingParams
|
||||
|
||||
pytestmark = [pytest.mark.core_model, pytest.mark.cpu]
|
||||
@@ -587,6 +588,24 @@ def test_generate_single_image(test_client):
|
||||
assert test_client.app.state.engine_client.captured_prompt["modalities"] == ["image"]
|
||||
|
||||
|
||||
def test_generate_images_guardrail_error_returns_400(test_client, mock_async_diffusion):
|
||||
async def blocked_generate(**kwargs):
|
||||
raise GuardrailViolationError("Input was blocked by Cosmos3 guardrails.")
|
||||
yield MockGenerationResult([]) # pragma: no cover
|
||||
|
||||
mock_async_diffusion.generate = blocked_generate
|
||||
response = test_client.post(
|
||||
"/v1/images/generations",
|
||||
json={
|
||||
"prompt": "blocked prompt",
|
||||
"n": 1,
|
||||
"size": "1024x1024",
|
||||
},
|
||||
)
|
||||
assert response.status_code == 400
|
||||
assert response.json()["detail"] == "Input was blocked by Cosmos3 guardrails."
|
||||
|
||||
|
||||
def test_generate_images_async_omni_sampling_params(async_omni_test_client):
|
||||
"""Test AsyncOmni path uses per-stage sampling params."""
|
||||
response = async_omni_test_client.post(
|
||||
@@ -891,6 +910,31 @@ def test_image_edits_streaming_errors_on_empty_final_image(streaming_image_edit_
|
||||
assert payloads[2] == "[DONE]"
|
||||
|
||||
|
||||
def test_image_edits_streaming_guardrail_error_uses_400(streaming_image_edit_client):
|
||||
async def generate_guardrail_error(prompt, request_id, sampling_params=None, sampling_params_list=None, **kwargs):
|
||||
raise GuardrailViolationError("Input was blocked by Cosmos3 guardrails.")
|
||||
yield MockStageResult(stage_id=1, final_output_type="image", images=[]) # pragma: no cover
|
||||
|
||||
streaming_image_edit_client.app.state.engine_client.generate = generate_guardrail_error
|
||||
img_bytes = make_test_image_bytes((16, 16))
|
||||
response = streaming_image_edit_client.post(
|
||||
"/v1/images/edits",
|
||||
files=[("image", img_bytes)],
|
||||
data={
|
||||
"prompt": "blocked prompt",
|
||||
"stream": "true",
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
payloads = _parse_sse_payloads(response.text)
|
||||
assert payloads[0]["object"] == "error"
|
||||
assert payloads[0]["error"]["message"] == "Input was blocked by Cosmos3 guardrails."
|
||||
assert payloads[0]["error"]["type"] == "BadRequestError"
|
||||
assert payloads[0]["error"]["code"] == 400
|
||||
assert payloads[1] == "[DONE]"
|
||||
|
||||
|
||||
def test_image_edits_streaming_rejects_single_stage(test_client):
|
||||
img_bytes = make_test_image_bytes((16, 16))
|
||||
response = test_client.post(
|
||||
|
||||
@@ -31,6 +31,7 @@ from vllm_omni.entrypoints.openai.protocol.videos import (
|
||||
from vllm_omni.entrypoints.openai.serving_video import OmniOpenAIServingVideo
|
||||
from vllm_omni.entrypoints.openai.storage import LocalStorageManager
|
||||
from vllm_omni.entrypoints.openai.stores import AsyncDictStore, TaskRegistry
|
||||
from vllm_omni.errors import GuardrailViolationError
|
||||
from vllm_omni.inputs.data import OmniDiffusionSamplingParams
|
||||
|
||||
pytestmark = [pytest.mark.core_model, pytest.mark.cpu]
|
||||
@@ -1019,6 +1020,25 @@ def test_invalid_lora_returns_400(test_client):
|
||||
assert "lora object" in failed["error"]["message"].lower()
|
||||
|
||||
|
||||
def test_async_guardrail_error_returns_400_on_retrieve(test_client, mocker: MockerFixture):
|
||||
mocker.patch.object(
|
||||
OmniOpenAIServingVideo,
|
||||
"generate_video_bytes",
|
||||
side_effect=GuardrailViolationError("Input was blocked by Cosmos3 guardrails."),
|
||||
)
|
||||
response = test_client.post("/v1/videos", data={"prompt": "blocked prompt"})
|
||||
assert response.status_code == 200
|
||||
|
||||
video_id = response.json()["id"]
|
||||
failed = _wait_for_status(test_client, video_id, VideoGenerationStatus.FAILED.value)
|
||||
assert failed["error"]["code"] == 400
|
||||
assert failed["error"]["message"] == "Input was blocked by Cosmos3 guardrails."
|
||||
|
||||
retrieve = test_client.get(f"/v1/videos/{video_id}")
|
||||
assert retrieve.status_code == 400
|
||||
assert retrieve.json()["error"]["code"] == 400
|
||||
|
||||
|
||||
def test_unsupported_image_reference_file_id_returns_400(test_client):
|
||||
response = test_client.post(
|
||||
"/v1/videos",
|
||||
@@ -1521,6 +1541,20 @@ def test_sync_generation_error_returns_500(test_client, mocker: MockerFixture):
|
||||
assert "GPU exploded" in response.json()["detail"]
|
||||
|
||||
|
||||
def test_sync_guardrail_error_returns_400(test_client, mocker: MockerFixture):
|
||||
mocker.patch.object(
|
||||
OmniOpenAIServingVideo,
|
||||
"generate_video_bytes",
|
||||
side_effect=GuardrailViolationError("Input was blocked by Cosmos3 guardrails."),
|
||||
)
|
||||
response = test_client.post(
|
||||
"/v1/videos/sync",
|
||||
data={"prompt": "blocked prompt"},
|
||||
)
|
||||
assert response.status_code == 400
|
||||
assert response.json()["detail"] == "Input was blocked by Cosmos3 guardrails."
|
||||
|
||||
|
||||
def test_sync_does_not_create_store_entry(test_client, mocker: MockerFixture):
|
||||
"""The sync endpoint should NOT leave any record in VIDEO_STORE — it is
|
||||
stateless by design."""
|
||||
|
||||
@@ -18,6 +18,12 @@ from vllm_omni.entrypoints.async_omni import AsyncOmni
|
||||
from vllm_omni.entrypoints.client_request_state import ClientRequestState
|
||||
from vllm_omni.entrypoints.omni import Omni
|
||||
from vllm_omni.entrypoints.omni_base import OmniEngineDeadError
|
||||
from vllm_omni.errors import (
|
||||
OmniClientError,
|
||||
client_error_from_metadata,
|
||||
client_error_metadata,
|
||||
is_client_error_status,
|
||||
)
|
||||
from vllm_omni.outputs import OmniRequestOutput
|
||||
|
||||
pytestmark = [pytest.mark.core_model, pytest.mark.cpu]
|
||||
@@ -604,6 +610,71 @@ async def test_async_omni_propagates_fatal_error_context(monkeypatch: pytest.Mon
|
||||
assert getattr(exc_info.value, "error_stage_id") == 2
|
||||
|
||||
|
||||
def _enqueue_client_error_message(engine: FakeAsyncOmniEngine, msg: dict[str, Any]) -> None:
|
||||
engine.output_q.put_nowait(
|
||||
ErrorMessage(
|
||||
request_id=msg["request_id"],
|
||||
stage_id=2,
|
||||
error="Input was blocked by Cosmos3 guardrails.",
|
||||
status_code=400,
|
||||
error_type="BadRequestError",
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_async_omni_propagates_client_error_status(monkeypatch: pytest.MonkeyPatch):
|
||||
"""A non-fatal client error from the orchestrator must be routed to the
|
||||
requesting generate() call (not raised in the shared dispatcher) and
|
||||
surface as an OmniClientError carrying status_code/error_type."""
|
||||
engine = FakeAsyncOmniEngine(stage_metadata=THREE_STAGE_META, on_add_request=_enqueue_client_error_message)
|
||||
_patch_engine(monkeypatch, engine)
|
||||
|
||||
app = AsyncOmni("dummy-model")
|
||||
try:
|
||||
with pytest.raises(OmniClientError) as exc_info:
|
||||
async for _ in app.generate(prompt="blocked", request_id="req-1"):
|
||||
pass
|
||||
finally:
|
||||
app.shutdown()
|
||||
|
||||
assert exc_info.value.status_code == 400
|
||||
assert exc_info.value.error_type == "BadRequestError"
|
||||
assert str(exc_info.value) == "Input was blocked by Cosmos3 guardrails."
|
||||
|
||||
|
||||
def _enqueue_server_error_message(engine: FakeAsyncOmniEngine, msg: dict[str, Any]) -> None:
|
||||
engine.output_q.put_nowait(
|
||||
ErrorMessage(
|
||||
request_id=msg["request_id"],
|
||||
stage_id=2,
|
||||
error="GPU exploded",
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_async_omni_propagates_server_error_as_runtime(monkeypatch: pytest.MonkeyPatch):
|
||||
"""A non-fatal error WITHOUT a 4xx status_code is a server fault: it must
|
||||
surface as a RuntimeError (-> HTTP 500), not an OmniClientError (-> 400).
|
||||
Guards against the fix over-broadly mapping every error to a client error."""
|
||||
engine = FakeAsyncOmniEngine(stage_metadata=THREE_STAGE_META, on_add_request=_enqueue_server_error_message)
|
||||
_patch_engine(monkeypatch, engine)
|
||||
|
||||
app = AsyncOmni("dummy-model")
|
||||
try:
|
||||
# OmniClientError subclasses ValueError, not RuntimeError, so matching
|
||||
# RuntimeError here also proves it was NOT raised as a client error.
|
||||
with pytest.raises(RuntimeError) as exc_info:
|
||||
async for _ in app.generate(prompt="boom", request_id="req-1"):
|
||||
pass
|
||||
finally:
|
||||
app.shutdown()
|
||||
|
||||
assert not isinstance(exc_info.value, OmniClientError)
|
||||
assert str(exc_info.value) == "GPU exploded"
|
||||
|
||||
|
||||
def test_omni_generate_py_generator_yields_final_outputs_for_each_request(monkeypatch: pytest.MonkeyPatch):
|
||||
sampling_params = [SamplingParams(max_tokens=8) for _ in range(3)]
|
||||
engine = FakeAsyncOmniEngine(
|
||||
@@ -761,6 +832,140 @@ def test_non_fatal_error_raises_runtime():
|
||||
base._handle_output_message(msg)
|
||||
|
||||
|
||||
def test_non_fatal_client_error_raises_omni_client_error():
|
||||
"""A non-fatal ErrorMessage carrying a 4xx status_code (e.g. a guardrail
|
||||
block) must surface as an OmniClientError with the metadata intact, not a
|
||||
bare RuntimeError. This covers the offline/sync Omni consumer path."""
|
||||
base = _make_base()
|
||||
msg = ErrorMessage(
|
||||
error="Input was blocked by Cosmos3 guardrails.",
|
||||
status_code=400,
|
||||
error_type="BadRequestError",
|
||||
)
|
||||
|
||||
with pytest.raises(OmniClientError) as exc_info:
|
||||
base._handle_output_message(msg)
|
||||
|
||||
assert exc_info.value.status_code == 400
|
||||
assert exc_info.value.error_type == "BadRequestError"
|
||||
assert str(exc_info.value) == "Input was blocked by Cosmos3 guardrails."
|
||||
|
||||
|
||||
_NON_400_CLIENT_ERRORS = [
|
||||
pytest.param(429, "RateLimitError", id="429-too-many-requests"),
|
||||
pytest.param(413, "PayloadTooLargeError", id="413-payload-too-large"),
|
||||
pytest.param(422, "UnprocessableEntityError", id="422-unprocessable-entity"),
|
||||
pytest.param(403, "PermissionDeniedError", id="403-forbidden"),
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("status_code", "error_type"), [pytest.param(400, "BadRequestError", id="400")] + _NON_400_CLIENT_ERRORS
|
||||
)
|
||||
def test_client_error_metadata_round_trip_preserves_4xx(status_code: int, error_type: str):
|
||||
original = OmniClientError("blocked", status_code=status_code, error_type=error_type)
|
||||
|
||||
# Outbound: what the broad `except Exception` handlers serialize.
|
||||
carried_status, carried_type = client_error_metadata(original)
|
||||
assert carried_status == status_code
|
||||
assert carried_type == error_type
|
||||
assert is_client_error_status(carried_status)
|
||||
|
||||
# Inbound: reconstruction at the consuming end.
|
||||
rebuilt = client_error_from_metadata("blocked", status_code=carried_status, error_type=carried_type)
|
||||
assert isinstance(rebuilt, OmniClientError)
|
||||
assert rebuilt.status_code == status_code
|
||||
assert rebuilt.error_type == error_type
|
||||
assert str(rebuilt) == "blocked"
|
||||
|
||||
|
||||
@pytest.mark.parametrize(("status_code", "error_type"), _NON_400_CLIENT_ERRORS)
|
||||
def test_non_fatal_client_error_preserves_non_400_status(status_code: int, error_type: str):
|
||||
base = _make_base()
|
||||
msg = ErrorMessage(
|
||||
error="client side failure",
|
||||
status_code=status_code,
|
||||
error_type=error_type,
|
||||
)
|
||||
|
||||
with pytest.raises(OmniClientError) as exc_info:
|
||||
base._handle_output_message(msg)
|
||||
|
||||
assert exc_info.value.status_code == status_code
|
||||
assert exc_info.value.error_type == error_type
|
||||
assert str(exc_info.value) == "client side failure"
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"status_code",
|
||||
[
|
||||
pytest.param(None, id="no-status"),
|
||||
pytest.param(399, id="399-below-4xx"),
|
||||
pytest.param(500, id="500-server-error"),
|
||||
pytest.param(503, id="503-service-unavailable"),
|
||||
],
|
||||
)
|
||||
def test_non_fatal_non_4xx_status_raises_runtime(status_code: int | None):
|
||||
base = _make_base()
|
||||
msg = ErrorMessage(
|
||||
error="server side failure",
|
||||
status_code=status_code,
|
||||
error_type="ShouldBeIgnoredForNon4xx",
|
||||
)
|
||||
|
||||
with pytest.raises(RuntimeError) as exc_info:
|
||||
base._handle_output_message(msg)
|
||||
|
||||
assert not isinstance(exc_info.value, OmniClientError)
|
||||
assert str(exc_info.value) == "server side failure"
|
||||
|
||||
|
||||
def _make_enqueue_client_error(
|
||||
status_code: int,
|
||||
error_type: str,
|
||||
error_text: str,
|
||||
) -> Callable[[FakeAsyncOmniEngine, dict[str, Any]], None]:
|
||||
def _enqueue(engine: FakeAsyncOmniEngine, msg: dict[str, Any]) -> None:
|
||||
engine.output_q.put_nowait(
|
||||
ErrorMessage(
|
||||
request_id=msg["request_id"],
|
||||
stage_id=2,
|
||||
error=error_text,
|
||||
status_code=status_code,
|
||||
error_type=error_type,
|
||||
)
|
||||
)
|
||||
|
||||
return _enqueue
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@pytest.mark.parametrize(("status_code", "error_type"), _NON_400_CLIENT_ERRORS)
|
||||
async def test_async_omni_propagates_non_400_client_error_status(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
status_code: int,
|
||||
error_type: str,
|
||||
):
|
||||
error_text = f"blocked with {status_code}"
|
||||
engine = FakeAsyncOmniEngine(
|
||||
stage_metadata=THREE_STAGE_META,
|
||||
on_add_request=_make_enqueue_client_error(status_code, error_type, error_text),
|
||||
)
|
||||
_patch_engine(monkeypatch, engine)
|
||||
|
||||
app = AsyncOmni("dummy-model")
|
||||
try:
|
||||
with pytest.raises(OmniClientError) as exc_info:
|
||||
async for _ in app.generate(prompt="blocked", request_id="req-1"):
|
||||
pass
|
||||
finally:
|
||||
app.shutdown()
|
||||
|
||||
assert exc_info.value.status_code == status_code
|
||||
assert exc_info.value.error_type == error_type
|
||||
assert str(exc_info.value) == error_text
|
||||
|
||||
|
||||
def test_async_omni_errored_property_alive():
|
||||
omni = object.__new__(AsyncOmni)
|
||||
omni.engine = SimpleNamespace(
|
||||
|
||||
Reference in new issue
Block a user