Skip to content

fix: fix summary of Doc with list #1595

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 1 commit into from
May 31, 2023
Merged

fix: fix summary of Doc with list #1595

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions docarray/display/document_summary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from docarray.display.tensor_display import TensorDisplay
from docarray.typing import ID
from docarray.typing.tensor.abstract_tensor import AbstractTensor
from docarray.utils._internal._typing import safe_issubclass

if TYPE_CHECKING:
from rich.console import Console, ConsoleOptions, RenderResult
Expand Down Expand Up @@ -62,10 +63,7 @@ def _get_schema(cls: Type['BaseDoc'], doc_name: Optional[str] = None) -> Tree:

for field_name, value in cls.__fields__.items():
if field_name != 'id':
field_type = value.type_
if not value.required:
field_type = Optional[field_type]

field_type = value.annotation
field_cls = str(field_type).replace('[', '\[')
field_cls = re.sub('<class \'|\'>|[a-zA-Z_]*[.]', '', field_cls)

Expand All @@ -74,18 +72,18 @@ def _get_schema(cls: Type['BaseDoc'], doc_name: Optional[str] = None) -> Tree:
if is_union_type(field_type) or is_optional_type(field_type):
sub_tree = Tree(node_name, highlight=True)
for arg in field_type.__args__:
if issubclass(arg, BaseDoc):
if safe_issubclass(arg, BaseDoc):
sub_tree.add(DocumentSummary._get_schema(cls=arg))
elif issubclass(arg, DocList):
elif safe_issubclass(arg, DocList):
sub_tree.add(DocumentSummary._get_schema(cls=arg.doc_type))
tree.add(sub_tree)

elif issubclass(field_type, BaseDoc):
elif safe_issubclass(field_type, BaseDoc):
tree.add(
DocumentSummary._get_schema(cls=field_type, doc_name=field_name)
)

elif issubclass(field_type, DocList):
elif safe_issubclass(field_type, DocList):
sub_tree = Tree(node_name, highlight=True)
sub_tree.add(DocumentSummary._get_schema(cls=field_type.doc_type))
tree.add(sub_tree)
Expand Down