Skip to content

Validation bug Fix: DocList and DocVec are not coerced to each other #1568

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
merged 5 commits into from
Jun 7, 2023
Merged

Validation bug Fix: DocList and DocVec are not coerced to each other #1568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a52cf9
fix: issue 1545,DocList to DocVec casting and vice versa
agaraman0 May 24, 2023
b834d4f
fix: mypy errors
agaraman0 Jun 4, 2023
c78ae1c
fix: black errors
agaraman0 Jun 4, 2023
d4aa3df
fix: doc_vec broken changes
agaraman0 Jun 4, 2023
e0e1a52
fix: failing test case
agaraman0 Jun 7, 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
13 changes: 12 additions & 1 deletion docarray/array/doc_list/doc_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
Type,
TypeVar,
Union,
cast,
overload,
)

Expand Down Expand Up @@ -267,8 +268,18 @@ def validate(
):
from docarray.array.doc_vec.doc_vec import DocVec

if isinstance(value, (cls, DocVec)):
if isinstance(value, cls):
return value
elif isinstance(value, DocVec):
if (
issubclass(value.doc_type, cls.doc_type)
or value.doc_type == cls.doc_type
):
return cast(T, value.to_doc_list())
else:
raise ValueError(
f'DocList[value.doc_type] is not compatible with {cls}'
)
elif isinstance(value, cls):
return cls(value)
elif isinstance(value, Iterable):
Expand Down
8 changes: 8 additions & 0 deletions docarray/array/doc_vec/doc_vec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,14 @@ def validate(
) -> T:
if isinstance(value, cls):
return value
elif isinstance(value, DocList):
if (
issubclass(value.doc_type, cls.doc_type)
or value.doc_type == cls.doc_type
):
return cast(T, value.to_doc_vec())
else:
raise ValueError(f'DocVec[value.doc_type] is not compatible with {cls}')
elif isinstance(value, DocList.__class_getitem__(cls.doc_type)):
return cast(T, value.to_doc_vec())
elif isinstance(value, Sequence):
Expand Down
2 changes: 1 addition & 1 deletion tests/units/array/stack/test_array_stacked.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ def test_to_device():

def test_to_device_with_nested_da():
class Video(BaseDoc):
images: DocList[ImageDoc]
images: DocVec[ImageDoc]

da_image = DocVec[ImageDoc](
[ImageDoc(tensor=torch.zeros(3, 5))], tensor_type=TorchTensor
Expand Down