From 13b63efd89788ebe89484633523ec12862cebafe Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 14 Apr 2023 09:28:26 +0200 Subject: [PATCH 1/3] fix: fix mypy 1 Signed-off-by: samsja --- docarray/index/abstract.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docarray/index/abstract.py b/docarray/index/abstract.py index 3c423137259..774ed71b7c8 100644 --- a/docarray/index/abstract.py +++ b/docarray/index/abstract.py @@ -573,7 +573,8 @@ def text_search_batched( docs = [self._dict_list_to_docarray(docs) for docs in da_list] return FindResultBatched(documents=docs, scores=scores) - return FindResultBatched(documents=da_list, scores=scores) + da_list_ = cast(List[DocList], da_list) + return FindResultBatched(documents=da_list_, scores=scores) ########################################################## # Helper methods # From 18de7f4fa436a3837f1a6cc4dc3fe57b07ff28f0 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 14 Apr 2023 09:46:12 +0200 Subject: [PATCH 2/3] fix: fix mypy 2 Signed-off-by: samsja --- docarray/index/backends/hnswlib.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docarray/index/backends/hnswlib.py b/docarray/index/backends/hnswlib.py index d0e11e7e959..62ac8020810 100644 --- a/docarray/index/backends/hnswlib.py +++ b/docarray/index/backends/hnswlib.py @@ -39,7 +39,7 @@ import tensorflow as tf # type: ignore import torch - from docarray.typing import TensorFlowTensor + from docarray.typing import NdArray, TensorFlowTensor else: hnswlib = import_library('hnswlib', raise_error=False) torch = import_library('torch', raise_error=False) @@ -262,7 +262,9 @@ def _find( docs, scores = self._find_batched( queries=query_batched, limit=limit, search_field=search_field ) - return _FindResult(documents=docs[0], scores=scores[0]) + return _FindResult( + documents=docs[0], scores=NdArray._docarray_from_native(scores[0]) + ) def _filter( self, From 738191cccc7dbda7f93a2b6d7a6dbfb3919fa80e Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 14 Apr 2023 09:57:21 +0200 Subject: [PATCH 3/3] fix: fix import Signed-off-by: samsja --- docarray/index/backends/hnswlib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docarray/index/backends/hnswlib.py b/docarray/index/backends/hnswlib.py index 62ac8020810..2807ba9b06b 100644 --- a/docarray/index/backends/hnswlib.py +++ b/docarray/index/backends/hnswlib.py @@ -29,6 +29,7 @@ _raise_not_supported, ) from docarray.proto import DocProto +from docarray.typing import NdArray from docarray.typing.tensor.abstract_tensor import AbstractTensor from docarray.utils._internal.misc import import_library, is_np_int from docarray.utils.filter import filter_docs @@ -39,7 +40,7 @@ import tensorflow as tf # type: ignore import torch - from docarray.typing import NdArray, TensorFlowTensor + from docarray.typing import TensorFlowTensor else: hnswlib = import_library('hnswlib', raise_error=False) torch = import_library('torch', raise_error=False)