searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-26 14:54:27 +01:00
Code Issues Releases Wiki Activity

Pass the semantic ratio to milli

Browse Source
This commit is contained in:
ManyTheFish 2023-12-14 11:42:55 +01:00 committed by Louis Dureuil
parent f3f3944469
commit 1b7c164a55
No known key found for this signature in database
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
meilisearch/src/search.rs
View File

@ -113,6 +113,14 @@ impl std::convert::TryFrom<f32> for SemanticRatio {
} }
} }
impl std::ops::Deref for SemanticRatio {
type Target = f32;
fn deref(&self) -> &Self::Target {
&self.0
}
}
impl SearchQuery { impl SearchQuery {
pub fn is_finite_pagination(&self) -> bool { pub fn is_finite_pagination(&self) -> bool {
self.page.or(self.hits_per_page).is_some() self.page.or(self.hits_per_page).is_some()
@ -373,20 +381,30 @@ fn prepare_search<'t>(
} }
if let Some(ref vector) = query.vector { if let Some(ref vector) = query.vector {
match vector { match &query.hybrid {
// If semantic ratio is 0.0, only the query search will impact the search results,
// skip the vector
Some(hybrid) if *hybrid.semantic_ratio == 0.0 => (),
_otherwise => match vector {
VectorQuery::Vector(vector) => { VectorQuery::Vector(vector) => {
search.vector(vector.clone()); search.vector(vector.clone());
} }
VectorQuery::String(_) => { VectorQuery::String(_) => {
panic!("Failed while preparing search; caller did not generate embedding for query") panic!("Failed while preparing search; caller did not generate embedding for query")
} }
},
} }
} }
if let Some(ref query) = query.q { if let Some(ref q) = query.q {
// if !matches!(query.hybrid, query.) { match &query.hybrid {
search.query(query); // If semantic ratio is 1.0, only the vector search will impact the search results,
// } // skip the query
Some(hybrid) if *hybrid.semantic_ratio == 1.0 => (),
_otherwise => {
search.query(q);
}
}
} }
if let Some(ref searchable) = query.attributes_to_search_on { if let Some(ref searchable) = query.attributes_to_search_on {
@ -471,12 +489,12 @@ pub fn perform_search(
let (search, is_finite_pagination, max_total_hits, offset) = let (search, is_finite_pagination, max_total_hits, offset) =
prepare_search(index, &rtxn, &query, features)?; prepare_search(index, &rtxn, &query, features)?;
/// TODO: Change if-cond to query.hybrid.is_some
/// + < 1.0 or remove q
/// + > 0.0 or remove vector
let milli::SearchResult { documents_ids, matching_words, candidates, document_scores, .. } = let milli::SearchResult { documents_ids, matching_words, candidates, document_scores, .. } =
match query.hybrid { match &query.hybrid {
Some(_) => search.execute_hybrid()?, Some(hybrid) => match *hybrid.semantic_ratio {
0.0 | 1.0 => search.execute()?,
ratio => search.execute_hybrid(ratio)?,
},
None => search.execute()?, None => search.execute()?,
}; };