Fix Responses JSON schema alias serialization (#38519)
Signed-off-by: noobhappylife <aratar1991@hotmail.com> Co-authored-by: OpenAI Codex <codex@openai.com>
This commit is contained in:
co-authored by
OpenAI Codex
parent
d37b378762
commit
2a49284c8a
@@ -39,7 +39,8 @@ async def _convert_stream_to_sse_events(
|
||||
event_type = getattr(event, "type", "unknown")
|
||||
# https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#event_stream_format
|
||||
event_data = (
|
||||
f"event: {event_type}\ndata: {event.model_dump_json(indent=None)}\n\n"
|
||||
f"event: {event_type}\ndata: "
|
||||
f"{event.model_dump_json(indent=None, by_alias=True)}\n\n"
|
||||
)
|
||||
yield event_data
|
||||
|
||||
@@ -65,10 +66,11 @@ async def create_responses(request: ResponsesRequest, raw_request: Request):
|
||||
|
||||
if isinstance(generator, ErrorResponse):
|
||||
return JSONResponse(
|
||||
content=generator.model_dump(), status_code=generator.error.code
|
||||
content=generator.model_dump(mode="json", by_alias=True),
|
||||
status_code=generator.error.code,
|
||||
)
|
||||
elif isinstance(generator, ResponsesResponse):
|
||||
return JSONResponse(content=generator.model_dump())
|
||||
return JSONResponse(content=generator.model_dump(mode="json", by_alias=True))
|
||||
|
||||
return StreamingResponse(
|
||||
content=_convert_stream_to_sse_events(generator), media_type="text/event-stream"
|
||||
@@ -95,10 +97,11 @@ async def retrieve_responses(
|
||||
|
||||
if isinstance(response, ErrorResponse):
|
||||
return JSONResponse(
|
||||
content=response.model_dump(), status_code=response.error.code
|
||||
content=response.model_dump(mode="json", by_alias=True),
|
||||
status_code=response.error.code,
|
||||
)
|
||||
elif isinstance(response, ResponsesResponse):
|
||||
return JSONResponse(content=response.model_dump())
|
||||
return JSONResponse(content=response.model_dump(mode="json", by_alias=True))
|
||||
return StreamingResponse(
|
||||
content=_convert_stream_to_sse_events(response), media_type="text/event-stream"
|
||||
)
|
||||
@@ -115,9 +118,10 @@ async def cancel_responses(response_id: str, raw_request: Request):
|
||||
|
||||
if isinstance(response, ErrorResponse):
|
||||
return JSONResponse(
|
||||
content=response.model_dump(), status_code=response.error.code
|
||||
content=response.model_dump(mode="json", by_alias=True),
|
||||
status_code=response.error.code,
|
||||
)
|
||||
return JSONResponse(content=response.model_dump())
|
||||
return JSONResponse(content=response.model_dump(mode="json", by_alias=True))
|
||||
|
||||
|
||||
def attach_router(app: FastAPI):
|
||||
|
||||
@@ -106,7 +106,7 @@ def serialize_message(msg):
|
||||
return msg.to_dict()
|
||||
else:
|
||||
# fallback to pydantic dump
|
||||
return msg.model_dump_json(by_alias=True)
|
||||
return msg.model_dump(mode="json", by_alias=True)
|
||||
|
||||
|
||||
def serialize_messages(msgs):
|
||||
|
||||
@@ -1909,7 +1909,7 @@ class OpenAIServingResponses(OpenAIServing):
|
||||
output=[],
|
||||
status="in_progress",
|
||||
usage=None,
|
||||
).model_dump()
|
||||
).model_dump(mode="json", by_alias=True)
|
||||
yield _increment_sequence_number_and_return(
|
||||
ResponseCreatedEvent(
|
||||
type="response.created",
|
||||
|
||||
Reference in New Issue
Block a user