mirror of
https://github.com/meilisearch/MeiliSearch
synced 2025-07-03 11:57:07 +02:00
Merge #5371
5371: Composite embedders r=irevoire a=dureuill # Pull Request ## Related issue Fixes #5343 ## What does this PR do? - Implement [public usage](https://www.notion.so/meilisearch/Composite-embedder-usage-14a4b06b651f81859dc3df21e8cd02a0) - Refactor the way we check if a parameter is mandatory/allowed/disallowed for a given source - Take the "nesting context" into account for computer if a parameter is mandatory/allowed/disallowed - Add tests checking all parameters with all sources, and made sure the results didn't change compared with v1.13 ## Dumpless Upgrade - This adds a new value for an existing parameter => compatible without change - This adds new optional parameters => compatible without change Co-authored-by: Louis Dureuil <louis@meilisearch.com>
This commit is contained in:
commit
3fd86e8d76
199 changed files with 5918 additions and 1557 deletions
|
@ -512,6 +512,7 @@ impl EmbeddersAnalytics {
|
|||
EmbedderSource::UserProvided => sources.insert("userProvided".to_string()),
|
||||
EmbedderSource::Ollama => sources.insert("ollama".to_string()),
|
||||
EmbedderSource::Rest => sources.insert("rest".to_string()),
|
||||
EmbedderSource::Composite => sources.insert("composite".to_string()),
|
||||
};
|
||||
}
|
||||
};
|
||||
|
|
|
@ -916,7 +916,7 @@ fn prepare_search<'t>(
|
|||
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(10);
|
||||
|
||||
embedder
|
||||
.embed_one(query.q.clone().unwrap(), Some(deadline))
|
||||
.embed_search(query.q.clone().unwrap(), Some(deadline))
|
||||
.map_err(milli::vector::Error::from)
|
||||
.map_err(milli::Error::from)?
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue