fix: DocList and DocVec are now coerced to each other correctly (#1568) · Ditto190/docarray@693f877 · GitHub

Ditto190 / docarray Public

forked from docarray/docarray

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 693f877

Browse filesBrowse the repository at this point in the historyBrowse files

agaraman0

authored

fix: DocList and DocVec are now coerced to each other correctly (docarray#1568)

Signed-off-by: agaraman0 <agaraman0@gmail.com>

1 parent 65afa9a commit 693f877
Copy full SHA for 693f877

3 files changed

+21-2Lines changed: 21 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• docarray/array
  • doc_list
    • doc_list.py
  • doc_vec
    • doc_vec.py
• tests/units/array/stack
  • test_array_stacked.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎docarray/array/doc_list/doc_list.py‎

Copy file name to clipboardExpand all lines: docarray/array/doc_list/doc_list.py

+12-1Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -10,6 +10,7 @@
10	10	Type,
11	11	TypeVar,
12	12	Union,
	13	+ cast,
13	14	overload,
14	15	)
15	16
@@ -267,8 +268,18 @@ def validate(
267	268	):
268	269	from docarray.array.doc_vec.doc_vec import DocVec
269	270
270		- if isinstance(value, (cls, DocVec)):
	271	+ if isinstance(value, cls):
271	272	return value
	273	+ elif isinstance(value, DocVec):
	274	+ if (
	275	+ issubclass(value.doc_type, cls.doc_type)
	276	+ or value.doc_type == cls.doc_type
	277	+ ):
	278	+ return cast(T, value.to_doc_list())
	279	+ else:
	280	+ raise ValueError(
	281	+ f'DocList[value.doc_type] is not compatible with {cls}'
	282	+ )
272	283	elif isinstance(value, cls):
273	284	return cls(value)
274	285	elif isinstance(value, Iterable):

Collapse file

‎docarray/array/doc_vec/doc_vec.py‎

Copy file name to clipboardExpand all lines: docarray/array/doc_vec/doc_vec.py

+8Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -293,6 +293,14 @@ def validate(
293	293	) -> T:
294	294	if isinstance(value, cls):
295	295	return value
	296	+ elif isinstance(value, DocList):
	297	+ if (
	298	+ issubclass(value.doc_type, cls.doc_type)
	299	+ or value.doc_type == cls.doc_type
	300	+ ):
	301	+ return cast(T, value.to_doc_vec())
	302	+ else:
	303	+ raise ValueError(f'DocVec[value.doc_type] is not compatible with {cls}')
296	304	elif isinstance(value, DocList.__class_getitem__(cls.doc_type)):
297	305	return cast(T, value.to_doc_vec())
298	306	elif isinstance(value, Sequence):

Collapse file

‎tests/units/array/stack/test_array_stacked.py‎

Copy file name to clipboardExpand all lines: tests/units/array/stack/test_array_stacked.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -359,7 +359,7 @@ def test_to_device():
359	359
360	360	def test_to_device_with_nested_da():
361	361	class Video(BaseDoc):
362		- images: DocList[ImageDoc]
	362	+ images: DocVec[ImageDoc]
363	363
364	364	da_image = DocVec[ImageDoc](
365	365	[ImageDoc(tensor=torch.zeros(3, 5))], tensor_type=TorchTensor

0 commit comments

Comments

0 (0)