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

✨ When using Pydantic models with __root__ use the internal value in jsonable_encoder (#1524)

This commit is contained in:
Patrick Wang 2020-06-13 13:20:11 -04:00 committed by GitHub
parent 748bedd37c
commit 8fb755703d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fastapi/encoders.py
View File

@ -71,6 +71,8 @@ def jsonable_encoder(
by_alias=by_alias, by_alias=by_alias,
skip_defaults=bool(exclude_unset or skip_defaults), skip_defaults=bool(exclude_unset or skip_defaults),
) )
if "__root__" in obj_dict:
obj_dict = obj_dict["__root__"]
return jsonable_encoder( return jsonable_encoder(
obj_dict, obj_dict,
exclude_none=exclude_none, exclude_none=exclude_none,

9
tests/test_jsonable_encoder.py
View File

@ -76,6 +76,10 @@ class ModelWithDefault(BaseModel):
bla: str = "bla" bla: str = "bla"
class ModelWithRoot(BaseModel):
__root__: str
@pytest.fixture( @pytest.fixture(
name="model_with_path", params=[PurePath, PurePosixPath, PureWindowsPath] name="model_with_path", params=[PurePath, PurePosixPath, PureWindowsPath]
) )
@ -158,3 +162,8 @@ def test_encode_model_with_path(model_with_path):
else: else:
expected = "/foo/bar" expected = "/foo/bar"
assert jsonable_encoder(model_with_path) == {"path": expected} assert jsonable_encoder(model_with_path) == {"path": expected}
def test_encode_root():
model = ModelWithRoot(__root__="Foo")
assert jsonable_encoder(model) == "Foo"