searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-02-03 09:03:47 +01:00
Code Issues Releases Wiki Activity

Merge #5257

Browse Source 
5257: Fix ollama r=Kerollmops a=dureuill

Fix oversight in ollama embedder 

WIP Integration tests are on branch `ollama-integration-test` and will be added as a future PR.

Co-authored-by: Louis Dureuil <louis@meilisearch.com>
This commit is contained in:
meili-bors[bot] 2025-01-22 15:36:15 +00:00 committed by GitHub
commit b15de68831
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/milli/src/vector/ollama.rs
View File

@ -45,11 +45,6 @@ impl EmbedderOptions {
// **warning**: do not swap these two `if`s, as the second one is always true when the first one is. // **warning**: do not swap these two `if`s, as the second one is always true when the first one is.
let (request, response) = if url.ends_with("/api/embeddings") { let (request, response) = if url.ends_with("/api/embeddings") {
(
serde_json::json!({"model": model, "input": [super::rest::REQUEST_PLACEHOLDER, super::rest::REPEAT_PLACEHOLDER]}),
serde_json::json!({"embeddings": [super::rest::RESPONSE_PLACEHOLDER, super::rest::REPEAT_PLACEHOLDER]}),
)
} else if url.ends_with("/api/embed") {
( (
serde_json::json!({ serde_json::json!({
"model": model, "model": model,
@ -59,6 +54,11 @@ impl EmbedderOptions {
"embedding": super::rest::RESPONSE_PLACEHOLDER, "embedding": super::rest::RESPONSE_PLACEHOLDER,
}), }),
) )
} else if url.ends_with("/api/embed") {
(
serde_json::json!({"model": model, "input": [super::rest::REQUEST_PLACEHOLDER, super::rest::REPEAT_PLACEHOLDER]}),
serde_json::json!({"embeddings": [super::rest::RESPONSE_PLACEHOLDER, super::rest::REPEAT_PLACEHOLDER]}),
)
} else { } else {
return Err(NewEmbedderError::ollama_unsupported_url(url)); return Err(NewEmbedderError::ollama_unsupported_url(url));
}; };