Skip to content

Commit 6562eba

Browse files
committed
Avoid repeating embedder type
1 parent fd16a6a commit 6562eba

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

meilisearch/index.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
from meilisearch.models.document import Document, DocumentsResults
2727
from meilisearch.models.embedders import (
2828
Embedders,
29+
EmbedderType,
2930
HuggingFaceEmbedder,
3031
OllamaEmbedder,
3132
OpenAiEmbedder,
@@ -966,7 +967,7 @@ def get_settings(self) -> Dict[str, Any]:
966967
)
967968

968969
if settings.get("embedders"):
969-
embedders: dict[str, OpenAiEmbedder | HuggingFaceEmbedder | UserProvidedEmbedder] = {}
970+
embedders: dict[str, EmbedderType] = {}
970971
for k, v in settings["embedders"].items():
971972
if v.get("source") == "openAi":
972973
embedders[k] = OpenAiEmbedder(**v)
@@ -1913,16 +1914,7 @@ def get_embedders(self) -> Embedders | None:
19131914
if not response:
19141915
return None
19151916

1916-
embedders: dict[
1917-
str,
1918-
Union[
1919-
OpenAiEmbedder,
1920-
HuggingFaceEmbedder,
1921-
OllamaEmbedder,
1922-
RestEmbedder,
1923-
UserProvidedEmbedder,
1924-
],
1925-
] = {}
1917+
embedders: dict[str, EmbedderType] = {}
19261918
for k, v in response.items():
19271919
source = v.get("source")
19281920
if source == "openAi":

meilisearch/models/embedders.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from __future__ import annotations
2+
23
from typing import Any, Dict, Optional, Union
4+
35
from camel_converter.pydantic_base import CamelBase
46

57

@@ -189,6 +191,16 @@ class UserProvidedEmbedder(CamelBase):
189191
binary_quantized: Optional[bool] = None
190192

191193

194+
# Type alias for the embedder union type
195+
EmbedderType = Union[
196+
OpenAiEmbedder,
197+
HuggingFaceEmbedder,
198+
OllamaEmbedder,
199+
RestEmbedder,
200+
UserProvidedEmbedder,
201+
]
202+
203+
192204
class Embedders(CamelBase):
193205
"""Container for embedder configurations.
194206
@@ -198,9 +210,4 @@ class Embedders(CamelBase):
198210
Dictionary of embedder configurations, where keys are embedder names
199211
"""
200212

201-
embedders: Dict[
202-
str,
203-
Union[
204-
OpenAiEmbedder, HuggingFaceEmbedder, OllamaEmbedder, RestEmbedder, UserProvidedEmbedder
205-
],
206-
]
213+
embedders: Dict[str, EmbedderType]

0 commit comments

Comments
 (0)