Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Enumbug #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
euri10 wants to merge 10 commits into from
Closed

Enumbug #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
75d3823
Add websocket to APIRouter
euri10 Mar 24, 2019
fc16546
Merge remote-tracking branch 'upstream/master'
euri10 Mar 25, 2019
8b89413
Merge remote-tracking branch 'upstream/master'
euri10 Mar 25, 2019
330b1c8
Merge remote-tracking branch 'upstream/master'
euri10 Mar 29, 2019
58d1e0d
Merge remote-tracking branch 'upstream/master'
euri10 Mar 29, 2019
a49abfb
Merge branch 'master' of github.com:euri10/fastapi
euri10 Mar 29, 2019
1941704
Merge remote-tracking branch 'upstream/master'
euri10 Apr 15, 2019
d2fb62f
Merge branch 'master' of github.com:euri10/fastapi
euri10 Apr 15, 2019
e52b181
Merge remote-tracking branch 'upstream/master'
euri10 May 7, 2019
8a1ceaa
Added use_enum_values support for Enum
euri10 May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion fastapi/encoders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,23 @@ def jsonable_encoder(
include_none: bool = True,
custom_encoder: dict = {},
sqlalchemy_safe: bool = True,
use_enum_values: bool = False,
) -> Any:
if isinstance(obj, BaseModel):
use_enum_values = getattr(obj.Config, "use_enum_values", use_enum_values)
encoder = getattr(obj.Config, "json_encoders", custom_encoder)
return jsonable_encoder(
obj.dict(include=include, exclude=exclude, by_alias=by_alias),
include_none=include_none,
custom_encoder=encoder,
sqlalchemy_safe=sqlalchemy_safe,
use_enum_values=use_enum_values,
)
if isinstance(obj, Enum):
return obj.value
if use_enum_values:
return obj.value
else:
return obj.name
if isinstance(obj, (str, int, float, type(None))):
return obj
if isinstance(obj, dict):
Expand Down
17 changes: 13 additions & 4 deletions tests/test_jsonable_encoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ class Config:


class RoleEnum(Enum):
admin = "admin"
normal = "normal"
adminkey = "adminvalue"
normalkey = "normalvalue"


class ModelWithConfig(BaseModel):
Expand All @@ -59,6 +59,10 @@ class Config:
use_enum_values = True


class ModelWithoutConfig(BaseModel):
role: RoleEnum = None


class ModelWithAlias(BaseModel):
foo: str = Schema(..., alias="Foo")

Expand Down Expand Up @@ -87,8 +91,8 @@ def test_encode_custom_json_encoders_model():


def test_encode_model_with_config():
model = ModelWithConfig(role=RoleEnum.admin)
assert jsonable_encoder(model) == {"role": "admin"}
model = ModelWithConfig(role=RoleEnum.adminkey)
assert jsonable_encoder(model) == {"role": "adminvalue"}


def test_encode_model_with_alias_raises():
Expand All @@ -99,3 +103,8 @@ def test_encode_model_with_alias_raises():
def test_encode_model_with_alias():
model = ModelWithAlias(Foo="Bar")
assert jsonable_encoder(model) == {"Foo": "Bar"}


def test_encode_model_without_config():
model = ModelWithoutConfig(role=RoleEnum.adminkey)
assert jsonable_encoder(model) == {"role": "adminkey"}