Skip to content

fix: fix equal of BaseDoc with nested DocList #1477

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
samsja merged 4 commits into from
Apr 28, 2023
Merged

fix: fix equal of BaseDoc with nested DocList #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e7a291
fix: does not do dicti equal
samsja Apr 28, 2023
74f8620
fix: fix repr
samsja Apr 28, 2023
c156a69
fix: add test
samsja Apr 28, 2023
6dabb3c
fix: mypy
samsja Apr 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
3 changes: 3 additions & 0 deletions docarray/array/doc_list/doc_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,3 +292,6 @@ def __class_getitem__(cls, item: Union[Type[BaseDoc], TypeVar, str]):
return AnyDocArray.__class_getitem__.__func__(cls, item) # type: ignore
else:
return super().__class_getitem__(item)

def __repr__(self):
return AnyDocArray.__repr__(self) # type: ignore
2 changes: 1 addition & 1 deletion docarray/base_doc/doc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def __setattr__(self, field, value) -> None:
object.__setattr__(self, '__dict__', dict_ref)

def __eq__(self, other) -> bool:
if self.dict().keys() != other.dict().keys():
if self.__fields__.keys() != other.__fields__.keys():
return False

for field_name in self.__fields__:
Expand Down
19 changes: 19 additions & 0 deletions tests/units/document/test_base_document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,22 @@ class MyDocument(BaseDoc):
assert doc1.content == 'Core content updated'
assert doc1.title == 'Title'
assert doc1.tags_ == ['python', 'AI', 'docarray']


def test_equal_nested_docs():
import numpy as np

from docarray import BaseDoc, DocList
from docarray.typing import NdArray

class SimpleDoc(BaseDoc):
simple_tens: NdArray[10]

class NestedDoc(BaseDoc):
docs: DocList[SimpleDoc]

nested_docs = NestedDoc(
docs=DocList[SimpleDoc]([SimpleDoc(simple_tens=np.ones(10)) for j in range(2)]),
)

assert nested_docs == nested_docs