From 7fbe3737bc0ffcd9228be2a24b4914f8a6ab9e1e Mon Sep 17 00:00:00 2001 From: Henry Betts Date: Mon, 3 Aug 2020 16:24:29 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20encoding=20a=20Pydantic=20?= =?UTF-8?q?model=20that=20inherits=20from=20another=20with=20json=5Fencode?= =?UTF-8?q?rs=20(#1769)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastapi/encoders.py | 2 +- tests/test_jsonable_encoder.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/fastapi/encoders.py b/fastapi/encoders.py index a1b68829a..d0d094b6a 100644 --- a/fastapi/encoders.py +++ b/fastapi/encoders.py @@ -48,7 +48,7 @@ def jsonable_encoder( if exclude is not None and not isinstance(exclude, set): exclude = set(exclude) if isinstance(obj, BaseModel): - encoder = getattr(obj.Config, "json_encoders", {}) + encoder = getattr(obj.__config__, "json_encoders", {}) if custom_encoder: encoder.update(custom_encoder) if PYDANTIC_1: diff --git a/tests/test_jsonable_encoder.py b/tests/test_jsonable_encoder.py index 2514edfde..502f5f04c 100644 --- a/tests/test_jsonable_encoder.py +++ b/tests/test_jsonable_encoder.py @@ -55,6 +55,11 @@ class ModelWithCustomEncoder(BaseModel): } +class ModelWithCustomEncoderSubclass(ModelWithCustomEncoder): + class Config: + pass + + class RoleEnum(Enum): admin = "admin" 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"} +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(): model = ModelWithConfig(role=RoleEnum.admin) assert jsonable_encoder(model) == {"role": "admin"}