Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from haystack.utils import Secret, deserialize_secrets_inplace
from haystack.utils.hf import HFModelType, check_valid_model, deserialize_hf_model_kwargs, serialize_hf_model_kwargs
from huggingface_hub import hf_hub_download
from sentence_transformers.models import Pooling as SentenceTransformerPoolingLayer
from tqdm import tqdm
from transformers import AutoTokenizer
from transformers.modeling_outputs import BaseModelOutput
Expand All @@ -28,6 +27,15 @@
from .pooling import OptimumEmbedderPooling
from .quantization import OptimumEmbedderQuantizationConfig

# for sentence-transformers Pooling, we use the new module path if available. It also ships correct types
# we also keep compatibility with older versions of sentence-transformers
try:
from sentence_transformers.sentence_transformer.modules import Pooling as SentenceTransformerPoolingLayer
except ImportError:
from sentence_transformers.models import ( # type: ignore[import-not-found, no-redef]
Pooling as SentenceTransformerPoolingLayer,
)


@dataclass
class _EmbedderParams:
Expand Down
Loading