Skip to content

Commit fcb0b1a

Browse files
committed
update tests
1 parent 9903f95 commit fcb0b1a

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

meilisearch/index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
from meilisearch.errors import version_error_hint_message
2626
from meilisearch.models.document import Document, DocumentsResults
2727
from meilisearch.models.embedders import (
28+
CompositeEmbedder,
2829
Embedders,
2930
EmbedderType,
3031
HuggingFaceEmbedder,
3132
OllamaEmbedder,
3233
OpenAiEmbedder,
3334
RestEmbedder,
3435
UserProvidedEmbedder,
35-
CompositeEmbedder,
3636
)
3737
from meilisearch.models.index import (
3838
Faceting,

tests/settings/test_settings_embedders.py

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# pylint: disable=redefined-outer-name
22

33
import pytest
4+
45
from meilisearch.models.embedders import (
6+
CompositeEmbedder,
57
HuggingFaceEmbedder,
68
OpenAiEmbedder,
79
UserProvidedEmbedder,
8-
CompositeEmbedder,
910
)
1011

1112

@@ -103,6 +104,7 @@ def test_huggingface_embedder_format(empty_index):
103104
assert embedders.embedders["huggingface"].distribution.mean == 0.5
104105
assert embedders.embedders["huggingface"].distribution.sigma == 0.1
105106
assert embedders.embedders["huggingface"].binary_quantized is False
107+
assert embedders.embedders["huggingface"].pooling is False
106108

107109

108110
def test_ollama_embedder_format(empty_index):
@@ -196,28 +198,36 @@ def test_composite_embedder_format(empty_index):
196198
"""Tests that CompositeEmbedder embedder has the required fields and proper format."""
197199
index = empty_index()
198200

199-
hf_default = HuggingFaceEmbedder().model_dump(by_alias=True, exclude_none=True)
201+
embedder = HuggingFaceEmbedder().model_dump(by_alias=True, exclude_none=True)
200202

201203
# create composite embedder
202204
composite_embedder = {
203-
"default": {
205+
"composite": {
204206
"source": "composite",
205-
"searchEmbedder": hf_default,
206-
"indexingEmbedder": hf_default,
207+
"searchEmbedder": embedder,
208+
"indexingEmbedder": embedder,
207209
}
208210
}
209211

210212
response = index.update_embedders(composite_embedder)
211-
index.wait_for_task(response.task_uid)
213+
update = index.wait_for_task(response.task_uid)
212214
embedders = index.get_embedders()
213-
print(embedders)
215+
assert update.status == "succeeded"
216+
214217
assert embedders.embedders["composite"].source == "composite"
215218

219+
# ensure serialization roundtrips nicely
216220
assert isinstance(embedders.embedders["composite"], CompositeEmbedder)
217221
assert isinstance(embedders.embedders["composite"].search_embedder, HuggingFaceEmbedder)
218222
assert isinstance(embedders.embedders["composite"].indexing_embedder, HuggingFaceEmbedder)
219223

220-
assert not hasattr(embedders.embedders["composite"].search_embedder, "document_template")
221-
assert not hasattr(embedders.embedders["composite"].search_embedder, "document_template_max_bytes")
222-
assert hasattr(embedders.embedders["composite"].indexing_embedder, "document_template")
223-
224+
# ensure search_embedder has no document_template
225+
assert getattr(embedders.embedders["composite"].search_embedder, "document_template") is None
226+
assert (
227+
getattr(
228+
embedders.embedders["composite"].search_embedder,
229+
"document_template_max_bytes",
230+
)
231+
is None
232+
)
233+
assert getattr(embedders.embedders["composite"].indexing_embedder, "document_template")

0 commit comments

Comments
 (0)