snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-04 03:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify conditions

Browse Source
This commit is contained in:
Mubelotix
2025-08-07 09:28:45 +02:00
parent c385cf985b
commit 74992560b0
4 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/milli/src/search/hybrid.rs
View File

@ -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) => {
auto_embedded = true;
embedding
}
Ok(embedding) => 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,

24
crates/milli/src/search/mod.rs
View File

@ -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(