happyz
/
fastapi
mirror of https://github.com/tiangolo/fastapi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

♻️ Refactor serialize_response parameter name (#1031)

This commit is contained in:
Patrick McKenna 2020-02-29 08:33:02 -08:00 committed by GitHub
parent 1ce67887b9
commit e26f94018c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fastapi/routing.py
View File

@ -50,7 +50,7 @@ except ImportError: # pragma: nocover
async def serialize_response(
*,
field: ModelField = None,
response: Response,
response_content: Any,
include: Union[SetIntStr, DictIntStrAny] = None,
exclude: Union[SetIntStr, DictIntStrAny] = set(),
by_alias: bool = True,
@ -59,16 +59,18 @@ async def serialize_response(
) -> Any:
if field:
errors = []
if exclude_unset and isinstance(response, BaseModel):
if exclude_unset and isinstance(response_content, BaseModel):
if PYDANTIC_1:
response = response.dict(exclude_unset=exclude_unset)
response_content = response_content.dict(exclude_unset=exclude_unset)
else:
response = response.dict(skip_defaults=exclude_unset) # pragma: nocover
response_content = response_content.dict(
skip_defaults=exclude_unset
) # pragma: nocover
if is_coroutine:
value, errors_ = field.validate(response, {}, loc=("response",))
value, errors_ = field.validate(response_content, {}, loc=("response",))
else:
value, errors_ = await run_in_threadpool(
field.validate, response, {}, loc=("response",)
field.validate, response_content, {}, loc=("response",)
)
if isinstance(errors_, ErrorWrapper):
errors.append(errors_)
@ -84,7 +86,7 @@ async def serialize_response(
exclude_unset=exclude_unset,
)
else:
return jsonable_encoder(response)
return jsonable_encoder(response_content)
async def run_endpoint_function(
@ -151,7 +153,7 @@ def get_request_handler(
return raw_response
response_data = await serialize_response(
field=response_field,
response=raw_response,
response_content=raw_response,
include=response_model_include,
exclude=response_model_exclude,
by_alias=response_model_by_alias,