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

🐛 Fix encoding a Pydantic model that inherits from another with json_encoders (#1769)

This commit is contained in:
Henry Betts 2020-08-03 16:24:29 +01:00 committed by GitHub
parent f63cec9c95
commit 7fbe3737bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fastapi/encoders.py
View File

@ -48,7 +48,7 @@ def jsonable_encoder(
if exclude is not None and not isinstance(exclude, set): if exclude is not None and not isinstance(exclude, set):
exclude = set(exclude) exclude = set(exclude)
if isinstance(obj, BaseModel): if isinstance(obj, BaseModel):
encoder = getattr(obj.Config, "json_encoders", {}) encoder = getattr(obj.__config__, "json_encoders", {})
if custom_encoder: if custom_encoder:
encoder.update(custom_encoder) encoder.update(custom_encoder)
if PYDANTIC_1: if PYDANTIC_1:

10
tests/test_jsonable_encoder.py
View File

@ -55,6 +55,11 @@ class ModelWithCustomEncoder(BaseModel):
} }
class ModelWithCustomEncoderSubclass(ModelWithCustomEncoder):
class Config:
pass
class RoleEnum(Enum): class RoleEnum(Enum):
admin = "admin" admin = "admin"
normal = "normal" normal = "normal"
@ -117,6 +122,11 @@ def test_encode_custom_json_encoders_model():
assert jsonable_encoder(model) == {"dt_field": "2019-01-01T08:00:00+00:00"} assert jsonable_encoder(model) == {"dt_field": "2019-01-01T08:00:00+00:00"}
def test_encode_custom_json_encoders_model_subclass():
model = ModelWithCustomEncoderSubclass(dt_field=datetime(2019, 1, 1, 8))
assert jsonable_encoder(model) == {"dt_field": "2019-01-01T08:00:00+00:00"}
def test_encode_model_with_config(): def test_encode_model_with_config():
model = ModelWithConfig(role=RoleEnum.admin) model = ModelWithConfig(role=RoleEnum.admin)
assert jsonable_encoder(model) == {"role": "admin"} assert jsonable_encoder(model) == {"role": "admin"}