snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-31 07:56:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename embed_one to embed_search and embed_chunks* to embed_index*

Browse Source
This commit is contained in:
Louis Dureuil
2025-02-20 11:36:42 +01:00
parent 8d2d9066ba
commit 4a2643daa2
11 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/milli/src/vector/hf.rs
View File

@@ -346,7 +346,7 @@ impl Embedder {
Ok(embedding)
}
pub fn embed_chunks(
pub fn embed_index(
&self,
text_chunks: Vec<Vec<String>>,
) -> std::result::Result<Vec<Vec<Embedding>>, EmbedError> {
@@ -378,7 +378,7 @@ impl Embedder {
})
}
pub(crate) fn embed_chunks_ref(&self, texts: &[&str]) -> Result<Vec<Embedding>, EmbedError> {
pub(crate) fn embed_index_ref(&self, texts: &[&str]) -> Result<Vec<Embedding>, EmbedError> {
texts.iter().map(|text| self.embed_one(text)).collect()
}
}

4
crates/milli/src/vector/manual.rs
View File

@@ -30,7 +30,7 @@ impl Embedder {
self.dimensions
}
pub fn embed_chunks(
pub fn embed_index(
&self,
text_chunks: Vec<Vec<String>>,
) -> Result<Vec<Vec<Embedding>>, EmbedError> {
@@ -41,7 +41,7 @@ impl Embedder {
self.distribution
}
pub(crate) fn embed_chunks_ref(&self, texts: &[&str]) -> Result<Vec<Embedding>, EmbedError> {
pub(crate) fn embed_index_ref(&self, texts: &[&str]) -> Result<Vec<Embedding>, EmbedError> {
texts.iter().map(|text| self.embed_one(text)).collect()
}
}

32
crates/milli/src/vector/mod.rs
View File

@@ -628,13 +628,16 @@ impl Embedder {
EmbedderOptions::Rest(options) => {
Self::Rest(rest::Embedder::new(options, rest::ConfigurationSource::User)?)
}
EmbedderOptions::Composite(options) => {
Self::Composite(composite::Embedder::new(options)?)
}
})
}
/// Embed one or multiple texts.
///
/// Each text can be embedded as one or multiple embeddings.
pub fn embed(
fn embed(
&self,
texts: Vec<String>,
deadline: Option<Instant>,
@@ -649,7 +652,7 @@ impl Embedder {
}
#[tracing::instrument(level = "debug", skip_all, target = "search")]
pub fn embed_one(
pub fn embed_search(
&self,
text: String,
deadline: Option<Instant>,
@@ -662,31 +665,32 @@ impl Embedder {
/// Embed multiple chunks of texts.
///
/// Each chunk is composed of one or multiple texts.
pub fn embed_chunks(
pub fn embed_index(
&self,
text_chunks: Vec<Vec<String>>,
threads: &ThreadPoolNoAbort,
) -> std::result::Result<Vec<Vec<Embedding>>, EmbedError> {
match self {
Embedder::HuggingFace(embedder) => embedder.embed_chunks(text_chunks),
Embedder::OpenAi(embedder) => embedder.embed_chunks(text_chunks, threads),
Embedder::Ollama(embedder) => embedder.embed_chunks(text_chunks, threads),
Embedder::UserProvided(embedder) => embedder.embed_chunks(text_chunks),
Embedder::Rest(embedder) => embedder.embed_chunks(text_chunks, threads),
Embedder::HuggingFace(embedder) => embedder.embed_index(text_chunks),
Embedder::OpenAi(embedder) => embedder.embed_index(text_chunks, threads),
Embedder::Ollama(embedder) => embedder.embed_index(text_chunks, threads),
Embedder::UserProvided(embedder) => embedder.embed_index(text_chunks),
Embedder::Rest(embedder) => embedder.embed_index(text_chunks, threads),
}
}
pub fn embed_chunks_ref(
/// Non-owning variant of [`Self::embed_index`].
pub fn embed_index_ref(
&self,
texts: &[&str],
threads: &ThreadPoolNoAbort,
) -> std::result::Result<Vec<Embedding>, EmbedError> {
match self {
Embedder::HuggingFace(embedder) => embedder.embed_chunks_ref(texts),
Embedder::OpenAi(embedder) => embedder.embed_chunks_ref(texts, threads),
Embedder::Ollama(embedder) => embedder.embed_chunks_ref(texts, threads),
Embedder::UserProvided(embedder) => embedder.embed_chunks_ref(texts),
Embedder::Rest(embedder) => embedder.embed_chunks_ref(texts, threads),
Embedder::HuggingFace(embedder) => embedder.embed_index_ref(texts),
Embedder::OpenAi(embedder) => embedder.embed_index_ref(texts, threads),
Embedder::Ollama(embedder) => embedder.embed_index_ref(texts, threads),
Embedder::UserProvided(embedder) => embedder.embed_index_ref(texts),
Embedder::Rest(embedder) => embedder.embed_index_ref(texts, threads),
}
}

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

@@ -113,7 +113,7 @@ impl Embedder {
}
}
pub fn embed_chunks(
pub fn embed_index(
&self,
text_chunks: Vec<Vec<String>>,
threads: &ThreadPoolNoAbort,
@@ -134,7 +134,7 @@ impl Embedder {
}
}
pub(crate) fn embed_chunks_ref(
pub(crate) fn embed_index_ref(
&self,
texts: &[&str],
threads: &ThreadPoolNoAbort,

4
crates/milli/src/vector/openai.rs
View File

@@ -250,7 +250,7 @@ impl Embedder {
Ok(all_embeddings)
}
pub fn embed_chunks(
pub fn embed_index(
&self,
text_chunks: Vec<Vec<String>>,
threads: &ThreadPoolNoAbort,
@@ -271,7 +271,7 @@ impl Embedder {
}
}
pub(crate) fn embed_chunks_ref(
pub(crate) fn embed_index_ref(
&self,
texts: &[&str],
threads: &ThreadPoolNoAbort,

4
crates/milli/src/vector/rest.rs
View File

@@ -184,7 +184,7 @@ impl Embedder {
Ok(embeddings.pop().unwrap())
}
pub fn embed_chunks(
pub fn embed_index(
&self,
text_chunks: Vec<Vec<String>>,
threads: &ThreadPoolNoAbort,
@@ -205,7 +205,7 @@ impl Embedder {
}
}
pub(crate) fn embed_chunks_ref(
pub(crate) fn embed_index_ref(
&self,
texts: &[&str],
threads: &ThreadPoolNoAbort,