From a06cb1bfd6a21b283f5aeb7cee7ae0c605580b0c Mon Sep 17 00:00:00 2001 From: Louis Dureuil Date: Thu, 3 Jul 2025 10:02:16 +0200 Subject: [PATCH] Remove `Embed::process_embeddings` and have it be an inherent function of the type that uses it --- .../index_documents/extract/extract_vector_points.rs | 8 -------- crates/milli/src/update/new/extract/vectors/mod.rs | 9 ++++----- crates/milli/src/vector/session.rs | 2 -- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/crates/milli/src/update/index_documents/extract/extract_vector_points.rs b/crates/milli/src/update/index_documents/extract/extract_vector_points.rs index 54fcca75f..677ff93c9 100644 --- a/crates/milli/src/update/index_documents/extract/extract_vector_points.rs +++ b/crates/milli/src/update/index_documents/extract/extract_vector_points.rs @@ -1300,12 +1300,4 @@ impl<'doc> OnEmbed<'doc> for WriteGrenadOnEmbed<'_> { crate::Error::UserError(crate::UserError::DocumentEmbeddingError(msg)) } } - - fn process_embeddings( - &mut self, - _metadata: crate::vector::session::Metadata<'doc>, - _embeddings: Vec, - ) { - unimplemented!("unused") - } } diff --git a/crates/milli/src/update/new/extract/vectors/mod.rs b/crates/milli/src/update/new/extract/vectors/mod.rs index c08fadb14..f8e0e7cb5 100644 --- a/crates/milli/src/update/new/extract/vectors/mod.rs +++ b/crates/milli/src/update/new/extract/vectors/mod.rs @@ -452,6 +452,10 @@ impl OnEmbeddingDocumentUpdates<'_, '_> { fn clear_vectors(&self, docid: DocumentId) { self.sender.set_vectors(docid, self.embedder_id, vec![]).unwrap(); } + + fn process_embeddings(&mut self, metadata: Metadata<'_>, embeddings: Vec) { + self.sender.set_vectors(metadata.docid, self.embedder_id, embeddings).unwrap(); + } } impl<'doc> OnEmbed<'doc> for OnEmbeddingDocumentUpdates<'doc, '_> { @@ -469,11 +473,6 @@ impl<'doc> OnEmbed<'doc> for OnEmbeddingDocumentUpdates<'doc, '_> { ) .unwrap(); } - - fn process_embeddings(&mut self, metadata: Metadata<'doc>, embeddings: Vec) { - self.sender.set_vectors(metadata.docid, self.embedder_id, embeddings).unwrap(); - } - fn process_embedding_error( &mut self, error: crate::vector::hf::EmbedError, diff --git a/crates/milli/src/vector/session.rs b/crates/milli/src/vector/session.rs index dd005e993..5f6d68879 100644 --- a/crates/milli/src/vector/session.rs +++ b/crates/milli/src/vector/session.rs @@ -30,8 +30,6 @@ pub trait OnEmbed<'doc> { unused_vectors_distribution: &Self::ErrorMetadata, metadata: &[Metadata<'doc>], ) -> crate::Error; - - fn process_embeddings(&mut self, metadata: Metadata<'doc>, embeddings: Vec); } pub struct EmbedSession<'doc, C, I> {