From aa4a150f429071152847d13a1295332ef94609f4 Mon Sep 17 00:00:00 2001 From: anna-charlotte Date: Wed, 22 Mar 2023 12:32:36 +0100 Subject: [PATCH 1/2] fix: bytes type is None in predefined documents Signed-off-by: anna-charlotte --- docarray/documents/text.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docarray/documents/text.py b/docarray/documents/text.py index 0e3edbbcec2..0fb6aec598d 100644 --- a/docarray/documents/text.py +++ b/docarray/documents/text.py @@ -43,6 +43,7 @@ class TextDoc(BaseDocument): from docarray.typing import AnyEmbedding from typing import Optional + # extend it class MyText(Text): second_embedding: Optional[AnyEmbedding] @@ -62,6 +63,7 @@ class MyText(Text): from docarray import BaseDocument from docarray.documents import ImageDoc, TextDoc + # compose it class MultiModalDoc(BaseDocument): image_doc: Image @@ -99,7 +101,7 @@ class MultiModalDoc(BaseDocument): text: Optional[str] = None url: Optional[TextUrl] = None embedding: Optional[AnyEmbedding] = None - bytes: Optional[bytes] = None + bytes: Optional[bytes] def __init__(self, text: Optional[str] = None, **kwargs): if 'text' not in kwargs: From 0b558815d43c6a3016a60323b6674e8553fb45f2 Mon Sep 17 00:00:00 2001 From: anna-charlotte Date: Wed, 22 Mar 2023 12:41:49 +0100 Subject: [PATCH 2/2] fix: remove defaults to none Signed-off-by: anna-charlotte --- docarray/documents/text.py | 6 +++--- docarray/documents/video.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docarray/documents/text.py b/docarray/documents/text.py index 0fb6aec598d..98a335fb268 100644 --- a/docarray/documents/text.py +++ b/docarray/documents/text.py @@ -98,9 +98,9 @@ class MultiModalDoc(BaseDocument): doc == doc2 # False, their ids are not equivalent """ - text: Optional[str] = None - url: Optional[TextUrl] = None - embedding: Optional[AnyEmbedding] = None + text: Optional[str] + url: Optional[TextUrl] + embedding: Optional[AnyEmbedding] bytes: Optional[bytes] def __init__(self, text: Optional[str] = None, **kwargs): diff --git a/docarray/documents/video.py b/docarray/documents/video.py index debd93e3540..407d966fb3c 100644 --- a/docarray/documents/video.py +++ b/docarray/documents/video.py @@ -102,7 +102,7 @@ class MultiModalDoc(BaseDocument): tensor: Optional[VideoTensor] key_frame_indices: Optional[AnyTensor] embedding: Optional[AnyEmbedding] - bytes: Optional[bytes] = None + bytes: Optional[bytes] @classmethod def validate(