[Refactor] Extract StructuredOutputsParams creation logic from Request.to_sampling_params (#49003)

Signed-off-by: Yifan Zong <yzong@redhat.com>
This commit is contained in:
yzong-rh
2026-07-19 05:18:00 -07:00
committed by GitHub
parent b6ff8a2f50
commit ac5f38a0f7
5 changed files with 95 additions and 98 deletions
+36 -2
View File
@@ -3,6 +3,7 @@
# Adapted from
# https://github.com/lm-sys/FastChat/blob/168ccc29d3f7edc50823016105c024fe2282732a/fastchat/protocol/openai_api_protocol.py
import json
import time
from http import HTTPStatus
from typing import Any, ClassVar, Literal, TypeAlias
@@ -16,9 +17,11 @@ from pydantic import (
model_validator,
)
from vllm.config.utils import replace
from vllm.entrypoints.chat_utils import make_tool_call_id
from vllm.exceptions import VLLMValidationError
from vllm.logger import init_logger
from vllm.sampling_params import StructuredOutputsParams
from vllm.utils import random_uuid
from vllm.utils.import_utils import resolve_obj_by_qualname
@@ -173,6 +176,39 @@ AnyResponseFormat: TypeAlias = (
)
def structured_outputs_from_response_format(
structured_outputs: StructuredOutputsParams | None,
response_format: AnyResponseFormat | None,
) -> StructuredOutputsParams | None:
"""Apply ``response_format`` overrides to ``structured_outputs``."""
if response_format is None or response_format.type == "text":
return structured_outputs
overrides: dict[str, Any]
if response_format.type == "json_object":
overrides = {"json_object": True}
elif response_format.type == "json_schema":
json_schema = response_format.json_schema
assert json_schema is not None
overrides = {"json": json_schema.json_schema}
else:
assert isinstance(
response_format,
(
LegacyStructuralTagResponseFormat,
StructuralTagResponseFormat,
),
)
overrides = {
"structural_tag": json.dumps(response_format.model_dump(by_alias=True))
}
if structured_outputs is None:
return StructuredOutputsParams(**overrides)
return replace(structured_outputs, **overrides)
def validate_structural_tag_response_format(
response_format: AnyStructuralTagResponseFormat | dict[str, Any],
) -> None:
@@ -181,8 +217,6 @@ def validate_structural_tag_response_format(
Engine-side validation reports malformed structural tags as generation
failures. OpenAI request parsing should classify them as bad requests.
"""
import json
from pydantic import TypeAdapter, ValidationError
if isinstance(response_format, dict):