fix: avoid converting doclists in the base index (#1685)

jupyterjazz · web-flow · commit f6ce28338864 · 2023-07-05T15:48:20.000+04:00
Signed-off-by: jupyterjazz &lt;saba.sturua@jina.ai&gt;
diff --git a/docarray/index/abstract.py b/docarray/index/abstract.py
@@ -578,7 +578,7 @@ def filter(
         self._logger.debug(f'Executing `filter` for the query {filter_query}')
         docs = self._filter(filter_query, limit=limit, **kwargs)
 
-        if isinstance(docs, List):
+        if isinstance(docs, List) and not isinstance(docs, DocList):
             docs = self._dict_list_to_docarray(docs)
 
         return docs
@@ -656,7 +656,7 @@ def text_search(
             query_text, search_field=search_field, limit=limit, **kwargs
         )
 
-        if isinstance(docs, List):
+        if isinstance(docs, List) and not isinstance(docs, DocList):
             docs = self._dict_list_to_docarray(docs)
 
         return FindResult(documents=docs, scores=scores)
diff --git a/docarray/index/backends/weaviate.py b/docarray/index/backends/weaviate.py
@@ -357,7 +357,7 @@ def find(
             query_vec_np, search_field=search_field, limit=limit, **kwargs
         )
 
-        if isinstance(docs, List):
+        if isinstance(docs, List) and not isinstance(docs, DocList):
             docs = self._dict_list_to_docarray(docs)
 
         return FindResult(documents=docs, scores=scores)

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ def find(`
`357`	`357`	`query_vec_np, search_field=search_field, limit=limit, **kwargs`
`358`	`358`	`)`
`359`	`359`
`360`		`- if isinstance(docs, List):`
	`360`	`+ if isinstance(docs, List) and not isinstance(docs, DocList):`
`361`	`361`	`docs = self._dict_list_to_docarray(docs)`
`362`	`362`
`363`	`363`	`return FindResult(documents=docs, scores=scores)`