Merge pull request #1315 from sanders41/composit-embedder

Add composit embedder

Author: sanders41

meilisearch_python_sdk/index.py

@@ -27,6 +27,7 @@
     SimilarSearchResults,
 )
 from meilisearch_python_sdk.models.settings import (
+    CompositeEmbedder,
     Embedders,
     Faceting,
     FilterableAttributeFeatures,
@@ -8459,7 +8460,12 @@ def _embedder_json_to_embedders_model(  # pragma: no cover
 
     embedders: dict[
         str,
-        OpenAiEmbedder | HuggingFaceEmbedder | OllamaEmbedder | RestEmbedder | UserProvidedEmbedder,
+        OpenAiEmbedder
+        | HuggingFaceEmbedder
+        | OllamaEmbedder
+        | RestEmbedder
+        | UserProvidedEmbedder
+        | CompositeEmbedder,
     ] = {}
     for k, v in embedder_json.items():
         if v.get("source") == "openAi":
@@ -8470,6 +8476,8 @@ def _embedder_json_to_embedders_model(  # pragma: no cover
             embedders[k] = OllamaEmbedder(**v)
         elif v.get("source") == "rest":
             embedders[k] = RestEmbedder(**v)
+        elif v.get("source") == "composit":
+            embedders[k] = CompositeEmbedder(**v)
         else:
             embedders[k] = UserProvidedEmbedder(**v)
 
@@ -8482,7 +8490,12 @@ def _embedder_json_to_settings_model(  # pragma: no cover
 ) -> (
     dict[
         str,
-        OpenAiEmbedder | HuggingFaceEmbedder | OllamaEmbedder | RestEmbedder | UserProvidedEmbedder,
+        OpenAiEmbedder
+        | HuggingFaceEmbedder
+        | OllamaEmbedder
+        | RestEmbedder
+        | UserProvidedEmbedder
+        | CompositeEmbedder,
     ]
     | None
 ):
@@ -8491,7 +8504,12 @@ def _embedder_json_to_settings_model(  # pragma: no cover
 
     embedders: dict[
         str,
-        OpenAiEmbedder | HuggingFaceEmbedder | OllamaEmbedder | RestEmbedder | UserProvidedEmbedder,
+        OpenAiEmbedder
+        | HuggingFaceEmbedder
+        | OllamaEmbedder
+        | RestEmbedder
+        | UserProvidedEmbedder
+        | CompositeEmbedder,
     ] = {}
     for k, v in embedder_json.items():
         if v.get("source") == "openAi":
@@ -8502,6 +8520,8 @@ def _embedder_json_to_settings_model(  # pragma: no cover
             embedders[k] = OllamaEmbedder(**v)
         elif v.get("source") == "rest":
             embedders[k] = RestEmbedder(**v)
+        elif v.get("source") == "composit":
+            embedders[k] = CompositeEmbedder(**v)
         else:
             embedders[k] = UserProvidedEmbedder(**v)
 

meilisearch_python_sdk/models/settings.py

@@ -106,10 +106,25 @@ class UserProvidedEmbedder(CamelBase):
     binary_quantized: bool | None = None
 
 
+class CompositeEmbedder(CamelBase):
+    source: str = "composite"
+    search_embedder: (
+        OpenAiEmbedder | HuggingFaceEmbedder | OllamaEmbedder | RestEmbedder | UserProvidedEmbedder
+    )
+    indexing_embedder: (
+        OpenAiEmbedder | HuggingFaceEmbedder | OllamaEmbedder | RestEmbedder | UserProvidedEmbedder
+    )
+
+
 class Embedders(CamelBase):
     embedders: dict[
         str,
-        OpenAiEmbedder | HuggingFaceEmbedder | OllamaEmbedder | RestEmbedder | UserProvidedEmbedder,
+        OpenAiEmbedder
+        | HuggingFaceEmbedder
+        | OllamaEmbedder
+        | RestEmbedder
+        | UserProvidedEmbedder
+        | CompositeEmbedder,
     ]
 
 
@@ -162,7 +177,8 @@ class MeilisearchSettings(CamelBase):
             | HuggingFaceEmbedder
             | OllamaEmbedder
             | RestEmbedder
-            | UserProvidedEmbedder,
+            | UserProvidedEmbedder
+            | CompositeEmbedder,
         ]
         | None
     ) = None  # Optional[Embedders] = None

tests/conftest.py

@@ -301,7 +301,7 @@ async def enable_edit_by_function(base_url, ssl_verify):
         base_url=base_url, headers={"Authorization": f"Bearer {MASTER_KEY}"}, verify=ssl_verify
     ) as client:
         await client.patch("/experimental-features", json={"editDocumentsByFunction": True})
-        yield
+    yield
 
 
 @pytest.fixture(scope="session", autouse=True)
@@ -310,7 +310,7 @@ async def enable_network(base_url, ssl_verify):
         base_url=base_url, headers={"Authorization": f"Bearer {MASTER_KEY}"}, verify=ssl_verify
     ) as client:
         await client.patch("/experimental-features", json={"network": True})
-        yield
+    yield
 
 
 @pytest.fixture