Skip to content

feat: add install instructions for hnswlib and elastic doc index #1431

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
Apr 21, 2023
Merged

feat: add install instructions for hnswlib and elastic doc index #1431

Show file tree
Hide file tree
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
29 changes: 20 additions & 9 deletions docarray/index/backends/elastic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from collections import defaultdict
from dataclasses import dataclass, field
from typing import (
TYPE_CHECKING,
Any,
Dict,
Generator,
Expand All @@ -21,9 +22,6 @@
)

import numpy as np
from elastic_transport import NodeConfig
from elasticsearch import Elasticsearch
from elasticsearch.helpers import parallel_bulk
from pydantic import parse_obj_as

import docarray.typing
Expand All @@ -32,22 +30,35 @@
from docarray.typing import AnyTensor
from docarray.typing.tensor.abstract_tensor import AbstractTensor
from docarray.typing.tensor.ndarray import NdArray
from docarray.utils._internal.misc import is_tf_available, is_torch_available
from docarray.utils._internal.misc import import_library
from docarray.utils.find import _FindResult, _FindResultBatched

TSchema = TypeVar('TSchema', bound=BaseDoc)
T = TypeVar('T', bound='ElasticDocIndex')

ELASTIC_PY_VEC_TYPES: List[Any] = [list, tuple, np.ndarray, AbstractTensor]

if is_torch_available():
import torch

ELASTIC_PY_VEC_TYPES.append(torch.Tensor)
if TYPE_CHECKING:
from elastic_transport import NodeConfig
from elasticsearch import Elasticsearch
from elasticsearch.helpers import parallel_bulk
else:
elasticsearch = import_library('elasticsearch', raise_error=True)
from elasticsearch import Elasticsearch
from elasticsearch.helpers import parallel_bulk

elastic_transport = import_library('elastic_transport', raise_error=True)
from elastic_transport import NodeConfig

torch = import_library('torch', raise_error=False)
tf = import_library('tensorflow', raise_error=False)

if is_tf_available():
import tensorflow as tf # type: ignore

if torch is not None:
ELASTIC_PY_VEC_TYPES.append(torch.Tensor)

if tf is not None:
from docarray.typing import TensorFlowTensor

ELASTIC_PY_VEC_TYPES.append(tf.Tensor)
Expand Down
2 changes: 1 addition & 1 deletion docarray/index/backends/hnswlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

from docarray.typing import TensorFlowTensor
else:
hnswlib = import_library('hnswlib', raise_error=False)
hnswlib = import_library('hnswlib', raise_error=True)
torch = import_library('torch', raise_error=False)
tf = import_library('tensorflow', raise_error=False)
if tf is not None:
Expand Down
1 change: 1 addition & 0 deletions docarray/utils/_internal/misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
'trimesh': '"docarray[mesh]"',
'hnswlib': '"docarray[hnswlib]"',
'elasticsearch': '"docarray[elasticsearch]"',
'elastic_transport': '"docarray[elasticsearch]"',
'weaviate': '"docarray[weaviate]"',
'qdrant_client': '"docarray[qdrant]"',
'fastapi': '"docarray[web]"',
Expand Down