Skip to content

fix: allow nested model dump via docvec #1808

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

Merged
JoanFM merged 3 commits into from
Sep 28, 2023
Merged

fix: allow nested model dump via docvec #1808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8247440
fix: allow nested model dump via docvec
samsja Sep 28, 2023
a49d91a
fix: remove breakpont
samsja Sep 28, 2023
f18ee76
fix: remove breakpont
samsja Sep 28, 2023
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
21 changes: 17 additions & 4 deletions docarray/base_doc/doc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,6 @@ def dict(
which fields to include or exclude.

"""

exclude, original_exclude, doclist_exclude_fields = self._exclude_doclist(
exclude=exclude
)
Expand Down Expand Up @@ -447,6 +446,20 @@ def dict(

else:

def _copy_view_pydantic_v2(self: T) -> T:
"""
perform a deep copy, the new doc has its own data
"""
data = {}
for key, value in self.__dict__.to_dict().items():
if isinstance(value, BaseDocWithoutId):
data[key] = value._copy_view_pydantic_v2()
else:
data[key] = value

doc = self.__class__.model_construct(**data)
return doc

def model_dump( # type: ignore
self,
*,
Expand All @@ -460,15 +473,15 @@ def model_dump( # type: ignore
round_trip: bool = False,
warnings: bool = True,
) -> Dict[str, Any]:
def _model_dump(cls):
def _model_dump(doc):

(
exclude_,
original_exclude,
doclist_exclude_fields,
) = self._exclude_doclist(exclude=exclude)

data = cls.model_dump(
data = doc.model_dump(
mode=mode,
include=include,
exclude=exclude_,
Expand All @@ -495,7 +508,7 @@ def _model_dump(cls):
## for some reason use ColumnViewStorage to dump the data is not working with
## pydantic v2, so we need to create a new doc and dump it

new_doc = self.__class__.model_construct(**self.__dict__.to_dict())
new_doc = self._copy_view_pydantic_v2()
return _model_dump(new_doc)
else:
return _model_dump(super())
Expand Down
1 change: 0 additions & 1 deletion tests/units/array/test_array_from_to_pandas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class MyDocNested(MyDoc):
return MyDocNested


@pytest.mark.skipif(is_pydantic_v2, reason="Not working with pydantic v2")
@pytest.mark.parametrize('doc_vec', [False, True])
def test_to_from_pandas_df(nested_doc_cls, doc_vec):
da = DocList[nested_doc_cls](
Expand Down