Simplify conditions

crates/meilisearch/src/search/mod.rs

@@ -1020,7 +1020,7 @@ pub fn prepare_search<'t>(
                         .map_err(milli::Error::from)?
                 }
             };
-            search.semantic_auto_embedded(
+            search.semantic(
                 embedder_name.clone(),
                 embedder.clone(),
                 *quantized,

crates/meilisearch/tests/search/hybrid.rs

@@ -201,6 +201,10 @@ async fn simple_search() {
         }
       ],
       "query": "Captain",
+      "queryVector": [
+        1.0,
+        1.0
+      ],
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
@@ -272,6 +276,10 @@ async fn simple_search() {
         }
       ],
       "query": "Captain",
+      "queryVector": [
+        1.0,
+        1.0
+      ],
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
@@ -343,6 +351,10 @@ async fn simple_search() {
         }
       ],
       "query": "Captain",
+      "queryVector": [
+        1.0,
+        1.0
+      ],
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,

crates/milli/src/search/hybrid.rs

@@ -234,7 +234,6 @@ impl Search<'_> {
         // no embedder, no semantic search
         let Some(SemanticSearch {
             vector,
-            mut auto_embedded,
             embedder_name,
             embedder,
             quantized,
@@ -262,10 +261,7 @@ impl Search<'_> {
                 let deadline = std::time::Instant::now() + std::time::Duration::from_secs(3);
 
                 match embedder.embed_search(query, Some(deadline)) {
-                    Ok(embedding) => {
+                    Ok(embedding) => embedding,
-                        auto_embedded = true;
-                        embedding
-                    }
                     Err(error) => {
                         tracing::error!(error=%error, "Embedding failed");
                         return Ok(return_keyword_results(
@@ -280,7 +276,6 @@ impl Search<'_> {
 
         search.semantic = Some(SemanticSearch {
             vector: Some(vector_query.clone()),
-            auto_embedded,
             embedder_name,
             embedder,
             quantized,

crates/milli/src/search/mod.rs

@@ -33,7 +33,6 @@ pub mod similar;
 #[derive(Debug, Clone)]
 pub struct SemanticSearch {
     vector: Option<Vec<f32>>,
-    auto_embedded: bool,
     media: Option<serde_json::Value>,
     embedder_name: String,
     embedder: Arc<Embedder>,
@@ -105,26 +104,6 @@ impl<'a> Search<'a> {
     ) -> &mut Search<'a> {
         self.semantic = Some(SemanticSearch {
             embedder_name,
-            auto_embedded: false,
-            embedder,
-            quantized,
-            vector,
-            media,
-        });
-        self
-    }
-
-    pub fn semantic_auto_embedded(
-        &mut self,
-        embedder_name: String,
-        embedder: Arc<Embedder>,
-        quantized: bool,
-        vector: Option<Embedding>,
-        media: Option<serde_json::Value>,
-    ) -> &mut Search<'a> {
-        self.semantic = Some(SemanticSearch {
-            embedder_name,
-            auto_embedded: true,
             embedder,
             quantized,
             vector,
@@ -278,13 +257,12 @@ impl<'a> Search<'a> {
         } = match self.semantic.as_ref() {
             Some(SemanticSearch {
                 vector: Some(vector),
-                auto_embedded,
                 embedder_name,
                 embedder,
                 quantized,
                 media: _,
             }) => {
-                if *auto_embedded && self.retrieve_vectors {
+                if self.retrieve_vectors {
                     query_vector = Some(vector.clone());
                 }
                 execute_vector_search(