Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
54cd27b
Initial implementation of Qdrant document index
kacperlukawski Mar 31, 2023
ab421d7
Initial implementation of Qdrant document index
kacperlukawski Mar 31, 2023
d594e67
Merge remote-tracking branch 'origin/feat-rewrite-qdrant' into feat-r…
kacperlukawski Mar 31, 2023
4e5cc88
Update poetry.lock
kacperlukawski Mar 31, 2023
712dccf
Initial implementation of _filter and _text_search, also with batched…
kacperlukawski Mar 31, 2023
0a20122
Return separate scores from batched text search requests
kacperlukawski Apr 3, 2023
2bd8c5e
Return separate scores from batched find requests
kacperlukawski Apr 3, 2023
7dfd201
Add empty test_query_builder.py for Qdrant
kacperlukawski Apr 4, 2023
c34c086
Merge branch 'feat-rewrite-v2' into feat-rewrite-qdrant
kacperlukawski Apr 4, 2023
bb6bc01
Upgrade Qdrant to 1.1.1
kacperlukawski Apr 6, 2023
0aaaf70
Implement QueryBuilder
kacperlukawski Apr 6, 2023
dce78c7
Add tensorflow tests
kacperlukawski Apr 6, 2023
dc0eb98
Merge branch 'feat-rewrite-v2' into feat-rewrite-qdrant
kacperlukawski Apr 6, 2023
30399e5
Supported optional vectors
kacperlukawski Apr 6, 2023
20f8fc9
Fix mypy and formatting
kacperlukawski Apr 6, 2023
1ec2123
Update docarray/index/backends/qdrant.py
kacperlukawski Apr 12, 2023
d8823af
Merge branch 'feat-rewrite-v2' into feat-rewrite-qdrant
kacperlukawski Apr 12, 2023
5595f2e
Remove the test with custom type (np.array)
kacperlukawski Apr 13, 2023
346165e
Update Qdrant to 1.1.4
kacperlukawski Apr 13, 2023
5591e2d
Refactor tests
kacperlukawski Apr 13, 2023
b7f3be5
Merge remote-tracking branch 'origin/feat-rewrite-qdrant' into feat-r…
kacperlukawski Apr 13, 2023
4038e57
WIP: Raw query execution
kacperlukawski Apr 13, 2023
1a3f592
Merge branch 'feat-rewrite-v2' into feat-rewrite-qdrant
kacperlukawski Apr 13, 2023
ca1e3a8
Add raw Qdrant query support in .execute_query
kacperlukawski Apr 13, 2023
939503f
Switch to local mode in Qdrant tests
kacperlukawski Apr 13, 2023
7117110
Merge branch 'feat-rewrite-v2' into feat-rewrite-qdrant
kacperlukawski Apr 13, 2023
9f11d34
Code formatting with black
kacperlukawski Apr 14, 2023
8c099dd
Merge remote-tracking branch 'origin/feat-rewrite-qdrant' into feat-r…
kacperlukawski Apr 14, 2023
2b7c364
Merge branch 'feat-rewrite-v2' into feat-rewrite-qdrant
kacperlukawski Apr 14, 2023
a658b55
Update poetry.lock
kacperlukawski Apr 14, 2023
d859fd2
Merge branch 'feat-rewrite-v2' into feat-rewrite-qdrant
kacperlukawski Apr 14, 2023
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
2 changes: 0 additions & 2 deletions docarray/array/doc_vec/doc_vec.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ def __init__(
tensor_columns[field_name] = TensorFlowTensor(stacked)

elif issubclass(field_type, AbstractTensor):

tensor = getattr(docs[0], field_name)
column_shape = (
(len(docs), *tensor.shape)
Expand Down Expand Up @@ -378,7 +377,6 @@ def _set_data_column(
self._storage.tensor_columns[field] = values

elif field in self._storage.doc_columns.keys():

values_ = parse_obj_as(
DocVec.__class_getitem__(self._storage.doc_columns[field].doc_type),
values,
Expand Down
2 changes: 0 additions & 2 deletions docarray/base_doc/mixins/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ def from_protobuf(cls: Type[T], pb_msg: 'DocProto') -> T:
fields: Dict[str, Any] = {}

for field_name in pb_msg.data:

if field_name not in cls.__fields__.keys():
continue # optimization we don't even load the data if the key does not
# match any field in the cls or in the mapping
Expand Down Expand Up @@ -265,7 +264,6 @@ def _get_content_from_node_proto(
elif content_key is None:
return_field = None
elif docarray_type is None:

arg_to_container: Dict[str, Callable] = {
'list': list,
'set': set,
Expand Down
1 change: 0 additions & 1 deletion docarray/computation/torch_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ def shape(cls, tensor: 'torch.Tensor') -> Tuple[int, ...]:

@classmethod
def reshape(cls, tensor: 'torch.Tensor', shape: Tuple[int, ...]) -> 'torch.Tensor':

"""
Gives a new shape to tensor without changing its data.

Expand Down
5 changes: 4 additions & 1 deletion docarray/index/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from docarray.index.backends.elastic import ElasticDocIndex # noqa: F401
from docarray.index.backends.elasticv7 import ElasticV7DocIndex # noqa: F401
from docarray.index.backends.hnswlib import HnswDocumentIndex # noqa: F401
from docarray.index.backends.qdrant import QdrantDocumentIndex # noqa: F401

__all__ = []

Expand All @@ -25,7 +26,9 @@ def __getattr__(name: str):
elif name == 'ElasticV7DocIndex':
import_library('elasticsearch', raise_error=True)
import docarray.index.backends.elasticv7 as lib

elif name == 'QdrantDocumentIndex':
import_library('qdrant_client', raise_error=True)
import docarray.index.backends.qdrant as lib
else:
raise ImportError(
f'cannot import name \'{name}\' from \'{_get_path_from_docarray_root_level(__file__)}\''
Expand Down
Loading