From f649f58013c969908a2a2753ab91e1689e766b2d Mon Sep 17 00:00:00 2001 From: Louis Dureuil Date: Tue, 19 Mar 2024 15:42:53 +0100 Subject: [PATCH] embed no longer async --- meilisearch/src/routes/indexes/search.rs | 7 +++---- meilisearch/src/routes/multi_search.rs | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/meilisearch/src/routes/indexes/search.rs b/meilisearch/src/routes/indexes/search.rs index 6a430b6a3..8de2be13f 100644 --- a/meilisearch/src/routes/indexes/search.rs +++ b/meilisearch/src/routes/indexes/search.rs @@ -202,7 +202,7 @@ pub async fn search_with_url_query( let index = index_scheduler.index(&index_uid)?; let features = index_scheduler.features(); - let distribution = embed(&mut query, index_scheduler.get_ref(), &index).await?; + let distribution = embed(&mut query, index_scheduler.get_ref(), &index)?; let search_result = tokio::task::spawn_blocking(move || perform_search(&index, query, features, distribution)) @@ -241,7 +241,7 @@ pub async fn search_with_post( let features = index_scheduler.features(); - let distribution = embed(&mut query, index_scheduler.get_ref(), &index).await?; + let distribution = embed(&mut query, index_scheduler.get_ref(), &index)?; let search_result = tokio::task::spawn_blocking(move || perform_search(&index, query, features, distribution)) @@ -260,7 +260,7 @@ pub async fn search_with_post( Ok(HttpResponse::Ok().json(search_result)) } -pub async fn embed( +pub fn embed( query: &mut SearchQuery, index_scheduler: &IndexScheduler, index: &milli::Index, @@ -287,7 +287,6 @@ pub async fn embed( let embeddings = embedder .embed(vec![q.to_owned()]) - .await .map_err(milli::vector::Error::from) .map_err(milli::Error::from)? .pop() diff --git a/meilisearch/src/routes/multi_search.rs b/meilisearch/src/routes/multi_search.rs index 86aa58e70..f54b8ae8f 100644 --- a/meilisearch/src/routes/multi_search.rs +++ b/meilisearch/src/routes/multi_search.rs @@ -75,9 +75,8 @@ pub async fn multi_search_with_post( }) .with_index(query_index)?; - let distribution = embed(&mut query, index_scheduler.get_ref(), &index) - .await - .with_index(query_index)?; + let distribution = + embed(&mut query, index_scheduler.get_ref(), &index).with_index(query_index)?; let search_result = tokio::task::spawn_blocking(move || { perform_search(&index, query, features, distribution)