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

fix the tests

Browse Source
This commit is contained in:
Tamo
2025-01-07 16:42:37 +01:00
parent a8ef6f08e0
commit 99f5e09a79
4 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/index-scheduler/src/scheduler/snapshots/test.rs/test_settings_update/after_registering_settings_task.snap
View File

@@ -1,13 +1,6 @@
---
<<<<<<< HEAD:crates/index-scheduler/src/scheduler/snapshots/test.rs/test_settings_update/after_registering_settings_task.snap
source: crates/index-scheduler/src/scheduler/test.rs
snapshot_kind: text
||||||| parent of 2e258cec7 (fix some tests):crates/index-scheduler/src/snapshots/lib.rs/test_settings_update/after_registering_settings_task.snap
source: crates/index-scheduler/src/lib.rs
=======
source: crates/index-scheduler/src/lib.rs
snapshot_kind: text
>>>>>>> 2e258cec7 (fix some tests):crates/index-scheduler/src/snapshots/lib.rs/test_settings_update/after_registering_settings_task.snap
---
### Autobatching Enabled = true
### Processing batch None:

7
crates/index-scheduler/src/scheduler/snapshots/test_embedders.rs/import_vectors/after_registering_settings_task_vectors.snap
View File

@@ -1,13 +1,6 @@
---
<<<<<<< HEAD:crates/index-scheduler/src/scheduler/snapshots/test_embedders.rs/import_vectors/after_registering_settings_task_vectors.snap
source: crates/index-scheduler/src/scheduler/test_embedders.rs
snapshot_kind: text
||||||| parent of 2e258cec7 (fix some tests):crates/index-scheduler/src/snapshots/lib.rs/import_vectors/after_registering_settings_task_vectors.snap
source: crates/index-scheduler/src/lib.rs
=======
source: crates/index-scheduler/src/lib.rs
snapshot_kind: text
>>>>>>> 2e258cec7 (fix some tests):crates/index-scheduler/src/snapshots/lib.rs/import_vectors/after_registering_settings_task_vectors.snap
---
### Autobatching Enabled = true
### Processing batch None:

4
crates/index-scheduler/src/scheduler/test.rs
View File

@@ -5,6 +5,7 @@ use meili_snap::{json_string, snapshot};
use meilisearch_types::milli::index::IndexEmbeddingConfig;
use meilisearch_types::milli::update::IndexDocumentsMethod::*;
use meilisearch_types::milli::{self};
use meilisearch_types::settings::SettingEmbeddingSettings;
use meilisearch_types::tasks::{IndexSwap, KindWithContent};
use roaring::RoaringBitmap;
@@ -647,7 +648,8 @@ fn test_settings_update() {
response: Setting::Set(serde_json::json!("{{embedding}}")),
..Default::default()
};
embedders.insert(S("default"), Setting::Set(embedding_settings));
embedders
.insert(S("default"), SettingEmbeddingSettings { inner: Setting::Set(embedding_settings) });
new_settings.embedders = Setting::Set(embedders);
index_scheduler

30
crates/index-scheduler/src/scheduler/test_embedders.rs
View File

@@ -7,7 +7,7 @@ use meilisearch_types::milli::index::IndexEmbeddingConfig;
use meilisearch_types::milli::update::Setting;
use meilisearch_types::milli::vector::settings::EmbeddingSettings;
use meilisearch_types::milli::{self, obkv_to_json};
use meilisearch_types::settings::{Settings, Unchecked};
use meilisearch_types::settings::{SettingEmbeddingSettings, Settings, Unchecked};
use meilisearch_types::tasks::KindWithContent;
use milli::update::IndexDocumentsMethod::*;
@@ -30,7 +30,10 @@ fn import_vectors() {
response: Setting::Set(serde_json::json!("{{embedding}}")),
..Default::default()
};
embedders.insert(S("A_fakerest"), Setting::Set(embedding_settings));
embedders.insert(
S("A_fakerest"),
SettingEmbeddingSettings { inner: Setting::Set(embedding_settings) },
);
let embedding_settings = milli::vector::settings::EmbeddingSettings {
source: Setting::Set(milli::vector::settings::EmbedderSource::HuggingFace),
@@ -39,7 +42,10 @@ fn import_vectors() {
document_template: Setting::Set(S("{{doc.doggo}} the {{doc.breed}} best doggo")),
..Default::default()
};
embedders.insert(S("B_small_hf"), Setting::Set(embedding_settings));
embedders.insert(
S("B_small_hf"),
SettingEmbeddingSettings { inner: Setting::Set(embedding_settings) },
);
new_settings.embedders = Setting::Set(embedders);
@@ -356,13 +362,13 @@ fn import_vectors_first_and_embedder_later() {
let setting = meilisearch_types::settings::Settings::<Unchecked> {
embedders: Setting::Set(maplit::btreemap! {
S("my_doggo_embedder") => Setting::Set(EmbeddingSettings {
S("my_doggo_embedder") => SettingEmbeddingSettings { inner: Setting::Set(EmbeddingSettings {
source: Setting::Set(milli::vector::settings::EmbedderSource::HuggingFace),
model: Setting::Set(S("sentence-transformers/all-MiniLM-L6-v2")),
revision: Setting::Set(S("e4ce9877abf3edfe10b0d82785e83bdcb973e22e")),
document_template: Setting::Set(S("{{doc.doggo}}")),
..Default::default()
})
}) }
}),
..Default::default()
};
@@ -511,11 +517,11 @@ fn delete_document_containing_vector() {
let setting = meilisearch_types::settings::Settings::<Unchecked> {
embedders: Setting::Set(maplit::btreemap! {
S("manual") => Setting::Set(EmbeddingSettings {
S("manual") => SettingEmbeddingSettings { inner: Setting::Set(EmbeddingSettings {
source: Setting::Set(milli::vector::settings::EmbedderSource::UserProvided),
dimensions: Setting::Set(3),
..Default::default()
})
}) }
}),
..Default::default()
};
@@ -677,18 +683,18 @@ fn delete_embedder_with_user_provided_vectors() {
let setting = meilisearch_types::settings::Settings::<Unchecked> {
embedders: Setting::Set(maplit::btreemap! {
S("manual") => Setting::Set(EmbeddingSettings {
S("manual") => SettingEmbeddingSettings { inner: Setting::Set(EmbeddingSettings {
source: Setting::Set(milli::vector::settings::EmbedderSource::UserProvided),
dimensions: Setting::Set(3),
..Default::default()
}),
S("my_doggo_embedder") => Setting::Set(EmbeddingSettings {
}) },
S("my_doggo_embedder") => SettingEmbeddingSettings { inner: Setting::Set(EmbeddingSettings {
source: Setting::Set(milli::vector::settings::EmbedderSource::HuggingFace),
model: Setting::Set(S("sentence-transformers/all-MiniLM-L6-v2")),
revision: Setting::Set(S("e4ce9877abf3edfe10b0d82785e83bdcb973e22e")),
document_template: Setting::Set(S("{{doc.doggo}}")),
..Default::default()
}),
}) },
}),
..Default::default()
};
@@ -764,7 +770,7 @@ fn delete_embedder_with_user_provided_vectors() {
{
let setting = meilisearch_types::settings::Settings::<Unchecked> {
embedders: Setting::Set(maplit::btreemap! {
S("manual") => Setting::Reset,
S("manual") => SettingEmbeddingSettings { inner: Setting::Reset },
}),
..Default::default()
};