Skip to content

exclude none for nested dicts and list of dicts #355

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

Open
pmcb99 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

exclude none for nested dicts and list of dicts #355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 29 additions & 2 deletions odmantic/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
)

if TYPE_CHECKING:

from pydantic.typing import (
AbstractSetIntStr,
DictStrAny,
Expand Down Expand Up @@ -643,7 +642,35 @@ def update(
if k not in odm_fields:
continue
patch_dict[k] = v
patched_instance_dict = {**self.dict(), **patch_dict}

def merge_dicts(d1, d2, exclude_none):
result = {}
for k in {**d1, **d2}:
if (
isinstance(d1.get(k, None), dict)
and isinstance(d2.get(k, None), dict)
):
result[k] = merge_dicts(d1[k], d2[k], exclude_none)
elif (
isinstance(d1.get(k, None), list)
and isinstance(d2.get(k, None), list)
):
result[k] = [
merge_dicts(item1, item2, exclude_none)
for item1, item2 in zip(d1[k], d2[k])
]
else:
result[k] = (
d2[k]
if k in d2 and (not exclude_none or d2[k] is not None)
else d1[k]
)
return result

if exclude_none:
patched_instance_dict = merge_dicts(self.dict(), patch_dict, True)
else:
patched_instance_dict = {**self.dict(), **patch_dict}
# FIXME: improve performance by only running updated field validators and then
# model validators
patched_instance = self.validate(patched_instance_dict)
Expand Down