Move embedder stats out of progress

crates/meilisearch/src/lib.rs

@@ -37,6 +37,7 @@ use index_scheduler::{IndexScheduler, IndexSchedulerOptions};
 use meilisearch_auth::{open_auth_store_env, AuthController};
 use meilisearch_types::milli::constants::VERSION_MAJOR;
 use meilisearch_types::milli::documents::{DocumentsBatchBuilder, DocumentsBatchReader};
+use meilisearch_types::milli::progress::EmbedderStats;
 use meilisearch_types::milli::update::{
     default_thread_pool_and_threads, IndexDocumentsConfig, IndexDocumentsMethod, IndexerConfig,
 };
@@ -542,8 +543,9 @@ fn import_dump(
         tracing::info!("Importing the settings.");
         let settings = index_reader.settings()?;
         apply_settings_to_builder(&settings, &mut builder);
+        let embedder_stats: Arc<EmbedderStats> = Default::default(); // FIXME: this isn't linked to anything
         builder
-            .execute(|indexing_step| tracing::debug!("update: {:?}", indexing_step), || false, None)?;
+            .execute(|indexing_step| tracing::debug!("update: {:?}", indexing_step), || false, embedder_stats.clone())?;
 
         // 4.3 Import the documents.
         // 4.3.1 We need to recreate the grenad+obkv format accepted by the index.
@@ -574,7 +576,7 @@ fn import_dump(
             },
             |indexing_step| tracing::trace!("update: {:?}", indexing_step),
             || false,
-            None,
+            embedder_stats,
         )?;
 
         let builder = builder.with_embedders(embedders);

crates/meilisearch/tests/vector/rest.rs

@@ -4,6 +4,8 @@ use meili_snap::{json_string, snapshot};
 use reqwest::IntoUrl;
 use wiremock::matchers::{method, path};
 use wiremock::{Mock, MockServer, Request, ResponseTemplate};
+use std::thread::sleep;
+use std::time::Duration;
 
 use crate::common::Value;
 use crate::json;
@@ -305,6 +307,7 @@ async fn create_mock_raw() -> (MockServer, Value) {
     Mock::given(method("POST"))
         .and(path("/"))
         .respond_with(move |req: &Request| {
+            println!("Sent!");
             let req: String = match req.body_json() {
                 Ok(req) => req,
                 Err(error) => {
@@ -2111,3 +2114,40 @@ async fn searchable_reindex() {
     }
     "###);
 }
+
+
+#[actix_rt::test]
+async fn observability() {
+    let (_mock, setting) = create_mock_raw().await;
+    let server = get_server_vector().await;
+    let index = server.index("doggo");
+
+    let (response, code) = index
+        .update_settings(json!({
+          "embedders": {
+              "rest": setting,
+          },
+        }))
+        .await;
+    snapshot!(code, @"202 Accepted");
+    let task = server.wait_task(response.uid()).await;
+    snapshot!(task["status"], @r###""succeeded""###);
+    let documents = json!([
+      {"id": 0, "name": "kefir"},
+      {"id": 1, "name": "echo", "_vectors": { "rest": [1, 1, 1] }},
+      {"id": 2, "name": "intel"},
+      {"id": 3, "name": "missing"}, // Stuff that doesn't exist
+      {"id": 4, "name": "invalid"},
+      {"id": 5, "name": "foobar"},
+    ]);
+    let (value, code) = index.add_documents(documents, None).await;
+    snapshot!(code, @"202 Accepted");
+
+    let batches = index.filtered_batches(&[], &[], &[]).await;
+    println!("Batches: {batches:?}");
+
+    let task = index.wait_task(value.uid()).await;
+    let batches = index.filtered_batches(&[], &[], &[]).await;
+    println!("Batches: {batches:?}");
+
+}