Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
edf408a
feat: __init__ of ElasticDocumentIndex
AnneYang720 Mar 1, 2023
4aa76c5
feat: add index func
AnneYang720 Mar 2, 2023
409f3ff
feat: get and del funcs
AnneYang720 Mar 3, 2023
de7915b
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 3, 2023
4e53d0c
fix: init and index creation
AnneYang720 Mar 3, 2023
2d7e019
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 4, 2023
f7b775d
fix: __init__ and _index
AnneYang720 Mar 4, 2023
0cc93f7
fix: _get_items
AnneYang720 Mar 4, 2023
9c5f70d
feat: add _find
AnneYang720 Mar 4, 2023
1e8fff5
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 6, 2023
310c8eb
feat: add filter text and their batch version
AnneYang720 Mar 6, 2023
11aa3c0
feat: store id and get nested doc
AnneYang720 Mar 7, 2023
9da9995
fix: vector cannot be all zero
AnneYang720 Mar 7, 2023
ede075f
fix: __getitem__ raise error
AnneYang720 Mar 7, 2023
8d1641f
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-elast…
AnneYang720 Mar 10, 2023
2a6782f
feat: support more python types
AnneYang720 Mar 10, 2023
79cac76
fix: mypy
AnneYang720 Mar 10, 2023
dc1f988
test: elastic index tests
AnneYang720 Mar 10, 2023
70c0da9
test: comment scripts before ci setup
AnneYang720 Mar 10, 2023
2991d52
chore: add elasticsearch dependency to poetry
AnneYang720 Mar 10, 2023
a0f90bb
test: elastic index ci setup
AnneYang720 Mar 10, 2023
bd32449
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 11, 2023
6a16161
feat: add num_candidates to rumtime config
AnneYang720 Mar 11, 2023
36cfce4
fix: let user pass index_settings
AnneYang720 Mar 11, 2023
c5df1c0
feat: degrade to v7 and add query builder
AnneYang720 Mar 15, 2023
389b082
fix: remove elastic_transport
AnneYang720 Mar 15, 2023
cfb1e2d
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 15, 2023
bffcd57
feat: minor features
AnneYang720 Mar 15, 2023
69e6ed0
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 15, 2023
8622d00
refactor: style fix
AnneYang720 Mar 17, 2023
e31f150
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 17, 2023
343caa3
fix: fix mypy
AnneYang720 Mar 17, 2023
cf65798
feat: add chunk size to runtime config
AnneYang720 Mar 20, 2023
81bbc57
fix: chunk size
AnneYang720 Mar 20, 2023
0bbe52f
feat: add chunk_size to funcs
AnneYang720 Mar 21, 2023
5c79ef1
feat: rewrite elastic v7 query builder
AnneYang720 Mar 21, 2023
d96b605
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 21, 2023
0f5873d
fix: poetry
AnneYang720 Mar 21, 2023
edf269a
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-elast…
AnneYang720 Mar 21, 2023
2e850c0
fix: db_type should be elastic types
AnneYang720 Mar 21, 2023
9560789
fix: minor adjustment
AnneYang720 Mar 22, 2023
fadf1f2
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 22, 2023
7170c5a
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-elast…
AnneYang720 Mar 22, 2023
6beeb32
refactor: rename elastic index files
AnneYang720 Mar 22, 2023
d793d6a
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 22, 2023
fad699b
refactor: remove comments
AnneYang720 Mar 23, 2023
b3dd13b
feat: rename, batch operations, etc
AnneYang720 Mar 23, 2023
0476e6b
test: add test for persistency and col config
AnneYang720 Mar 23, 2023
e8a8c92
feat: support more field types and subclass
AnneYang720 Mar 24, 2023
fb9d600
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 24, 2023
b4b4cec
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-elast…
AnneYang720 Mar 24, 2023
c62da11
feat: support more python types
AnneYang720 Mar 24, 2023
31de337
test: tf, tensor and more elastic field types
AnneYang720 Mar 24, 2023
9938ea4
fix: elastic should be optional in toml
AnneYang720 Mar 24, 2023
a85bb20
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-elast…
AnneYang720 Mar 29, 2023
2038a39
refactor: rename class
AnneYang720 Mar 29, 2023
0f74e5c
fix: change Dict to Mapping
AnneYang720 Mar 29, 2023
641050b
fix: add AbstractTensor
AnneYang720 Mar 29, 2023
295140b
test: rename class and add tests
AnneYang720 Mar 29, 2023
4a6868a
fix: poetry
AnneYang720 Mar 29, 2023
29587c8
Merge branch 'feat-rewrite-v2' into feat-elastic-store
AnneYang720 Mar 29, 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
3 changes: 2 additions & 1 deletion docarray/index/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from docarray.index.backends.elastic import ElasticV7DocIndex
from docarray.index.backends.hnswlib import HnswDocumentIndex

__all__ = ['HnswDocumentIndex']
__all__ = ['HnswDocumentIndex', 'ElasticV7DocIndex']
7 changes: 4 additions & 3 deletions docarray/index/abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
Generic,
Iterable,
List,
Mapping,
NamedTuple,
Optional,
Sequence,
Expand Down Expand Up @@ -233,13 +234,13 @@ def _find(
@abstractmethod
def _find_batched(
self,
query: np.ndarray,
queries: np.ndarray,
limit: int,
search_field: str = '',
) -> _FindResultBatched:
"""Find documents in the index

:param query: query vectors for KNN/ANN search.
:param queries: query vectors for KNN/ANN search.
Has shape (batch_size, vector_dim)
:param limit: maximum number of documents to return
:param search_field: name of the field to search on
Expand Down Expand Up @@ -593,7 +594,7 @@ def _get_values_by_column(docs: Sequence[BaseDoc], col_name: str) -> List[Any]:

@staticmethod
def _transpose_col_value_dict(
col_value_dict: Dict[str, Iterable[Any]]
col_value_dict: Mapping[str, Iterable[Any]]
) -> Generator[Dict[str, Any], None, None]:
"""'Transpose' the output of `_get_col_value_dict()`: Yield rows of columns, where each row represent one Document.
Since a generator is returned, this process comes at negligible cost.
Expand Down
Loading