small fix

- Add MEILISEARCH_PERSONALIZED_SEARCH_REQUESTS metric to track personalized searches
- Increment metric directly in search analytics when personalization is used
- Metric automatically exposed in /metrics endpoint for monitoring

.github/dependabot.yml

@@ -7,5 +7,6 @@ updates:
     schedule:
       interval: "monthly"
     labels:
+      - 'skip changelog'
       - 'dependencies'
     rebase-strategy: disabled

.github/release-draft-template.yml

@@ -0,0 +1,33 @@
+name-template: 'v$RESOLVED_VERSION'
+tag-template: 'v$RESOLVED_VERSION'
+exclude-labels:
+  - 'skip changelog'
+version-resolver:
+  minor:
+    labels:
+      - 'enhancement'
+  default: patch
+categories:
+  - title: '⚠️ Breaking changes'
+    label: 'breaking-change'
+  - title: '🚀 Enhancements'
+    label: 'enhancement'
+  - title: '🐛 Bug Fixes'
+    label: 'bug'
+  - title: '🔒 Security'
+    label: 'security'
+  - title: '⚙️ Maintenance/misc'
+    label:
+      - 'maintenance'
+      - 'documentation'
+template: |
+  $CHANGES
+
+  ❤️  Huge thanks to our contributors: $CONTRIBUTORS.
+no-changes-template: 'Changes are coming soon 😎'
+sort-direction: 'ascending'
+replacers:
+  - search: '/(?:and )?@dependabot-preview(?:\[bot\])?,?/g'
+    replace: ''
+  - search: '/(?:and )?@dependabot(?:\[bot\])?,?/g'
+    replace: ''

.github/workflows/publish-docker-images.yml

@@ -65,7 +65,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Install cosign
-        uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # tag=v3.10.0
+        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # tag=v3.9.2
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

.github/workflows/publish-release-assets.yml

@@ -11,7 +11,7 @@ jobs:
   check-version:
     name: Check the version validity
     runs-on: ubuntu-latest
-    # No need to check the version for dry run (cron or workflow_dispatch)
+    # No need to check the version for dry run (cron)
     steps:
       - uses: actions/checkout@v5
       # Check if the tag has the v<nmumber>.<number>.<number> format.
@@ -48,7 +48,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@1.89
       - name: Build
         run: cargo build --release --locked
-      # No need to upload binaries for dry run (cron or workflow_dispatch)
+      # No need to upload binaries for dry run (cron)
       - name: Upload binaries to release
         if: github.event_name == 'release'
         uses: svenstaro/upload-release-action@2.11.2
@@ -78,7 +78,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@1.89
       - name: Build
         run: cargo build --release --locked
-      # No need to upload binaries for dry run (cron or workflow_dispatch)
+      # No need to upload binaries for dry run (cron)
       - name: Upload binaries to release
         if: github.event_name == 'release'
         uses: svenstaro/upload-release-action@2.11.2
@@ -111,7 +111,7 @@ jobs:
           command: build
           args: --release --target ${{ matrix.target }}
       - name: Upload the binary to release
-        # No need to upload binaries for dry run (cron or workflow_dispatch)
+        # No need to upload binaries for dry run (cron)
         if: github.event_name == 'release'
         uses: svenstaro/upload-release-action@2.11.2
         with:
@@ -176,7 +176,7 @@ jobs:
       - name: List target output files
         run: ls -lR ./target
       - name: Upload the binary to release
-        # No need to upload binaries for dry run (cron or workflow_dispatch)
+        # No need to upload binaries for dry run (cron)
         if: github.event_name == 'release'
         uses: svenstaro/upload-release-action@2.11.2
         with:
@@ -187,7 +187,6 @@ jobs:
 
   publish-openapi-file:
     name: Publish OpenAPI file
-    needs: check-version
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -202,7 +201,7 @@ jobs:
           cd crates/openapi-generator
           cargo run --release -- --pretty --output ../../meilisearch.json
       - name: Upload OpenAPI to Release
-        # No need to upload for dry run (cron or workflow_dispatch)
+        # No need to upload for dry run (cron)
         if: github.event_name == 'release'
         uses: svenstaro/upload-release-action@2.11.2
         with:

.github/workflows/release-drafter.yml

@@ -0,0 +1,20 @@
+name: Release Drafter
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v6
+        with:
+          config-name: release-draft-template.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_DRAFTER_TOKEN }}

.github/workflows/sdks-tests.yml

@@ -50,7 +50,7 @@ jobs:
         with:
           repository: meilisearch/meilisearch-dotnet
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: "8.0.x"
       - name: Install dependencies
@@ -100,7 +100,7 @@ jobs:
           - '7700:7700'
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           go-version: stable
       - uses: actions/checkout@v5
@@ -135,13 +135,13 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v5
         with:
-          java-version: 17
-          distribution: 'temurin'
+          java-version: 8
+          distribution: 'zulu'
           cache: gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build and run unit and integration tests
-        run: ./gradlew build integrationTest --info
+        run: ./gradlew build integrationTest
 
   meilisearch-js-tests:
     needs: define-docker-image
@@ -160,7 +160,7 @@ jobs:
         with:
           repository: meilisearch/meilisearch-js
       - name: Setup node
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           cache: 'yarn'
       - name: Install dependencies
@@ -224,7 +224,7 @@ jobs:
         with:
           repository: meilisearch/meilisearch-python
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
       - name: Install pipenv
         uses: dschep/install-pipenv-action@v1
       - name: Install dependencies
@@ -318,7 +318,7 @@ jobs:
         with:
           repository: meilisearch/meilisearch-js-plugins
       - name: Setup node
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           cache: yarn
       - name: Install dependencies

Cargo.lock

@@ -453,9 +453,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "arroy"
-version = "0.6.4-nested-rtxns"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb8b6b34d9d83e3b837cb7f72a439dbd2293b102393c084af5e5b097212e1532"
+checksum = "8578a72223dfa13dfd9fc144d15260d134361789ebdea9b16e85a511edc73c7d"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -589,7 +589,7 @@ source = "git+https://github.com/meilisearch/bbqueue#cbb87cc707b5af415ef203bdaf2
 
 [[package]]
 name = "benchmarks"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "anyhow",
  "bumpalo",
@@ -799,7 +799,7 @@ dependencies = [
 
 [[package]]
 name = "build-info"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "anyhow",
  "time",
@@ -1075,9 +1075,9 @@ dependencies = [
 
 [[package]]
 name = "cellulite"
-version = "0.3.1-nested-rtxns-2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22d721963ead1a144f10cb8b53dc9469e760723b069123c7c7bc675c7354270"
+checksum = "71a41aa2cd021bc3f23d97cc1e645848ca8c279fc757d1570ba7fe7ddc021290"
 dependencies = [
  "crossbeam",
  "geo",
@@ -1092,7 +1092,7 @@ dependencies = [
  "steppe",
  "thiserror 2.0.16",
  "thread_local",
- "zerometry",
+ "zerometry 0.3.0",
 ]
 
 [[package]]
@@ -1236,6 +1236,21 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
+[[package]]
+name = "cohere-rust"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b553b385b0f2562138baea705b5707335314f8e91a58e7d1a03c3a6c332423"
+dependencies = [
+ "bytes",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "strum_macros 0.26.4",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
 [[package]]
 name = "color-spantrace"
 version = "0.3.0"
@@ -1829,7 +1844,7 @@ dependencies = [
 
 [[package]]
 name = "dump"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "anyhow",
  "big_s",
@@ -2072,7 +2087,7 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "file-store"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "tempfile",
  "thiserror 2.0.16",
@@ -2094,7 +2109,7 @@ dependencies = [
 
 [[package]]
 name = "filter-parser"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "insta",
  "levenshtein_automata",
@@ -2122,7 +2137,7 @@ dependencies = [
 
 [[package]]
 name = "flatten-serde-json"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "criterion",
  "serde_json",
@@ -2279,7 +2294,7 @@ dependencies = [
 
 [[package]]
 name = "fuzzers"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "arbitrary",
  "bumpalo",
@@ -2577,6 +2592,7 @@ dependencies = [
  "num-traits",
  "robust",
  "rstar",
+ "spade",
 ]
 
 [[package]]
@@ -2587,6 +2603,7 @@ checksum = "75a4dcd69d35b2c87a7c83bce9af69fd65c9d68d3833a0ded568983928f3fc99"
 dependencies = [
  "approx",
  "num-traits",
+ "rayon",
  "rstar",
  "serde",
 ]
@@ -2758,9 +2775,9 @@ dependencies = [
 
 [[package]]
 name = "hannoy"
-version = "0.0.9-nested-rtxns-2"
+version = "0.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06eda090938d9dcd568c8c2a5de383047ed9191578ebf4a342d2975d16e621f2"
+checksum = "0dba13a271c49a119a97862ebf0a74131d879832868400d9fcd937b790058fdd"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -2838,9 +2855,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "heed"
-version = "0.22.1-nested-rtxns"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ff115ba5712b1f1fc7617b195f5c2f139e29c397ff79da040cd19db75ccc240"
+checksum = "6a56c94661ddfb51aa9cdfbf102cfcc340aa69267f95ebccc4af08d7c530d393"
 dependencies = [
  "bitflags 2.9.4",
  "byteorder",
@@ -2850,6 +2867,7 @@ dependencies = [
  "lmdb-master-sys",
  "once_cell",
  "page_size",
+ "serde",
  "synchronoise",
  "url",
 ]
@@ -3057,6 +3075,7 @@ dependencies = [
  "i_key_sort",
  "i_shape",
  "i_tree",
+ "rayon",
 ]
 
 [[package]]
@@ -3233,7 +3252,7 @@ dependencies = [
 
 [[package]]
 name = "index-scheduler"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "anyhow",
  "backoff",
@@ -3487,7 +3506,7 @@ dependencies = [
 
 [[package]]
 name = "json-depth-checker"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "criterion",
  "serde_json",
@@ -3708,7 +3727,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "strum",
- "strum_macros",
+ "strum_macros 0.27.2",
  "unicode-blocks",
  "unicode-normalization",
  "unicode-segmentation",
@@ -3888,9 +3907,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "lmdb-master-sys"
-version = "0.2.6-nested-rtxns"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ff85130e3c994b36877045fbbb138d521dea7197bfc19dc3d5d95101a8e20a"
+checksum = "864808e0b19fb6dd3b70ba94ee671b82fce17554cf80aeb0a155c65bb08027df"
 dependencies = [
  "cc",
  "doxygen-rs",
@@ -3996,7 +4015,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 
 [[package]]
 name = "meili-snap"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "insta",
  "md5",
@@ -4007,7 +4026,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "actix-cors",
  "actix-http",
@@ -4026,6 +4045,7 @@ dependencies = [
  "bytes",
  "cargo_toml",
  "clap",
+ "cohere-rust",
  "crossbeam-channel",
  "deserr",
  "dump",
@@ -4104,7 +4124,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-auth"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "base64 0.22.1",
  "enum-iterator",
@@ -4123,7 +4143,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-types"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -4158,7 +4178,7 @@ dependencies = [
 
 [[package]]
 name = "meilitool"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -4192,7 +4212,7 @@ dependencies = [
 
 [[package]]
 name = "milli"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "allocator-api2 0.3.1",
  "arroy",
@@ -4271,7 +4291,7 @@ dependencies = [
  "url",
  "utoipa",
  "uuid",
- "zerometry",
+ "zerometry 0.1.0",
 ]
 
 [[package]]
@@ -4773,7 +4793,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "permissive-json-pointer"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "big_s",
  "serde_json",
@@ -6141,6 +6161,18 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "spade"
+version = "2.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb313e1c8afee5b5647e00ee0fe6855e3d529eb863a0fdae1d60006c4d1e9990"
+dependencies = [
+ "hashbrown 0.15.5",
+ "num-traits",
+ "robust",
+ "smallvec",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -6219,7 +6251,20 @@ version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.27.2",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -7820,7 +7865,7 @@ dependencies = [
 
 [[package]]
 name = "xtask"
-version = "1.24.0"
+version = "1.22.0"
 dependencies = [
  "anyhow",
  "build-info",
@@ -7967,6 +8012,18 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "zerometry"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "681f08f3f4ef27d3021a128eb6d8df1cd781e4c9c797c3971c1f85316374f977"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "geo",
+ "geo-types",
+]
+
 [[package]]
 name = "zerometry"
 version = "0.3.0"

Cargo.toml

@@ -23,7 +23,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.24.0"
+version = "1.22.0"
 authors = [
     "Quentin de Quelen <quentin@dequelen.me>",
     "Clément Renault <clement@meilisearch.com>",

Dockerfile

@@ -1,5 +1,5 @@
 # Compile
-FROM    rust:1.89-alpine3.22 AS compiler
+FROM    rust:1.89-alpine3.20 AS compiler
 
 RUN     apk add -q --no-cache build-base openssl-dev
 
@@ -20,7 +20,7 @@ RUN     set -eux; \
         cargo build --release -p meilisearch -p meilitool
 
 # Run
-FROM    alpine:3.22
+FROM    alpine:3.20
 LABEL   org.opencontainers.image.source="https://github.com/meilisearch/meilisearch"
 
 ENV     MEILI_HTTP_ADDR 0.0.0.0:7700

LICENSE

@@ -1,9 +1,29 @@
-# License
+MIT License
 
 Copyright (c) 2019-2025 Meili SAS
 
-Part of this work fall under the Meilisearch Enterprise Edition (EE) and are licensed under the Business Source License 1.1, please refer to [LICENSE-EE](./LICENSE-EE) for details.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The other parts of this work are licensed under the [MIT license](./LICENSE-MIT).
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-`SPDX-License-Identifier: MIT AND BUSL-1.1`
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
+🔒 Meilisearch Enterprise Edition (EE)
+
+Certain parts of this codebase are not licensed under the MIT license and governed by the Business Source License 1.1.
+
+See the LICENSE-EE file for details.

LICENSE-MIT

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019-2025 Meili SAS
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -121,7 +121,7 @@ If you want to know more about the kind of data we collect and what we use it fo
 
 Meilisearch is a search engine created by [Meili](https://www.meilisearch.com/careers), a software development company headquartered in France and with team members all over the world. Want to know more about us? [Check out our blog!](https://blog.meilisearch.com/?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=contact)
 
-🗞 [Subscribe to our newsletter](https://share-eu1.hsforms.com/1LN5N0x_GQgq7ss7tXmSykwfg3aq) if you don't want to miss any updates! We promise we won't clutter your mailbox: we only send one edition every two months.
+🗞 [Subscribe to our newsletter](https://meilisearch.us2.list-manage.com/subscribe?u=27870f7b71c908a8b359599fb&id=79582d828e) if you don't want to miss any updates! We promise we won't clutter your mailbox: we only send one edition every two months.
 
 💌 Want to make a suggestion or give feedback? Here are some of the channels where you can reach us:
 

crates/dump/src/lib.rs

@@ -158,9 +158,6 @@ pub enum KindDump {
     UpgradeDatabase {
         from: (u32, u32, u32),
     },
-    IndexCompaction {
-        index_uid: String,
-    },
 }
 
 impl From<Task> for TaskDump {
@@ -243,9 +240,6 @@ impl From<KindWithContent> for KindDump {
             KindWithContent::UpgradeDatabase { from: version } => {
                 KindDump::UpgradeDatabase { from: version }
             }
-            KindWithContent::IndexCompaction { index_uid } => {
-                KindDump::IndexCompaction { index_uid }
-            }
         }
     }
 }

crates/index-scheduler/src/dump.rs

@@ -234,9 +234,6 @@ impl<'a> Dump<'a> {
                     }
                 }
                 KindDump::UpgradeDatabase { from } => KindWithContent::UpgradeDatabase { from },
-                KindDump::IndexCompaction { index_uid } => {
-                    KindWithContent::IndexCompaction { index_uid }
-                }
             },
         };
 

crates/index-scheduler/src/features.rs

@@ -25,6 +25,7 @@ pub(crate) struct FeatureData {
     persisted: Database<Str, SerdeJson<RuntimeTogglableFeatures>>,
     runtime: Arc<RwLock<RuntimeTogglableFeatures>>,
     network: Arc<RwLock<Network>>,
+    experimental_personalization_api_key: Option<String>,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -188,7 +189,12 @@ impl FeatureData {
 
         let persisted_features: RuntimeTogglableFeatures =
             runtime_features_db.get(wtxn, db_keys::EXPERIMENTAL_FEATURES)?.unwrap_or_default();
-        let InstanceTogglableFeatures { metrics, logs_route, contains_filter } = instance_features;
+        let InstanceTogglableFeatures {
+            metrics,
+            logs_route,
+            contains_filter,
+            experimental_personalization_api_key,
+        } = instance_features;
         let runtime = Arc::new(RwLock::new(RuntimeTogglableFeatures {
             metrics: metrics || persisted_features.metrics,
             logs_route: logs_route || persisted_features.logs_route,
@@ -204,6 +210,7 @@ impl FeatureData {
             persisted: runtime_features_db,
             runtime,
             network: Arc::new(RwLock::new(network)),
+            experimental_personalization_api_key,
         })
     }
 
@@ -234,6 +241,10 @@ impl FeatureData {
         RoFeatures::new(self)
     }
 
+    pub fn experimental_personalization_api_key(&self) -> Option<&String> {
+        self.experimental_personalization_api_key.as_ref()
+    }
+
     pub fn put_network(&self, mut wtxn: RwTxn, new_network: Network) -> Result<()> {
         self.persisted.remap_data_type::<SerdeJson<Network>>().put(
             &mut wtxn,

crates/index-scheduler/src/index_mapper/mod.rs

@@ -199,7 +199,7 @@ impl IndexMapper {
                 let uuid = Uuid::new_v4();
                 self.index_mapping.put(&mut wtxn, name, &uuid)?;
 
-                let index_path = self.index_path(uuid);
+                let index_path = self.base_path.join(uuid.to_string());
                 fs::create_dir_all(&index_path)?;
 
                 // Error if the UUIDv4 somehow already exists in the map, since it should be fresh.
@@ -286,7 +286,7 @@ impl IndexMapper {
         };
 
         let index_map = self.index_map.clone();
-        let index_path = self.index_path(uuid);
+        let index_path = self.base_path.join(uuid.to_string());
         let index_name = name.to_string();
         thread::Builder::new()
             .name(String::from("index_deleter"))
@@ -341,26 +341,6 @@ impl IndexMapper {
         Ok(())
     }
 
-    /// Closes the specified index.
-    ///
-    /// This operation involves closing the underlying environment and so can take a long time to complete.
-    ///
-    /// # Panics
-    ///
-    /// - If the Index corresponding to the passed name is concurrently being deleted/resized or cannot be found in the
-    ///   in memory hash map.
-    pub fn close_index(&self, rtxn: &RoTxn, name: &str) -> Result<()> {
-        let uuid = self
-            .index_mapping
-            .get(rtxn, name)?
-            .ok_or_else(|| Error::IndexNotFound(name.to_string()))?;
-
-        // We remove the index from the in-memory index map.
-        self.index_map.write().unwrap().close_for_resize(&uuid, self.enable_mdb_writemap, 0);
-
-        Ok(())
-    }
-
     /// Return an index, may open it if it wasn't already opened.
     pub fn index(&self, rtxn: &RoTxn, name: &str) -> Result<Index> {
         if let Some((current_name, current_index)) =
@@ -408,7 +388,7 @@ impl IndexMapper {
                     } else {
                         continue;
                     };
-                    let index_path = self.index_path(uuid);
+                    let index_path = self.base_path.join(uuid.to_string());
                     // take the lock to reopen the environment.
                     reopen
                         .reopen(&mut self.index_map.write().unwrap(), &index_path)
@@ -425,7 +405,7 @@ impl IndexMapper {
                     // if it's not already there.
                     match index_map.get(&uuid) {
                         Missing => {
-                            let index_path = self.index_path(uuid);
+                            let index_path = self.base_path.join(uuid.to_string());
 
                             break index_map
                                 .create(
@@ -452,14 +432,6 @@ impl IndexMapper {
         Ok(index)
     }
 
-    /// Returns the path of the index.
-    ///
-    /// The folder located at this path is containing the data.mdb,
-    /// the lock.mdb and an optional data.mdb.cpy file.
-    pub fn index_path(&self, uuid: Uuid) -> PathBuf {
-        self.base_path.join(uuid.to_string())
-    }
-
     pub fn rollback_index(
         &self,
         rtxn: &RoTxn,
@@ -500,7 +472,7 @@ impl IndexMapper {
             };
         }
 
-        let index_path = self.index_path(uuid);
+        let index_path = self.base_path.join(uuid.to_string());
         Index::rollback(milli::heed::EnvOpenOptions::new().read_txn_without_tls(), index_path, to)
             .map_err(|err| crate::Error::from_milli(err, Some(name.to_string())))
     }

crates/index-scheduler/src/insta_snapshot.rs

@@ -317,9 +317,6 @@ fn snapshot_details(d: &Details) -> String {
         Details::UpgradeDatabase { from, to } => {
             format!("{{ from: {from:?}, to: {to:?} }}")
         }
-        Details::IndexCompaction { index_uid, pre_compaction_size, post_compaction_size } => {
-            format!("{{ index_uid: {index_uid:?}, pre_compaction_size: {pre_compaction_size:?}, post_compaction_size: {post_compaction_size:?} }}")
-        }
     }
 }
 

crates/index-scheduler/src/lib.rs

@@ -303,7 +303,8 @@ impl IndexScheduler {
 
         let mut wtxn = env.write_txn()?;
 
-        let features = features::FeatureData::new(&env, &mut wtxn, options.instance_features)?;
+        let features =
+            features::FeatureData::new(&env, &mut wtxn, options.instance_features.clone())?;
         let queue = Queue::new(&env, &mut wtxn, &options)?;
         let index_mapper = IndexMapper::new(&env, &mut wtxn, &options, budget)?;
         let chat_settings = env.create_database(&mut wtxn, Some(db_name::CHAT_SETTINGS))?;
@@ -886,6 +887,10 @@ impl IndexScheduler {
         self.features.features()
     }
 
+    pub fn experimental_personalization_api_key(&self) -> Option<&String> {
+        self.features.experimental_personalization_api_key()
+    }
+
     pub fn put_runtime_features(&self, features: RuntimeTogglableFeatures) -> Result<()> {
         let wtxn = self.env.write_txn().map_err(Error::HeedTransaction)?;
         self.features.put_runtime_features(wtxn, features)?;

crates/index-scheduler/src/processing.rs

@@ -75,7 +75,6 @@ make_enum_progress! {
     pub enum TaskCancelationProgress {
         RetrievingTasks,
         CancelingUpgrade,
-        CleaningCompactionLeftover,
         UpdatingTasks,
     }
 }
@@ -139,17 +138,6 @@ make_enum_progress! {
     }
 }
 
-make_enum_progress! {
-    pub enum IndexCompaction {
-        RetrieveTheIndex,
-        CreateTemporaryFile,
-        CopyAndCompactTheIndex,
-        PersistTheCompactedIndex,
-        CloseTheIndex,
-        ReopenTheIndex,
-    }
-}
-
 make_enum_progress! {
     pub enum InnerSwappingTwoIndexes {
         RetrieveTheTasks,

crates/index-scheduler/src/queue/mod.rs

@@ -310,8 +310,7 @@ impl Queue {
             | self.tasks.status.get(wtxn, &Status::Failed)?.unwrap_or_default()
             | self.tasks.status.get(wtxn, &Status::Canceled)?.unwrap_or_default();
 
-        let to_delete =
-            RoaringBitmap::from_sorted_iter(finished.into_iter().take(100_000)).unwrap();
+        let to_delete = RoaringBitmap::from_iter(finished.into_iter().rev().take(100_000));
 
         // /!\ the len must be at least 2 or else we might enter an infinite loop where we only delete
         //     the deletion tasks we enqueued ourselves.

crates/index-scheduler/src/scheduler/autobatcher.rs

@@ -68,14 +68,13 @@ impl From<KindWithContent> for AutobatchKind {
             KindWithContent::IndexCreation { .. } => AutobatchKind::IndexCreation,
             KindWithContent::IndexUpdate { .. } => AutobatchKind::IndexUpdate,
             KindWithContent::IndexSwap { .. } => AutobatchKind::IndexSwap,
-            KindWithContent::IndexCompaction { .. }
-            | KindWithContent::TaskCancelation { .. }
+            KindWithContent::TaskCancelation { .. }
             | KindWithContent::TaskDeletion { .. }
             | KindWithContent::DumpCreation { .. }
             | KindWithContent::Export { .. }
             | KindWithContent::UpgradeDatabase { .. }
             | KindWithContent::SnapshotCreation => {
-                panic!("The autobatcher should never be called with tasks with special priority or that don't apply to an index.")
+                panic!("The autobatcher should never be called with tasks that don't apply to an index.")
             }
         }
     }
@@ -288,10 +287,8 @@ impl BatchKind {
         };
 
         match (self, autobatch_kind) {
-            // We don't batch any of these operations
-            (this, K::IndexCreation | K::IndexUpdate | K::IndexSwap | K::DocumentEdition) => {
-                Break((this, BatchStopReason::TaskCannotBeBatched { kind, id }))
-            },
+            // We don't batch any of these operations  
+            (this, K::IndexCreation | K::IndexUpdate | K::IndexSwap | K::DocumentEdition) => Break((this, BatchStopReason::TaskCannotBeBatched { kind, id })),
             // We must not batch tasks that don't have the same index creation rights if the index doesn't already exists.
             (this, kind) if !index_already_exists && this.allow_index_creation() == Some(false) && kind.allow_index_creation() == Some(true) => {
                 Break((this, BatchStopReason::IndexCreationMismatch { id }))

crates/index-scheduler/src/scheduler/create_batch.rs

@@ -55,10 +55,6 @@ pub(crate) enum Batch {
     UpgradeDatabase {
         tasks: Vec<Task>,
     },
-    IndexCompaction {
-        index_uid: String,
-        task: Task,
-    },
 }
 
 #[derive(Debug)]
@@ -114,8 +110,7 @@ impl Batch {
             | Batch::Dump(task)
             | Batch::IndexCreation { task, .. }
             | Batch::Export { task }
-            | Batch::IndexUpdate { task, .. }
-            | Batch::IndexCompaction { task, .. } => {
+            | Batch::IndexUpdate { task, .. } => {
                 RoaringBitmap::from_sorted_iter(std::iter::once(task.uid)).unwrap()
             }
             Batch::SnapshotCreation(tasks)
@@ -160,8 +155,7 @@ impl Batch {
             IndexOperation { op, .. } => Some(op.index_uid()),
             IndexCreation { index_uid, .. }
             | IndexUpdate { index_uid, .. }
-            | IndexDeletion { index_uid, .. }
-            | IndexCompaction { index_uid, .. } => Some(index_uid),
+            | IndexDeletion { index_uid, .. } => Some(index_uid),
         }
     }
 }
@@ -181,7 +175,6 @@ impl fmt::Display for Batch {
             Batch::IndexUpdate { .. } => f.write_str("IndexUpdate")?,
             Batch::IndexDeletion { .. } => f.write_str("IndexDeletion")?,
             Batch::IndexSwap { .. } => f.write_str("IndexSwap")?,
-            Batch::IndexCompaction { .. } => f.write_str("IndexCompaction")?,
             Batch::Export { .. } => f.write_str("Export")?,
             Batch::UpgradeDatabase { .. } => f.write_str("UpgradeDatabase")?,
         };
@@ -519,33 +512,17 @@ impl IndexScheduler {
             return Ok(Some((Batch::TaskDeletions(tasks), current_batch)));
         }
 
-        // 3. we get the next task to compact
-        let to_compact = self.queue.tasks.get_kind(rtxn, Kind::IndexCompaction)? & enqueued;
-        if let Some(task_id) = to_compact.min() {
-            let mut task =
-                self.queue.tasks.get_task(rtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?;
-            current_batch.processing(Some(&mut task));
-            current_batch.reason(BatchStopReason::TaskCannotBeBatched {
-                kind: Kind::IndexCompaction,
-                id: task_id,
-            });
-            let index_uid =
-                task.index_uid().expect("Compaction task must have an index uid").to_owned();
-            return Ok(Some((Batch::IndexCompaction { index_uid, task }, current_batch)));
-        }
-
-        // 4. we batch the export.
+        // 3. we batch the export.
         let to_export = self.queue.tasks.get_kind(rtxn, Kind::Export)? & enqueued;
         if !to_export.is_empty() {
             let task_id = to_export.iter().next().expect("There must be at least one export task");
             let mut task = self.queue.tasks.get_task(rtxn, task_id)?.unwrap();
             current_batch.processing([&mut task]);
-            current_batch
-                .reason(BatchStopReason::TaskCannotBeBatched { kind: Kind::Export, id: task_id });
+            current_batch.reason(BatchStopReason::TaskKindCannotBeBatched { kind: Kind::Export });
             return Ok(Some((Batch::Export { task }, current_batch)));
         }
 
-        // 5. we batch the snapshot.
+        // 4. we batch the snapshot.
         let to_snapshot = self.queue.tasks.get_kind(rtxn, Kind::SnapshotCreation)? & enqueued;
         if !to_snapshot.is_empty() {
             let mut tasks = self.queue.tasks.get_existing_tasks(rtxn, to_snapshot)?;
@@ -555,7 +532,7 @@ impl IndexScheduler {
             return Ok(Some((Batch::SnapshotCreation(tasks), current_batch)));
         }
 
-        // 6. we batch the dumps.
+        // 5. we batch the dumps.
         let to_dump = self.queue.tasks.get_kind(rtxn, Kind::DumpCreation)? & enqueued;
         if let Some(to_dump) = to_dump.min() {
             let mut task =
@@ -568,7 +545,7 @@ impl IndexScheduler {
             return Ok(Some((Batch::Dump(task), current_batch)));
         }
 
-        // 7. We make a batch from the unprioritised tasks. Start by taking the next enqueued task.
+        // 6. We make a batch from the unprioritised tasks. Start by taking the next enqueued task.
         let task_id = if let Some(task_id) = enqueued.min() { task_id } else { return Ok(None) };
         let mut task =
             self.queue.tasks.get_task(rtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?;

crates/index-scheduler/src/scheduler/process_batch.rs

@@ -1,27 +1,22 @@
 use std::collections::{BTreeSet, HashMap, HashSet};
-use std::fs::{remove_file, File};
-use std::io::{ErrorKind, Seek, SeekFrom};
 use std::panic::{catch_unwind, AssertUnwindSafe};
 use std::sync::atomic::Ordering;
 
-use byte_unit::Byte;
 use meilisearch_types::batches::{BatchEnqueuedAt, BatchId};
 use meilisearch_types::heed::{RoTxn, RwTxn};
-use meilisearch_types::milli::heed::CompactionOption;
 use meilisearch_types::milli::progress::{Progress, VariableNameStep};
 use meilisearch_types::milli::{self, ChannelCongestion};
 use meilisearch_types::tasks::{Details, IndexSwap, Kind, KindWithContent, Status, Task};
 use meilisearch_types::versioning::{VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH};
 use milli::update::Settings as MilliSettings;
 use roaring::RoaringBitmap;
-use tempfile::{PersistError, TempPath};
 use time::OffsetDateTime;
 
 use super::create_batch::Batch;
 use crate::processing::{
     AtomicBatchStep, AtomicTaskStep, CreateIndexProgress, DeleteIndexProgress, FinalizingIndexStep,
-    IndexCompaction, InnerSwappingTwoIndexes, SwappingTheIndexes, TaskCancelationProgress,
-    TaskDeletionProgress, UpdateIndexProgress,
+    InnerSwappingTwoIndexes, SwappingTheIndexes, TaskCancelationProgress, TaskDeletionProgress,
+    UpdateIndexProgress,
 };
 use crate::utils::{
     self, remove_n_tasks_datetime_earlier_than, remove_task_datetime, swap_index_uid_in_task,
@@ -29,9 +24,6 @@ use crate::utils::{
 };
 use crate::{Error, IndexScheduler, Result, TaskId};
 
-/// The name of the copy of the data.mdb file used during compaction.
-const DATA_MDB_COPY_NAME: &str = "data.mdb.cpy";
-
 #[derive(Debug, Default)]
 pub struct ProcessBatchInfo {
     /// The write channel congestion. None when unavailable: settings update.
@@ -426,47 +418,6 @@ impl IndexScheduler {
                 task.status = Status::Succeeded;
                 Ok((vec![task], ProcessBatchInfo::default()))
             }
-            Batch::IndexCompaction { index_uid: _, mut task } => {
-                let KindWithContent::IndexCompaction { index_uid } = &task.kind else {
-                    unreachable!()
-                };
-
-                let rtxn = self.env.read_txn()?;
-                let ret = catch_unwind(AssertUnwindSafe(|| {
-                    self.apply_compaction(&rtxn, &progress, index_uid)
-                }));
-
-                let (pre_size, post_size) = match ret {
-                    Ok(Ok(stats)) => stats,
-                    Ok(Err(Error::AbortedTask)) => return Err(Error::AbortedTask),
-                    Ok(Err(e)) => return Err(e),
-                    Err(e) => {
-                        let msg = match e.downcast_ref::<&'static str>() {
-                            Some(s) => *s,
-                            None => match e.downcast_ref::<String>() {
-                                Some(s) => &s[..],
-                                None => "Box<dyn Any>",
-                            },
-                        };
-                        return Err(Error::Export(Box::new(Error::ProcessBatchPanicked(
-                            msg.to_string(),
-                        ))));
-                    }
-                };
-
-                task.status = Status::Succeeded;
-                if let Some(Details::IndexCompaction {
-                    index_uid: _,
-                    pre_compaction_size,
-                    post_compaction_size,
-                }) = task.details.as_mut()
-                {
-                    *pre_compaction_size = Some(Byte::from_u64(pre_size));
-                    *post_compaction_size = Some(Byte::from_u64(post_size));
-                }
-
-                Ok((vec![task], ProcessBatchInfo::default()))
-            }
             Batch::Export { mut task } => {
                 let KindWithContent::Export { url, api_key, payload_size, indexes } = &task.kind
                 else {
@@ -542,92 +493,6 @@ impl IndexScheduler {
         }
     }
 
-    fn apply_compaction(
-        &self,
-        rtxn: &RoTxn,
-        progress: &Progress,
-        index_uid: &str,
-    ) -> Result<(u64, u64)> {
-        // 1. Verify that the index exists
-        if !self.index_mapper.index_exists(rtxn, index_uid)? {
-            return Err(Error::IndexNotFound(index_uid.to_owned()));
-        }
-
-        // 2. We retrieve the index and create a temporary file in the index directory
-        progress.update_progress(IndexCompaction::RetrieveTheIndex);
-        let index = self.index_mapper.index(rtxn, index_uid)?;
-
-        // the index operation can take a long time, so save this handle to make it available to the search for the duration of the tick
-        self.index_mapper
-            .set_currently_updating_index(Some((index_uid.to_string(), index.clone())));
-
-        progress.update_progress(IndexCompaction::CreateTemporaryFile);
-        let src_path = index.path().join("data.mdb");
-        let pre_size = std::fs::metadata(&src_path)?.len();
-
-        let dst_path = TempPath::from_path(index.path().join(DATA_MDB_COPY_NAME));
-        let file = File::create(&dst_path)?;
-        let mut file = tempfile::NamedTempFile::from_parts(file, dst_path);
-
-        // 3. We copy the index data to the temporary file
-        progress.update_progress(IndexCompaction::CopyAndCompactTheIndex);
-        index
-            .copy_to_file(file.as_file_mut(), CompactionOption::Enabled)
-            .map_err(|error| Error::Milli { error, index_uid: Some(index_uid.to_string()) })?;
-        // ...and reset the file position as specified in the documentation
-        file.seek(SeekFrom::Start(0))?;
-
-        // 4. We replace the index data file with the temporary file
-        progress.update_progress(IndexCompaction::PersistTheCompactedIndex);
-        match file.persist(src_path) {
-            Ok(file) => file.sync_all()?,
-            // TODO see if we have a _resource busy_ error and probably handle this by:
-            //      1. closing the index, 2. replacing and 3. reopening it
-            Err(PersistError { error, file: _ }) => return Err(Error::IoError(error)),
-        };
-
-        // 5. Prepare to close the index
-        progress.update_progress(IndexCompaction::CloseTheIndex);
-
-        // unmark that the index is the processing one so we don't keep a handle to it, preventing its closing
-        self.index_mapper.set_currently_updating_index(None);
-
-        self.index_mapper.close_index(rtxn, index_uid)?;
-        drop(index);
-
-        progress.update_progress(IndexCompaction::ReopenTheIndex);
-        // 6. Reopen the index
-        // The index will use the compacted data file when being reopened
-        let index = self.index_mapper.index(rtxn, index_uid)?;
-
-        // if the update processed successfully, we're going to store the new
-        // stats of the index. Since the tasks have already been processed and
-        // this is a non-critical operation. If it fails, we should not fail
-        // the entire batch.
-        let res = || -> Result<_> {
-            let mut wtxn = self.env.write_txn()?;
-            let index_rtxn = index.read_txn()?;
-            let stats = crate::index_mapper::IndexStats::new(&index, &index_rtxn)
-                .map_err(|e| Error::from_milli(e, Some(index_uid.to_string())))?;
-            self.index_mapper.store_stats_of(&mut wtxn, index_uid, &stats)?;
-            wtxn.commit()?;
-            Ok(stats.database_size)
-        }();
-
-        let post_size = match res {
-            Ok(post_size) => post_size,
-            Err(e) => {
-                tracing::error!(
-                    error = &e as &dyn std::error::Error,
-                    "Could not write the stats of the index"
-                );
-                0
-            }
-        };
-
-        Ok((pre_size, post_size))
-    }
-
     /// Swap the index `lhs` with the index `rhs`.
     fn apply_index_swap(
         &self,
@@ -915,10 +780,9 @@ impl IndexScheduler {
 
         let enqueued_tasks = &self.queue.tasks.get_status(rtxn, Status::Enqueued)?;
 
-        // 0. Check if any upgrade or compaction tasks were matched.
+        // 0. Check if any upgrade task was matched.
         //    If so, we cancel all the failed or enqueued upgrade tasks.
         let upgrade_tasks = &self.queue.tasks.get_kind(rtxn, Kind::UpgradeDatabase)?;
-        let compaction_tasks = &self.queue.tasks.get_kind(rtxn, Kind::IndexCompaction)?;
         let is_canceling_upgrade = !matched_tasks.is_disjoint(upgrade_tasks);
         if is_canceling_upgrade {
             let failed_tasks = self.queue.tasks.get_status(rtxn, Status::Failed)?;
@@ -983,33 +847,7 @@ impl IndexScheduler {
             }
         }
 
-        // 3. If we are cancelling a compaction task, remove the tempfiles after incomplete compactions
-        for compaction_task in &tasks_to_cancel & compaction_tasks {
-            progress.update_progress(TaskCancelationProgress::CleaningCompactionLeftover);
-            let task = self.queue.tasks.get_task(rtxn, compaction_task)?.unwrap();
-            let Some(Details::IndexCompaction {
-                index_uid,
-                pre_compaction_size: _,
-                post_compaction_size: _,
-            }) = task.details
-            else {
-                unreachable!("wrong details for compaction task {compaction_task}")
-            };
-
-            let index_path = match self.index_mapper.index_mapping.get(rtxn, &index_uid)? {
-                Some(index_uuid) => self.index_mapper.index_path(index_uuid),
-                None => continue,
-            };
-
-            if let Err(e) = remove_file(index_path.join(DATA_MDB_COPY_NAME)) {
-                match e.kind() {
-                    ErrorKind::NotFound => (),
-                    _ => return Err(Error::IoError(e)),
-                }
-            }
-        }
-
-        // 4. We now have a list of tasks to cancel, cancel them
+        // 3. We now have a list of tasks to cancel, cancel them
         let (task_progress, progress_obj) = AtomicTaskStep::new(tasks_to_cancel.len() as u32);
         progress.update_progress(progress_obj);
 

crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/after_processing_everything.snap

@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 24, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 22, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 1 {uid: 1, batch_uid: 1, status: succeeded, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 2 {uid: 2, batch_uid: 2, status: succeeded, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }}
 3 {uid: 3, batch_uid: 3, status: failed, error: ResponseError { code: 200, message: "Index `doggo` already exists.", error_code: "index_already_exists", error_type: "invalid_request", error_link: "https://docs.meilisearch.com/errors#index_already_exists" }, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }}
@@ -57,7 +57,7 @@ girafo: { number_of_documents: 0, field_distribution: {} }
 [timestamp] [4,]
 ----------------------------------------------------------------------
 ### All Batches:
-0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.24.0"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
+0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.22.0"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
 1 {uid: 1, details: {"primaryKey":"mouse"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"indexCreation":1},"indexUids":{"catto":1}}, stop reason: "created batch containing only task with id 1 of type `indexCreation` that cannot be batched with any other task.", }
 2 {uid: 2, details: {"primaryKey":"bone"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"indexCreation":1},"indexUids":{"doggo":1}}, stop reason: "created batch containing only task with id 2 of type `indexCreation` that cannot be batched with any other task.", }
 3 {uid: 3, details: {"primaryKey":"bone"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"indexCreation":1},"indexUids":{"doggo":1}}, stop reason: "created batch containing only task with id 3 of type `indexCreation` that cannot be batched with any other task.", }

crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/register_automatic_upgrade_task.snap

@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 24, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 22, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [0,]

crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/registered_a_task_while_the_upgrade_task_is_enqueued.snap

@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 24, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 22, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 ----------------------------------------------------------------------
 ### Status:

crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed.snap

@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 24, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 22, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 ----------------------------------------------------------------------
 ### Status:
@@ -37,7 +37,7 @@ catto [1,]
 [timestamp] [0,]
 ----------------------------------------------------------------------
 ### All Batches:
-0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.24.0"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
+0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.22.0"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
 ----------------------------------------------------------------------
 ### Batch to tasks mapping:
 0 [0,]

crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed_again.snap

@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 24, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 22, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 2 {uid: 2, status: enqueued, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }}
 ----------------------------------------------------------------------
@@ -40,7 +40,7 @@ doggo [2,]
 [timestamp] [0,]
 ----------------------------------------------------------------------
 ### All Batches:
-0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.24.0"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
+0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.22.0"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
 ----------------------------------------------------------------------
 ### Batch to tasks mapping:
 0 [0,]

crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_succeeded.snap

@@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 24, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
+0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 22, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }}
 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 2 {uid: 2, status: enqueued, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }}
 3 {uid: 3, status: enqueued, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }}
@@ -43,7 +43,7 @@ doggo [2,3,]
 [timestamp] [0,]
 ----------------------------------------------------------------------
 ### All Batches:
-0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.24.0"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
+0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.22.0"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", }
 ----------------------------------------------------------------------
 ### Batch to tasks mapping:
 0 [0,]

crates/index-scheduler/src/scheduler/test.rs

@@ -722,7 +722,7 @@ fn basic_get_stats() {
     let kind = index_creation_task("whalo", "fish");
     let _task = index_scheduler.register(kind, None, false).unwrap();
 
-    snapshot!(json_string!(index_scheduler.get_stats().unwrap()), @r###"
+    snapshot!(json_string!(index_scheduler.get_stats().unwrap()), @r#"
     {
       "indexes": {
         "catto": 1,
@@ -742,7 +742,6 @@ fn basic_get_stats() {
         "documentEdition": 0,
         "dumpCreation": 0,
         "export": 0,
-        "indexCompaction": 0,
         "indexCreation": 3,
         "indexDeletion": 0,
         "indexSwap": 0,
@@ -754,10 +753,10 @@ fn basic_get_stats() {
         "upgradeDatabase": 0
       }
     }
-    "###);
+    "#);
 
     handle.advance_till([Start, BatchCreated]);
-    snapshot!(json_string!(index_scheduler.get_stats().unwrap()), @r###"
+    snapshot!(json_string!(index_scheduler.get_stats().unwrap()), @r#"
     {
       "indexes": {
         "catto": 1,
@@ -777,7 +776,6 @@ fn basic_get_stats() {
         "documentEdition": 0,
         "dumpCreation": 0,
         "export": 0,
-        "indexCompaction": 0,
         "indexCreation": 3,
         "indexDeletion": 0,
         "indexSwap": 0,
@@ -789,7 +787,7 @@ fn basic_get_stats() {
         "upgradeDatabase": 0
       }
     }
-    "###);
+    "#);
 
     handle.advance_till([
         InsideProcessBatch,
@@ -799,7 +797,7 @@ fn basic_get_stats() {
         Start,
         BatchCreated,
     ]);
-    snapshot!(json_string!(index_scheduler.get_stats().unwrap()), @r###"
+    snapshot!(json_string!(index_scheduler.get_stats().unwrap()), @r#"
     {
       "indexes": {
         "catto": 1,
@@ -819,7 +817,6 @@ fn basic_get_stats() {
         "documentEdition": 0,
         "dumpCreation": 0,
         "export": 0,
-        "indexCompaction": 0,
         "indexCreation": 3,
         "indexDeletion": 0,
         "indexSwap": 0,
@@ -831,7 +828,7 @@ fn basic_get_stats() {
         "upgradeDatabase": 0
       }
     }
-    "###);
+    "#);
 
     // now we make one more batch, the started_at field of the new tasks will be past `second_start_time`
     handle.advance_till([
@@ -842,7 +839,7 @@ fn basic_get_stats() {
         Start,
         BatchCreated,
     ]);
-    snapshot!(json_string!(index_scheduler.get_stats().unwrap()), @r###"
+    snapshot!(json_string!(index_scheduler.get_stats().unwrap()), @r#"
     {
       "indexes": {
         "catto": 1,
@@ -862,7 +859,6 @@ fn basic_get_stats() {
         "documentEdition": 0,
         "dumpCreation": 0,
         "export": 0,
-        "indexCompaction": 0,
         "indexCreation": 3,
         "indexDeletion": 0,
         "indexSwap": 0,
@@ -874,7 +870,7 @@ fn basic_get_stats() {
         "upgradeDatabase": 0
       }
     }
-    "###);
+    "#);
 }
 
 #[test]

crates/index-scheduler/src/upgrade/mod.rs

@@ -45,9 +45,6 @@ pub fn upgrade_index_scheduler(
         (1, 19, _) => 0,
         (1, 20, _) => 0,
         (1, 21, _) => 0,
-        (1, 22, _) => 0,
-        (1, 23, _) => 0,
-        (1, 24, _) => 0,
         (major, minor, patch) => {
             if major > current_major
                 || (major == current_major && minor > current_minor)

crates/index-scheduler/src/utils.rs

@@ -256,15 +256,14 @@ pub fn swap_index_uid_in_task(task: &mut Task, swap: (&str, &str)) {
     use KindWithContent as K;
     let mut index_uids = vec![];
     match &mut task.kind {
-        K::DocumentAdditionOrUpdate { index_uid, .. }
-        | K::DocumentEdition { index_uid, .. }
-        | K::DocumentDeletion { index_uid, .. }
-        | K::DocumentDeletionByFilter { index_uid, .. }
-        | K::DocumentClear { index_uid }
-        | K::SettingsUpdate { index_uid, .. }
-        | K::IndexDeletion { index_uid }
-        | K::IndexCreation { index_uid, .. }
-        | K::IndexCompaction { index_uid, .. } => index_uids.push(index_uid),
+        K::DocumentAdditionOrUpdate { index_uid, .. } => index_uids.push(index_uid),
+        K::DocumentEdition { index_uid, .. } => index_uids.push(index_uid),
+        K::DocumentDeletion { index_uid, .. } => index_uids.push(index_uid),
+        K::DocumentDeletionByFilter { index_uid, .. } => index_uids.push(index_uid),
+        K::DocumentClear { index_uid } => index_uids.push(index_uid),
+        K::SettingsUpdate { index_uid, .. } => index_uids.push(index_uid),
+        K::IndexDeletion { index_uid } => index_uids.push(index_uid),
+        K::IndexCreation { index_uid, .. } => index_uids.push(index_uid),
         K::IndexUpdate { index_uid, new_index_uid, .. } => {
             index_uids.push(index_uid);
             if let Some(new_uid) = new_index_uid {
@@ -619,13 +618,6 @@ impl crate::IndexScheduler {
                     Details::UpgradeDatabase { from: _, to: _ } => {
                         assert_eq!(kind.as_kind(), Kind::UpgradeDatabase);
                     }
-                    Details::IndexCompaction {
-                        index_uid: _,
-                        pre_compaction_size: _,
-                        post_compaction_size: _,
-                    } => {
-                        assert_eq!(kind.as_kind(), Kind::IndexCompaction);
-                    }
                 }
             }
 

crates/meilisearch-auth/src/store.rs

@@ -109,7 +109,6 @@ impl HeedAuthStore {
                             Action::IndexesGet,
                             Action::IndexesUpdate,
                             Action::IndexesSwap,
-                            Action::IndexesCompact,
                         ]
                         .iter(),
                     );

crates/meilisearch-types/src/error.rs

@@ -315,6 +315,8 @@ InvalidSearchShowRankingScoreDetails           , InvalidRequest       , BAD_REQU
 InvalidSimilarShowRankingScoreDetails          , InvalidRequest       , BAD_REQUEST ;
 InvalidSearchSort                              , InvalidRequest       , BAD_REQUEST ;
 InvalidSearchDistinct                          , InvalidRequest       , BAD_REQUEST ;
+InvalidSearchPersonalize                        , InvalidRequest       , BAD_REQUEST ;
+InvalidSearchPersonalizeUserContext             , InvalidRequest       , BAD_REQUEST ;
 InvalidSearchMediaAndVector                    , InvalidRequest       , BAD_REQUEST ;
 InvalidSettingsDisplayedAttributes             , InvalidRequest       , BAD_REQUEST ;
 InvalidSettingsDistinctAttribute               , InvalidRequest       , BAD_REQUEST ;
@@ -679,6 +681,18 @@ impl fmt::Display for deserr_codes::InvalidNetworkSearchApiKey {
     }
 }
 
+impl fmt::Display for deserr_codes::InvalidSearchPersonalize {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "the value of `personalize` is invalid, expected a JSON object with optional `userContext` string.")
+    }
+}
+
+impl fmt::Display for deserr_codes::InvalidSearchPersonalizeUserContext {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "the value of `userContext` is invalid, expected a string.")
+    }
+}
+
 #[macro_export]
 macro_rules! internal_error {
     ($target:ty : $($other:path), *) => {

crates/meilisearch-types/src/features.rs

@@ -24,11 +24,12 @@ pub struct RuntimeTogglableFeatures {
     pub vector_store_setting: bool,
 }
 
-#[derive(Default, Debug, Clone, Copy)]
+#[derive(Default, Debug, Clone)]
 pub struct InstanceTogglableFeatures {
     pub metrics: bool,
     pub logs_route: bool,
     pub contains_filter: bool,
+    pub experimental_personalization_api_key: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default)]

crates/meilisearch-types/src/keys.rs

@@ -380,9 +380,6 @@ pub enum Action {
     #[serde(rename = "webhooks.*")]
     #[deserr(rename = "webhooks.*")]
     WebhooksAll,
-    #[serde(rename = "indexes.compact")]
-    #[deserr(rename = "indexes.compact")]
-    IndexesCompact,
 }
 
 impl Action {
@@ -401,7 +398,6 @@ impl Action {
             INDEXES_UPDATE => Some(Self::IndexesUpdate),
             INDEXES_DELETE => Some(Self::IndexesDelete),
             INDEXES_SWAP => Some(Self::IndexesSwap),
-            INDEXES_COMPACT => Some(Self::IndexesCompact),
             TASKS_ALL => Some(Self::TasksAll),
             TASKS_CANCEL => Some(Self::TasksCancel),
             TASKS_DELETE => Some(Self::TasksDelete),
@@ -466,7 +462,6 @@ impl Action {
             IndexesUpdate => false,
             IndexesDelete => false,
             IndexesSwap => false,
-            IndexesCompact => false,
             TasksCancel => false,
             TasksDelete => false,
             TasksGet => true,
@@ -518,7 +513,6 @@ pub mod actions {
     pub const INDEXES_UPDATE: u8 = IndexesUpdate.repr();
     pub const INDEXES_DELETE: u8 = IndexesDelete.repr();
     pub const INDEXES_SWAP: u8 = IndexesSwap.repr();
-    pub const INDEXES_COMPACT: u8 = IndexesCompact.repr();
     pub const TASKS_ALL: u8 = TasksAll.repr();
     pub const TASKS_CANCEL: u8 = TasksCancel.repr();
     pub const TASKS_DELETE: u8 = TasksDelete.repr();
@@ -620,7 +614,6 @@ pub(crate) mod test {
         assert!(WebhooksDelete.repr() == 47 && WEBHOOKS_DELETE == 47);
         assert!(WebhooksCreate.repr() == 48 && WEBHOOKS_CREATE == 48);
         assert!(WebhooksAll.repr() == 49 && WEBHOOKS_ALL == 49);
-        assert!(IndexesCompact.repr() == 50 && INDEXES_COMPACT == 50);
     }
 
     #[test]

crates/meilisearch-types/src/task_view.rs

@@ -142,11 +142,6 @@ pub struct DetailsView {
     pub old_index_uid: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub new_index_uid: Option<String>,
-    // index compaction
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub pre_compaction_size: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub post_compaction_size: Option<String>,
 }
 
 impl DetailsView {
@@ -319,24 +314,6 @@ impl DetailsView {
                 // We should never be able to batch multiple renames at the same time.
                 (Some(left), Some(_right)) => Some(left),
             },
-            pre_compaction_size: match (
-                self.pre_compaction_size.clone(),
-                other.pre_compaction_size.clone(),
-            ) {
-                (None, None) => None,
-                (None, Some(size)) | (Some(size), None) => Some(size),
-                // We should never be able to batch multiple compactions at the same time.
-                (Some(left), Some(_right)) => Some(left),
-            },
-            post_compaction_size: match (
-                self.post_compaction_size.clone(),
-                other.post_compaction_size.clone(),
-            ) {
-                (None, None) => None,
-                (None, Some(size)) | (Some(size), None) => Some(size),
-                // We should never be able to batch multiple compactions at the same time.
-                (Some(left), Some(_right)) => Some(left),
-            },
         }
     }
 }
@@ -438,15 +415,6 @@ impl From<Details> for DetailsView {
                 upgrade_to: Some(format!("v{}.{}.{}", to.0, to.1, to.2)),
                 ..Default::default()
             },
-            Details::IndexCompaction { pre_compaction_size, post_compaction_size, .. } => {
-                DetailsView {
-                    pre_compaction_size: pre_compaction_size
-                        .map(|size| size.get_appropriate_unit(UnitType::Both).to_string()),
-                    post_compaction_size: post_compaction_size
-                        .map(|size| size.get_appropriate_unit(UnitType::Both).to_string()),
-                    ..Default::default()
-                }
-            }
         }
     }
 }

crates/meilisearch-types/src/tasks.rs

@@ -67,8 +67,7 @@ impl Task {
             | SettingsUpdate { index_uid, .. }
             | IndexCreation { index_uid, .. }
             | IndexUpdate { index_uid, .. }
-            | IndexDeletion { index_uid }
-            | IndexCompaction { index_uid } => Some(index_uid),
+            | IndexDeletion { index_uid } => Some(index_uid),
         }
     }
 
@@ -95,8 +94,7 @@ impl Task {
             | KindWithContent::DumpCreation { .. }
             | KindWithContent::SnapshotCreation
             | KindWithContent::Export { .. }
-            | KindWithContent::UpgradeDatabase { .. }
-            | KindWithContent::IndexCompaction { .. } => None,
+            | KindWithContent::UpgradeDatabase { .. } => None,
         }
     }
 }
@@ -172,9 +170,6 @@ pub enum KindWithContent {
     UpgradeDatabase {
         from: (u32, u32, u32),
     },
-    IndexCompaction {
-        index_uid: String,
-    },
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, ToSchema)]
@@ -211,7 +206,6 @@ impl KindWithContent {
             KindWithContent::SnapshotCreation => Kind::SnapshotCreation,
             KindWithContent::Export { .. } => Kind::Export,
             KindWithContent::UpgradeDatabase { .. } => Kind::UpgradeDatabase,
-            KindWithContent::IndexCompaction { .. } => Kind::IndexCompaction,
         }
     }
 
@@ -232,8 +226,7 @@ impl KindWithContent {
             | DocumentClear { index_uid }
             | SettingsUpdate { index_uid, .. }
             | IndexCreation { index_uid, .. }
-            | IndexDeletion { index_uid }
-            | IndexCompaction { index_uid } => vec![index_uid],
+            | IndexDeletion { index_uid } => vec![index_uid],
             IndexUpdate { index_uid, new_index_uid, .. } => {
                 let mut indexes = vec![index_uid.as_str()];
                 if let Some(new_uid) = new_index_uid {
@@ -332,11 +325,6 @@ impl KindWithContent {
                     versioning::VERSION_PATCH,
                 ),
             }),
-            KindWithContent::IndexCompaction { index_uid } => Some(Details::IndexCompaction {
-                index_uid: index_uid.clone(),
-                pre_compaction_size: None,
-                post_compaction_size: None,
-            }),
         }
     }
 
@@ -419,11 +407,6 @@ impl KindWithContent {
                     versioning::VERSION_PATCH,
                 ),
             }),
-            KindWithContent::IndexCompaction { index_uid } => Some(Details::IndexCompaction {
-                index_uid: index_uid.clone(),
-                pre_compaction_size: None,
-                post_compaction_size: None,
-            }),
         }
     }
 }
@@ -486,11 +469,6 @@ impl From<&KindWithContent> for Option<Details> {
                     versioning::VERSION_PATCH,
                 ),
             }),
-            KindWithContent::IndexCompaction { index_uid } => Some(Details::IndexCompaction {
-                index_uid: index_uid.clone(),
-                pre_compaction_size: None,
-                post_compaction_size: None,
-            }),
         }
     }
 }
@@ -601,7 +579,6 @@ pub enum Kind {
     SnapshotCreation,
     Export,
     UpgradeDatabase,
-    IndexCompaction,
 }
 
 impl Kind {
@@ -613,8 +590,7 @@ impl Kind {
             | Kind::SettingsUpdate
             | Kind::IndexCreation
             | Kind::IndexDeletion
-            | Kind::IndexUpdate
-            | Kind::IndexCompaction => true,
+            | Kind::IndexUpdate => true,
             Kind::IndexSwap
             | Kind::TaskCancelation
             | Kind::TaskDeletion
@@ -642,7 +618,6 @@ impl Display for Kind {
             Kind::SnapshotCreation => write!(f, "snapshotCreation"),
             Kind::Export => write!(f, "export"),
             Kind::UpgradeDatabase => write!(f, "upgradeDatabase"),
-            Kind::IndexCompaction => write!(f, "indexCompaction"),
         }
     }
 }
@@ -678,8 +653,6 @@ impl FromStr for Kind {
             Ok(Kind::Export)
         } else if kind.eq_ignore_ascii_case("upgradeDatabase") {
             Ok(Kind::UpgradeDatabase)
-        } else if kind.eq_ignore_ascii_case("indexCompaction") {
-            Ok(Kind::IndexCompaction)
         } else {
             Err(ParseTaskKindError(kind.to_owned()))
         }
@@ -765,11 +738,6 @@ pub enum Details {
         from: (u32, u32, u32),
         to: (u32, u32, u32),
     },
-    IndexCompaction {
-        index_uid: String,
-        pre_compaction_size: Option<Byte>,
-        post_compaction_size: Option<Byte>,
-    },
 }
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, ToSchema)]
@@ -832,10 +800,6 @@ impl Details {
             Self::ClearAll { deleted_documents } => *deleted_documents = Some(0),
             Self::TaskCancelation { canceled_tasks, .. } => *canceled_tasks = Some(0),
             Self::TaskDeletion { deleted_tasks, .. } => *deleted_tasks = Some(0),
-            Self::IndexCompaction { pre_compaction_size, post_compaction_size, .. } => {
-                *pre_compaction_size = None;
-                *post_compaction_size = None;
-            }
             Self::SettingsUpdate { .. }
             | Self::IndexInfo { .. }
             | Self::Dump { .. }

crates/meilisearch/Cargo.toml

@@ -91,10 +91,11 @@ time = { version = "0.3.41", features = [
 ] }
 tokio = { version = "1.45.1", features = ["full"] }
 toml = "0.8.23"
-uuid = { version = "1.18.0", features = ["serde", "v4", "v7"] }
+uuid = { version = "1.17.0", features = ["serde", "v4"] }
 serde_urlencoded = "0.7.1"
 termcolor = "1.4.1"
 url = { version = "2.5.4", features = ["serde"] }
+cohere-rust = "0.6.0"
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.20", features = ["json"] }
 tracing-trace = { version = "0.1.0", path = "../tracing-trace" }

crates/meilisearch/src/analytics/segment_analytics.rs

@@ -205,8 +205,6 @@ struct Infos {
     experimental_no_snapshot_compaction: bool,
     experimental_no_edition_2024_for_dumps: bool,
     experimental_no_edition_2024_for_settings: bool,
-    experimental_no_edition_2024_for_prefix_post_processing: bool,
-    experimental_no_edition_2024_for_facet_post_processing: bool,
     experimental_vector_store_setting: bool,
     gpu_enabled: bool,
     db_path: bool,
@@ -285,6 +283,7 @@ impl Infos {
             indexer_options,
             config_file_path,
             no_analytics: _,
+            experimental_personalization_api_key: _,
         } = options;
 
         let schedule_snapshot = match schedule_snapshot {
@@ -298,8 +297,6 @@ impl Infos {
             skip_index_budget: _,
             experimental_no_edition_2024_for_settings,
             experimental_no_edition_2024_for_dumps,
-            experimental_no_edition_2024_for_prefix_post_processing,
-            experimental_no_edition_2024_for_facet_post_processing,
         } = indexer_options;
 
         let RuntimeTogglableFeatures {
@@ -369,8 +366,6 @@ impl Infos {
             ssl_resumption,
             ssl_tickets,
             experimental_no_edition_2024_for_settings,
-            experimental_no_edition_2024_for_prefix_post_processing,
-            experimental_no_edition_2024_for_facet_post_processing,
         }
     }
 }

crates/meilisearch/src/lib.rs

@@ -11,6 +11,7 @@ pub mod middleware;
 pub mod option;
 #[cfg(test)]
 mod option_test;
+pub mod personalization;
 pub mod routes;
 pub mod search;
 pub mod search_queue;
@@ -684,12 +685,19 @@ pub fn configure_data(
     (logs_route, logs_stderr): (LogRouteHandle, LogStderrHandle),
     analytics: Data<Analytics>,
 ) {
+    // Create personalization service with API key from options
+    let personalization_service = index_scheduler
+        .experimental_personalization_api_key()
+        .cloned()
+        .map(personalization::PersonalizationService::cohere)
+        .unwrap_or_else(personalization::PersonalizationService::uninitialized);
     let http_payload_size_limit = opt.http_payload_size_limit.as_u64() as usize;
     config
         .app_data(index_scheduler)
         .app_data(auth)
         .app_data(search_queue)
         .app_data(analytics)
+        .app_data(web::Data::new(personalization_service))
         .app_data(web::Data::new(logs_route))
         .app_data(web::Data::new(logs_stderr))
         .app_data(web::Data::new(opt.clone()))

crates/meilisearch/src/metrics.rs

@@ -114,4 +114,9 @@ lazy_static! {
             "Meilisearch Task Queue Size Until Stop Registering",
         ))
         .expect("Can't create a metric");
+    pub static ref MEILISEARCH_PERSONALIZED_SEARCH_REQUESTS: IntGauge = register_int_gauge!(opts!(
+        "meilisearch_personalized_search_requests",
+        "Meilisearch number of search requests with personalization"
+    ))
+    .expect("Can't create a metric");
 }

crates/meilisearch/src/option.rs

@@ -55,10 +55,6 @@ const MEILI_EXPERIMENTAL_ENABLE_LOGS_ROUTE: &str = "MEILI_EXPERIMENTAL_ENABLE_LO
 const MEILI_EXPERIMENTAL_CONTAINS_FILTER: &str = "MEILI_EXPERIMENTAL_CONTAINS_FILTER";
 const MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_SETTINGS: &str =
     "MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_SETTINGS";
-const MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_FACET_POST_PROCESSING: &str =
-    "MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_FACET_POST_PROCESSING";
-const MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_PREFIX_POST_PROCESSING: &str =
-    "MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_PREFIX_POST_PROCESSING";
 const MEILI_EXPERIMENTAL_ENABLE_METRICS: &str = "MEILI_EXPERIMENTAL_ENABLE_METRICS";
 const MEILI_EXPERIMENTAL_SEARCH_QUEUE_SIZE: &str = "MEILI_EXPERIMENTAL_SEARCH_QUEUE_SIZE";
 const MEILI_EXPERIMENTAL_DROP_SEARCH_AFTER: &str = "MEILI_EXPERIMENTAL_DROP_SEARCH_AFTER";
@@ -74,6 +70,8 @@ const MEILI_EXPERIMENTAL_EMBEDDING_CACHE_ENTRIES: &str =
 const MEILI_EXPERIMENTAL_NO_SNAPSHOT_COMPACTION: &str = "MEILI_EXPERIMENTAL_NO_SNAPSHOT_COMPACTION";
 const MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_DUMPS: &str =
     "MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_DUMPS";
+const MEILI_EXPERIMENTAL_PERSONALIZATION_API_KEY: &str =
+    "MEILI_EXPERIMENTAL_PERSONALIZATION_API_KEY";
 const DEFAULT_CONFIG_FILE_PATH: &str = "./config.toml";
 const DEFAULT_DB_PATH: &str = "./data.ms";
 const DEFAULT_HTTP_ADDR: &str = "localhost:7700";
@@ -475,6 +473,12 @@ pub struct Opt {
     #[serde(default)]
     pub experimental_no_snapshot_compaction: bool,
 
+    /// Experimental personalization API key feature.
+    ///
+    /// Sets the API key for personalization features.
+    #[clap(long, env = MEILI_EXPERIMENTAL_PERSONALIZATION_API_KEY)]
+    pub experimental_personalization_api_key: Option<String>,
+
     #[serde(flatten)]
     #[clap(flatten)]
     pub indexer_options: IndexerOpts,
@@ -580,6 +584,7 @@ impl Opt {
             experimental_limit_batched_tasks_total_size,
             experimental_embedding_cache_entries,
             experimental_no_snapshot_compaction,
+            experimental_personalization_api_key,
         } = self;
         export_to_env_if_not_present(MEILI_DB_PATH, db_path);
         export_to_env_if_not_present(MEILI_HTTP_ADDR, http_addr);
@@ -680,6 +685,12 @@ impl Opt {
             MEILI_EXPERIMENTAL_NO_SNAPSHOT_COMPACTION,
             experimental_no_snapshot_compaction.to_string(),
         );
+        if let Some(experimental_personalization_api_key) = experimental_personalization_api_key {
+            export_to_env_if_not_present(
+                MEILI_EXPERIMENTAL_PERSONALIZATION_API_KEY,
+                experimental_personalization_api_key,
+            );
+        }
         indexer_options.export_to_env();
     }
 
@@ -732,6 +743,7 @@ impl Opt {
             metrics: self.experimental_enable_metrics,
             logs_route: self.experimental_enable_logs_route,
             contains_filter: self.experimental_contains_filter,
+            experimental_personalization_api_key: self.experimental_personalization_api_key.clone(),
         }
     }
 }
@@ -776,22 +788,6 @@ pub struct IndexerOpts {
     #[clap(long, env = MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_DUMPS)]
     #[serde(default)]
     pub experimental_no_edition_2024_for_dumps: bool,
-
-    /// Experimental no edition 2024 to compute prefixes. For more information,
-    /// see: <https://github.com/orgs/meilisearch/discussions/862>
-    ///
-    /// Enables the experimental no edition 2024 to compute prefixes.
-    #[clap(long, env = MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_PREFIX_POST_PROCESSING)]
-    #[serde(default)]
-    pub experimental_no_edition_2024_for_prefix_post_processing: bool,
-
-    /// Experimental no edition 2024 to compute facets. For more information,
-    /// see: <https://github.com/orgs/meilisearch/discussions/862>
-    ///
-    /// Enables the experimental no edition 2024 to compute facets.
-    #[clap(long, env = MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_FACET_POST_PROCESSING)]
-    #[serde(default)]
-    pub experimental_no_edition_2024_for_facet_post_processing: bool,
 }
 
 impl IndexerOpts {
@@ -803,8 +799,6 @@ impl IndexerOpts {
             skip_index_budget: _,
             experimental_no_edition_2024_for_settings,
             experimental_no_edition_2024_for_dumps,
-            experimental_no_edition_2024_for_prefix_post_processing,
-            experimental_no_edition_2024_for_facet_post_processing,
         } = self;
         if let Some(max_indexing_memory) = max_indexing_memory.0 {
             export_to_env_if_not_present(
@@ -830,18 +824,6 @@ impl IndexerOpts {
                 experimental_no_edition_2024_for_dumps.to_string(),
             );
         }
-        if experimental_no_edition_2024_for_prefix_post_processing {
-            export_to_env_if_not_present(
-                MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_PREFIX_POST_PROCESSING,
-                experimental_no_edition_2024_for_prefix_post_processing.to_string(),
-            );
-        }
-        if experimental_no_edition_2024_for_facet_post_processing {
-            export_to_env_if_not_present(
-                MEILI_EXPERIMENTAL_NO_EDITION_2024_FOR_FACET_POST_PROCESSING,
-                experimental_no_edition_2024_for_facet_post_processing.to_string(),
-            );
-        }
     }
 }
 
@@ -867,10 +849,6 @@ impl TryFrom<&IndexerOpts> for IndexerConfig {
             chunk_compression_level: Default::default(),
             documents_chunk_size: Default::default(),
             max_nb_chunks: Default::default(),
-            experimental_no_edition_2024_for_prefix_post_processing: other
-                .experimental_no_edition_2024_for_prefix_post_processing,
-            experimental_no_edition_2024_for_facet_post_processing: other
-                .experimental_no_edition_2024_for_facet_post_processing,
         })
     }
 }

crates/meilisearch/src/personalization/mod.rs

@@ -0,0 +1,244 @@
+use crate::search::{Personalize, SearchResult};
+use cohere_rust::{
+    api::rerank::{ReRankModel, ReRankRequest},
+    Cohere,
+};
+use meilisearch_types::error::ResponseError;
+use tracing::{debug, error, info};
+
+pub struct CohereService {
+    cohere: Cohere,
+}
+
+impl CohereService {
+    pub fn new(api_key: String) -> Self {
+        info!("Personalization service initialized with Cohere API");
+        Self { cohere: Cohere::new("https://api.cohere.ai", api_key) }
+    }
+
+    pub async fn rerank_search_results(
+        &self,
+        search_result: SearchResult,
+        personalize: Option<&Personalize>,
+        query: Option<&str>,
+    ) -> Result<SearchResult, ResponseError> {
+        // Extract user context from personalization
+        let Some(user_context) = personalize.and_then(|p| p.user_context.as_deref()) else {
+            return Ok(search_result);
+        };
+
+        // Build the prompt by merging query and user context
+        let prompt = match query {
+            Some(q) => format!("User Context: {user_context}\nQuery: {q}"),
+            None => format!("User Context: {user_context}"),
+        };
+
+        // Extract documents for reranking
+        let documents: Vec<String> = search_result
+            .hits
+            .iter()
+            .map(|hit| {
+                // Convert the document to a string representation for reranking
+                serde_json::to_string(&hit.document).unwrap_or_else(|_| "{}".to_string())
+            })
+            .collect();
+
+        if documents.is_empty() {
+            return Ok(search_result);
+        }
+
+        // Prepare the rerank request
+        let rerank_request = ReRankRequest {
+            query: &prompt,
+            documents: &documents,
+            model: ReRankModel::EnglishV3, // Use the default and more recent model
+            top_n: None,
+            max_chunks_per_doc: None,
+        };
+
+        // Call Cohere's rerank API
+        match self.cohere.rerank(&rerank_request).await {
+            Ok(rerank_response) => {
+                debug!("Cohere rerank successful, reordering {} results", search_result.hits.len());
+
+                // Create a mapping from original index to new rank
+                let reranked_indices: Vec<usize> =
+                    rerank_response.iter().map(|result| result.index as usize).collect();
+
+                // Reorder the hits based on Cohere's reranking
+                let mut reranked_hits = Vec::new();
+                for index in reranked_indices.iter() {
+                    reranked_hits.push(search_result.hits[*index].clone());
+                }
+
+                Ok(SearchResult { hits: reranked_hits, ..search_result })
+            }
+            Err(e) => {
+                error!("Cohere rerank failed with model EnglishV3: {}", e);
+                // Return original results on error
+                Ok(search_result)
+            }
+        }
+    }
+}
+
+pub enum PersonalizationService {
+    Cohere(CohereService),
+    Uninitialized,
+}
+
+impl PersonalizationService {
+    pub fn cohere(api_key: String) -> Self {
+        Self::Cohere(CohereService::new(api_key))
+    }
+
+    pub fn uninitialized() -> Self {
+        debug!("Personalization service uninitialized");
+        Self::Uninitialized
+    }
+
+    pub async fn rerank_search_results(
+        &self,
+        search_result: SearchResult,
+        personalize: Option<&Personalize>,
+        query: Option<&str>,
+    ) -> Result<SearchResult, ResponseError> {
+        match self {
+            Self::Cohere(cohere_service) => {
+                cohere_service.rerank_search_results(search_result, personalize, query).await
+            }
+            Self::Uninitialized => Ok(search_result),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::search::{HitsInfo, SearchHit};
+
+    #[tokio::test]
+    async fn test_personalization_service_without_api_key() {
+        let service = PersonalizationService::uninitialized();
+        let personalize = Personalize { user_context: Some("test user".to_string()) };
+
+        let search_result = SearchResult {
+            hits: vec![SearchHit {
+                document: serde_json::Map::new(),
+                formatted: serde_json::Map::new(),
+                matches_position: None,
+                ranking_score: Some(1.0),
+                ranking_score_details: None,
+            }],
+            query: "test".to_string(),
+            processing_time_ms: 10,
+            hits_info: HitsInfo::OffsetLimit { limit: 1, offset: 0, estimated_total_hits: 1 },
+            facet_distribution: None,
+            facet_stats: None,
+            semantic_hit_count: None,
+            degraded: false,
+            used_negative_operator: false,
+        };
+
+        let result = service
+            .rerank_search_results(search_result.clone(), Some(&personalize), Some("test"))
+            .await;
+        assert!(result.is_ok());
+
+        // Should return original results when no API key is provided
+        let reranked_result = result.unwrap();
+        assert_eq!(reranked_result.hits.len(), search_result.hits.len());
+    }
+
+    #[tokio::test]
+    async fn test_personalization_service_with_user_context_only() {
+        let service = PersonalizationService::cohere("fake_key".to_string());
+        let personalize = Personalize { user_context: Some("test user".to_string()) };
+
+        let search_result = SearchResult {
+            hits: vec![SearchHit {
+                document: serde_json::Map::new(),
+                formatted: serde_json::Map::new(),
+                matches_position: None,
+                ranking_score: Some(1.0),
+                ranking_score_details: None,
+            }],
+            query: "test".to_string(),
+            processing_time_ms: 10,
+            hits_info: HitsInfo::OffsetLimit { limit: 1, offset: 0, estimated_total_hits: 1 },
+            facet_distribution: None,
+            facet_stats: None,
+            semantic_hit_count: None,
+            degraded: false,
+            used_negative_operator: false,
+        };
+
+        let result =
+            service.rerank_search_results(search_result.clone(), Some(&personalize), None).await;
+        assert!(result.is_ok());
+
+        // Should attempt reranking with user context only
+        let reranked_result = result.unwrap();
+        assert_eq!(reranked_result.hits.len(), search_result.hits.len());
+    }
+
+    #[tokio::test]
+    async fn test_personalization_service_with_query_only() {
+        let service = PersonalizationService::cohere("fake_key".to_string());
+
+        let search_result = SearchResult {
+            hits: vec![SearchHit {
+                document: serde_json::Map::new(),
+                formatted: serde_json::Map::new(),
+                matches_position: None,
+                ranking_score: Some(1.0),
+                ranking_score_details: None,
+            }],
+            query: "test".to_string(),
+            processing_time_ms: 10,
+            hits_info: HitsInfo::OffsetLimit { limit: 1, offset: 0, estimated_total_hits: 1 },
+            facet_distribution: None,
+            facet_stats: None,
+            semantic_hit_count: None,
+            degraded: false,
+            used_negative_operator: false,
+        };
+
+        let result = service.rerank_search_results(search_result.clone(), None, Some("test")).await;
+        assert!(result.is_ok());
+
+        // Should attempt reranking with query only
+        let reranked_result = result.unwrap();
+        assert_eq!(reranked_result.hits.len(), search_result.hits.len());
+    }
+
+    #[tokio::test]
+    async fn test_personalization_service_both_none() {
+        let service = PersonalizationService::cohere("fake_key".to_string());
+
+        let search_result = SearchResult {
+            hits: vec![SearchHit {
+                document: serde_json::Map::new(),
+                formatted: serde_json::Map::new(),
+                matches_position: None,
+                ranking_score: Some(1.0),
+                ranking_score_details: None,
+            }],
+            query: "test".to_string(),
+            processing_time_ms: 10,
+            hits_info: HitsInfo::OffsetLimit { limit: 1, offset: 0, estimated_total_hits: 1 },
+            facet_distribution: None,
+            facet_stats: None,
+            semantic_hit_count: None,
+            degraded: false,
+            used_negative_operator: false,
+        };
+
+        let result = service.rerank_search_results(search_result.clone(), None, None).await;
+        assert!(result.is_ok());
+
+        // Should return original results when both query and user_context are None
+        let reranked_result = result.unwrap();
+        assert_eq!(reranked_result.hits.len(), search_result.hits.len());
+    }
+}

crates/meilisearch/src/routes/indexes/compact.rs

@@ -1,84 +0,0 @@
-use actix_web::web::{self, Data};
-use actix_web::{HttpRequest, HttpResponse};
-use index_scheduler::IndexScheduler;
-use meilisearch_types::error::ResponseError;
-use meilisearch_types::index_uid::IndexUid;
-use meilisearch_types::keys::actions;
-use meilisearch_types::tasks::KindWithContent;
-use tracing::debug;
-use utoipa::OpenApi;
-
-use super::ActionPolicy;
-use crate::analytics::Analytics;
-use crate::extractors::authentication::GuardedData;
-use crate::extractors::sequential_extractor::SeqHandler;
-use crate::routes::SummarizedTaskView;
-
-#[derive(OpenApi)]
-#[openapi(
-    paths(compact),
-    tags(
-        (
-            name = "Compact an index",
-            description = "The /compact route uses compacts the database to reorganize and make it smaller and more efficient.",
-            external_docs(url = "https://www.meilisearch.com/docs/reference/api/compact"),
-        ),
-    ),
-)]
-pub struct CompactApi;
-
-pub fn configure(cfg: &mut web::ServiceConfig) {
-    cfg.service(web::resource("").route(web::post().to(SeqHandler(compact))));
-}
-
-/// Compact an index
-#[utoipa::path(
-    post,
-    path = "{indexUid}/compact",
-    tag = "Compact an index",
-    security(("Bearer" = ["search", "*"])),
-    params(("indexUid" = String, Path, example = "movies", description = "Index Unique Identifier", nullable = false)),
-    responses(
-        (status = ACCEPTED, description = "Task successfully enqueued", body = SummarizedTaskView, content_type = "application/json", example = json!(
-            {
-                "taskUid": 147,
-                "indexUid": null,
-                "status": "enqueued",
-                "type": "documentDeletion",
-                "enqueuedAt": "2024-08-08T17:05:55.791772Z"
-            }
-        )),
-        (status = 401, description = "The authorization header is missing", body = ResponseError, content_type = "application/json", example = json!(
-            {
-                "message": "The Authorization header is missing. It must use the bearer authorization method.",
-                "code": "missing_authorization_header",
-                "type": "auth",
-                "link": "https://docs.meilisearch.com/errors#missing_authorization_header"
-            }
-        )),
-    )
-)]
-pub async fn compact(
-    index_scheduler: GuardedData<ActionPolicy<{ actions::INDEXES_COMPACT }>, Data<IndexScheduler>>,
-    index_uid: web::Path<String>,
-    req: HttpRequest,
-    analytics: web::Data<Analytics>,
-) -> Result<HttpResponse, ResponseError> {
-    let index_uid = IndexUid::try_from(index_uid.into_inner())?;
-
-    analytics.publish(IndexCompacted::default(), &req);
-
-    let task = KindWithContent::IndexCompaction { index_uid: index_uid.to_string() };
-    let task =
-        match tokio::task::spawn_blocking(move || index_scheduler.register(task, None, false))
-            .await?
-        {
-            Ok(task) => task,
-            Err(e) => return Err(e.into()),
-        };
-
-    debug!(returns = ?task, "Compact the {index_uid} index");
-    Ok(HttpResponse::Accepted().json(SummarizedTaskView::from(task)))
-}
-
-crate::empty_analytics!(IndexCompacted, "Index Compacted");

crates/meilisearch/src/routes/indexes/facet_search.rs

@@ -343,6 +343,7 @@ impl From<FacetSearchQuery> for SearchQuery {
             hybrid,
             ranking_score_threshold,
             locales,
+            personalize: None,
         }
     }
 }

crates/meilisearch/src/routes/indexes/mod.rs

@@ -28,7 +28,6 @@ use crate::extractors::sequential_extractor::SeqHandler;
 use crate::routes::is_dry_run;
 use crate::Opt;
 
-pub mod compact;
 pub mod documents;
 mod enterprise_edition;
 pub mod facet_search;
@@ -50,9 +49,8 @@ pub use enterprise_edition::proxy::{PROXY_ORIGIN_REMOTE_HEADER, PROXY_ORIGIN_TAS
         (path = "/", api = facet_search::FacetSearchApi),
         (path = "/", api = similar::SimilarApi),
         (path = "/", api = settings::SettingsApi),
-        (path = "/", api = compact::CompactApi),
     ),
-    paths(list_indexes, create_index, get_index, update_index, delete_index, get_index_stats, compact::compact),
+    paths(list_indexes, create_index, get_index, update_index, delete_index, get_index_stats),
     tags(
         (
             name = "Indexes",
@@ -82,8 +80,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
             .service(web::scope("/search").configure(search::configure))
             .service(web::scope("/facet-search").configure(facet_search::configure))
             .service(web::scope("/similar").configure(similar::configure))
-            .service(web::scope("/settings").configure(settings::configure))
-            .service(web::scope("/compact").configure(compact::configure)),
+            .service(web::scope("/settings").configure(settings::configure)),
     );
 }
 

crates/meilisearch/src/routes/indexes/search.rs

@@ -13,7 +13,6 @@ use meilisearch_types::serde_cs::vec::CS;
 use serde_json::Value;
 use tracing::debug;
 use utoipa::{IntoParams, OpenApi};
-use uuid::Uuid;
 
 use crate::analytics::Analytics;
 use crate::error::MeilisearchHttpError;
@@ -22,10 +21,9 @@ use crate::extractors::authentication::GuardedData;
 use crate::extractors::sequential_extractor::SeqHandler;
 use crate::metrics::MEILISEARCH_DEGRADED_SEARCH_REQUESTS;
 use crate::routes::indexes::search_analytics::{SearchAggregator, SearchGET, SearchPOST};
-use crate::routes::parse_include_metadata_header;
 use crate::search::{
-    add_search_rules, perform_search, HybridQuery, MatchingStrategy, RankingScoreThreshold,
-    RetrieveVectors, SearchKind, SearchParams, SearchQuery, SearchResult, SemanticRatio,
+    add_search_rules, perform_search, HybridQuery, MatchingStrategy, Personalize,
+    RankingScoreThreshold, RetrieveVectors, SearchKind, SearchQuery, SearchResult, SemanticRatio,
     DEFAULT_CROP_LENGTH, DEFAULT_CROP_MARKER, DEFAULT_HIGHLIGHT_POST_TAG,
     DEFAULT_HIGHLIGHT_PRE_TAG, DEFAULT_SEARCH_LIMIT, DEFAULT_SEARCH_OFFSET, DEFAULT_SEMANTIC_RATIO,
 };
@@ -134,6 +132,8 @@ pub struct SearchQueryGet {
     #[deserr(default, error = DeserrQueryParamError<InvalidSearchLocales>)]
     #[param(value_type = Vec<Locale>, explode = false)]
     pub locales: Option<CS<Locale>>,
+    #[deserr(default, error = DeserrQueryParamError<InvalidSearchPersonalizeUserContext>)]
+    pub personalize_user_context: Option<String>,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, deserr::Deserr)]
@@ -205,6 +205,10 @@ impl TryFrom<SearchQueryGet> for SearchQuery {
             ));
         }
 
+        let personalize = other
+            .personalize_user_context
+            .map(|user_context| Personalize { user_context: Some(user_context) });
+
         Ok(Self {
             q: other.q,
             // `media` not supported for `GET`
@@ -234,6 +238,7 @@ impl TryFrom<SearchQueryGet> for SearchQuery {
             hybrid,
             ranking_score_threshold: other.ranking_score_threshold.map(|o| o.0),
             locales: other.locales.map(|o| o.into_iter().collect()),
+            personalize,
         })
     }
 }
@@ -322,13 +327,13 @@ pub fn fix_sort_query_parameters(sort_query: &str) -> Vec<String> {
 pub async fn search_with_url_query(
     index_scheduler: GuardedData<ActionPolicy<{ actions::SEARCH }>, Data<IndexScheduler>>,
     search_queue: web::Data<SearchQueue>,
+    personalization_service: web::Data<crate::personalization::PersonalizationService>,
     index_uid: web::Path<String>,
     params: AwebQueryParameter<SearchQueryGet, DeserrQueryParamError>,
     req: HttpRequest,
     analytics: web::Data<Analytics>,
 ) -> Result<HttpResponse, ResponseError> {
-    let request_uid = Uuid::now_v7();
-    debug!(request_uid = ?request_uid, parameters = ?params, "Search get");
+    debug!(parameters = ?params, "Search get");
     let index_uid = IndexUid::try_from(index_uid.into_inner())?;
 
     let mut query: SearchQuery = params.into_inner().try_into()?;
@@ -345,21 +350,20 @@ pub async fn search_with_url_query(
     let search_kind =
         search_kind(&query, index_scheduler.get_ref(), index_uid.to_string(), &index)?;
     let retrieve_vector = RetrieveVectors::new(query.retrieve_vectors);
-    let permit = search_queue.try_get_search_permit().await?;
-    let include_metadata = parse_include_metadata_header(&req);
 
+    // Extract personalization and query string before moving query
+    let personalize = query.personalize.clone();
+    let query_str = query.q.clone();
+
+    let permit = search_queue.try_get_search_permit().await?;
     let search_result = tokio::task::spawn_blocking(move || {
         perform_search(
-            SearchParams {
-                index_uid: index_uid.to_string(),
-                query,
-                search_kind,
-                retrieve_vectors: retrieve_vector,
-                features: index_scheduler.features(),
-                request_uid,
-                include_metadata,
-            },
+            index_uid.to_string(),
             &index,
+            query,
+            search_kind,
+            retrieve_vector,
+            index_scheduler.features(),
         )
     })
     .await;
@@ -370,9 +374,14 @@ pub async fn search_with_url_query(
     }
     analytics.publish(aggregate, &req);
 
-    let search_result = search_result?;
+    let mut search_result = search_result?;
 
-    debug!(request_uid = ?request_uid, returns = ?search_result, "Search get");
+    // Apply personalization if requested
+    search_result = personalization_service
+        .rerank_search_results(search_result, personalize.as_ref(), query_str.as_deref())
+        .await?;
+
+    debug!(returns = ?search_result, "Search get");
     Ok(HttpResponse::Ok().json(search_result))
 }
 
@@ -435,16 +444,16 @@ pub async fn search_with_url_query(
 pub async fn search_with_post(
     index_scheduler: GuardedData<ActionPolicy<{ actions::SEARCH }>, Data<IndexScheduler>>,
     search_queue: web::Data<SearchQueue>,
+    personalization_service: web::Data<crate::personalization::PersonalizationService>,
     index_uid: web::Path<String>,
     params: AwebJson<SearchQuery, DeserrJsonError>,
     req: HttpRequest,
     analytics: web::Data<Analytics>,
 ) -> Result<HttpResponse, ResponseError> {
     let index_uid = IndexUid::try_from(index_uid.into_inner())?;
-    let request_uid = Uuid::now_v7();
 
     let mut query = params.into_inner();
-    debug!(request_uid = ?request_uid, parameters = ?query, "Search post");
+    debug!(parameters = ?query, "Search post");
 
     // Tenant token search_rules.
     if let Some(search_rules) = index_scheduler.filters().get_index_search_rules(&index_uid) {
@@ -459,21 +468,19 @@ pub async fn search_with_post(
         search_kind(&query, index_scheduler.get_ref(), index_uid.to_string(), &index)?;
     let retrieve_vectors = RetrieveVectors::new(query.retrieve_vectors);
 
-    let include_metadata = parse_include_metadata_header(&req);
+    // Extract personalization and query string before moving query
+    let personalize = query.personalize.clone();
+    let query_str = query.q.clone();
 
     let permit = search_queue.try_get_search_permit().await?;
     let search_result = tokio::task::spawn_blocking(move || {
         perform_search(
-            SearchParams {
-                index_uid: index_uid.to_string(),
-                query,
-                search_kind,
-                retrieve_vectors,
-                features: index_scheduler.features(),
-                request_uid,
-                include_metadata,
-            },
+            index_uid.to_string(),
             &index,
+            query,
+            search_kind,
+            retrieve_vectors,
+            index_scheduler.features(),
         )
     })
     .await;
@@ -487,9 +494,14 @@ pub async fn search_with_post(
     }
     analytics.publish(aggregate, &req);
 
-    let search_result = search_result?;
+    let mut search_result = search_result?;
 
-    debug!(request_uid = ?request_uid, returns = ?search_result, "Search post");
+    // Apply personalization if requested
+    search_result = personalization_service
+        .rerank_search_results(search_result, personalize.as_ref(), query_str.as_deref())
+        .await?;
+
+    debug!(returns = ?search_result, "Search post");
     Ok(HttpResponse::Ok().json(search_result))
 }
 

crates/meilisearch/src/routes/indexes/search_analytics.rs

@@ -7,6 +7,7 @@ use serde_json::{json, Value};
 
 use crate::aggregate_methods;
 use crate::analytics::{Aggregate, AggregateMethod};
+use crate::metrics::MEILISEARCH_PERSONALIZED_SEARCH_REQUESTS;
 use crate::search::{
     SearchQuery, SearchResult, DEFAULT_CROP_LENGTH, DEFAULT_CROP_MARKER,
     DEFAULT_HIGHLIGHT_POST_TAG, DEFAULT_HIGHLIGHT_PRE_TAG, DEFAULT_SEARCH_LIMIT,
@@ -95,6 +96,9 @@ pub struct SearchAggregator<Method: AggregateMethod> {
     show_ranking_score_details: bool,
     ranking_score_threshold: bool,
 
+    // personalization
+    total_personalized: usize,
+
     marker: std::marker::PhantomData<Method>,
 }
 
@@ -129,6 +133,7 @@ impl<Method: AggregateMethod> SearchAggregator<Method> {
             hybrid,
             ranking_score_threshold,
             locales,
+            personalize,
         } = query;
 
         let mut ret = Self::default();
@@ -204,6 +209,12 @@ impl<Method: AggregateMethod> SearchAggregator<Method> {
             ret.locales = locales.iter().copied().collect();
         }
 
+        // personalization
+        if personalize.is_some() {
+            ret.total_personalized = 1;
+            MEILISEARCH_PERSONALIZED_SEARCH_REQUESTS.inc();
+        }
+
         ret.highlight_pre_tag = *highlight_pre_tag != DEFAULT_HIGHLIGHT_PRE_TAG();
         ret.highlight_post_tag = *highlight_post_tag != DEFAULT_HIGHLIGHT_POST_TAG();
         ret.crop_marker = *crop_marker != DEFAULT_CROP_MARKER();
@@ -234,8 +245,6 @@ impl<Method: AggregateMethod> SearchAggregator<Method> {
             facet_stats: _,
             degraded,
             used_negative_operator,
-            request_uid: _,
-            metadata: _,
         } = result;
 
         self.total_succeeded = self.total_succeeded.saturating_add(1);
@@ -296,6 +305,7 @@ impl<Method: AggregateMethod> Aggregate for SearchAggregator<Method> {
             total_used_negative_operator,
             ranking_score_threshold,
             mut locales,
+            total_personalized,
             marker: _,
         } = *new;
 
@@ -381,6 +391,9 @@ impl<Method: AggregateMethod> Aggregate for SearchAggregator<Method> {
         // locales
         self.locales.append(&mut locales);
 
+        // personalization
+        self.total_personalized = self.total_personalized.saturating_add(total_personalized);
+
         self
     }
 
@@ -426,6 +439,7 @@ impl<Method: AggregateMethod> Aggregate for SearchAggregator<Method> {
             total_used_negative_operator,
             ranking_score_threshold,
             locales,
+            total_personalized,
             marker: _,
         } = *self;
 
@@ -499,6 +513,9 @@ impl<Method: AggregateMethod> Aggregate for SearchAggregator<Method> {
                 "show_ranking_score_details": show_ranking_score_details,
                 "ranking_score_threshold": ranking_score_threshold,
             },
+            "personalization": {
+                "total_personalized": total_personalized,
+            },
         })
     }
 }

crates/meilisearch/src/routes/mod.rs

@@ -45,7 +45,6 @@ use crate::routes::webhooks::{WebhookResults, WebhookSettings, WebhookWithMetada
 use crate::search::{
     FederatedSearch, FederatedSearchResult, Federation, FederationOptions, MergeFacets,
     SearchQueryWithIndex, SearchResultWithIndex, SimilarQuery, SimilarResult,
-    INCLUDE_METADATA_HEADER,
 };
 use crate::search_queue::SearchQueue;
 use crate::Opt;
@@ -185,18 +184,6 @@ pub fn is_dry_run(req: &HttpRequest, opt: &Opt) -> Result<bool, ResponseError> {
         .is_some_and(|s| s.to_lowercase() == "true"))
 }
 
-/// Parse the `Meili-Include-Metadata` header from an HTTP request.
-///
-/// Returns `true` if the header is present and set to "true" or "1" (case-insensitive).
-/// Returns `false` if the header is not present or has any other value.
-pub fn parse_include_metadata_header(req: &HttpRequest) -> bool {
-    req.headers()
-        .get(INCLUDE_METADATA_HEADER)
-        .and_then(|h| h.to_str().ok())
-        .map(|v| matches!(v.to_lowercase().as_str(), "true" | "1"))
-        .unwrap_or(false)
-}
-
 #[derive(Debug, Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct SummarizedTaskView {

crates/meilisearch/src/routes/multi_search.rs

@@ -9,7 +9,6 @@ use meilisearch_types::keys::actions;
 use serde::Serialize;
 use tracing::debug;
 use utoipa::{OpenApi, ToSchema};
-use uuid::Uuid;
 
 use super::multi_search_analytics::MultiSearchAggregator;
 use crate::analytics::Analytics;
@@ -18,11 +17,10 @@ use crate::extractors::authentication::policies::ActionPolicy;
 use crate::extractors::authentication::{AuthenticationError, GuardedData};
 use crate::extractors::sequential_extractor::SeqHandler;
 use crate::routes::indexes::search::search_kind;
-use crate::routes::parse_include_metadata_header;
 use crate::search::{
     add_search_rules, perform_federated_search, perform_search, FederatedSearch,
-    FederatedSearchResult, RetrieveVectors, SearchParams, SearchQueryWithIndex,
-    SearchResultWithIndex, PROXY_SEARCH_HEADER, PROXY_SEARCH_HEADER_VALUE,
+    FederatedSearchResult, RetrieveVectors, SearchQueryWithIndex, SearchResultWithIndex,
+    PROXY_SEARCH_HEADER, PROXY_SEARCH_HEADER_VALUE,
 };
 use crate::search_queue::SearchQueue;
 
@@ -153,7 +151,6 @@ pub async fn multi_search_with_post(
     // Since we don't want to process half of the search requests and then get a permit refused
     // we're going to get one permit for the whole duration of the multi-search request.
     let permit = search_queue.try_get_search_permit().await?;
-    let request_uid = Uuid::now_v7();
 
     let federated_search = params.into_inner();
 
@@ -189,31 +186,16 @@ pub async fn multi_search_with_post(
         err
     })?;
 
-    let include_metadata = parse_include_metadata_header(&req);
     let response = match federation {
         Some(federation) => {
-            debug!(
-                request_uid = ?request_uid,
-                federation = ?federation,
-                parameters = ?queries,
-                "Federated-search"
-            );
-
             // check remote header
             let is_proxy = req
                 .headers()
                 .get(PROXY_SEARCH_HEADER)
                 .is_some_and(|value| value.as_bytes() == PROXY_SEARCH_HEADER_VALUE.as_bytes());
-            let search_result = perform_federated_search(
-                &index_scheduler,
-                queries,
-                federation,
-                features,
-                is_proxy,
-                request_uid,
-                include_metadata,
-            )
-            .await;
+            let search_result =
+                perform_federated_search(&index_scheduler, queries, federation, features, is_proxy)
+                    .await;
             permit.drop().await;
 
             if search_result.is_ok() {
@@ -221,13 +203,6 @@ pub async fn multi_search_with_post(
             }
 
             analytics.publish(multi_aggregate, &req);
-
-            debug!(
-                request_uid = ?request_uid,
-                returns = ?search_result,
-                "Federated-search"
-            );
-
             HttpResponse::Ok().json(search_result?)
         }
         None => {
@@ -241,12 +216,7 @@ pub async fn multi_search_with_post(
                     .map(SearchQueryWithIndex::into_index_query_federation)
                     .enumerate()
                 {
-                    debug!(
-                        request_uid = ?request_uid,
-                        on_index = query_index,
-                        parameters = ?query,
-                        "Multi-search"
-                    );
+                    debug!(on_index = query_index, parameters = ?query, "Multi-search");
 
                     if federation_options.is_some() {
                         return Err((
@@ -282,16 +252,12 @@ pub async fn multi_search_with_post(
 
                     let search_result = tokio::task::spawn_blocking(move || {
                         perform_search(
-                            SearchParams {
-                                index_uid: index_uid_str.clone(),
-                                query,
-                                search_kind,
-                                retrieve_vectors: retrieve_vector,
-                                features,
-                                request_uid,
-                                include_metadata,
-                            },
+                            index_uid_str.clone(),
                             &index,
+                            query,
+                            search_kind,
+                            retrieve_vector,
+                            features,
                         )
                     })
                     .await
@@ -320,11 +286,7 @@ pub async fn multi_search_with_post(
                 err
             })?;
 
-            debug!(
-                request_uid = ?request_uid,
-                returns = ?search_results,
-                "Multi-search"
-            );
+            debug!(returns = ?search_results, "Multi-search");
 
             HttpResponse::Ok().json(SearchResults { results: search_results })
         }

crates/meilisearch/src/routes/multi_search_analytics.rs

@@ -67,6 +67,7 @@ impl MultiSearchAggregator {
             hybrid: _,
             ranking_score_threshold: _,
             locales: _,
+            personalize: _,
         } in &federated_search.queries
         {
             if let Some(federation_options) = federation_options {

crates/meilisearch/src/routes/tasks_test.rs

@@ -226,14 +226,14 @@ mod tests {
         {
             let params = "types=createIndex";
             let err = deserr_query_params::<TaskDeletionOrCancelationQuery>(params).unwrap_err();
-            snapshot!(meili_snap::json_string!(err), @r###"
+            snapshot!(meili_snap::json_string!(err), @r#"
             {
-              "message": "Invalid value in parameter `types`: `createIndex` is not a valid task type. Available types are `documentAdditionOrUpdate`, `documentEdition`, `documentDeletion`, `settingsUpdate`, `indexCreation`, `indexDeletion`, `indexUpdate`, `indexSwap`, `taskCancelation`, `taskDeletion`, `dumpCreation`, `snapshotCreation`, `export`, `upgradeDatabase`, `indexCompaction`.",
+              "message": "Invalid value in parameter `types`: `createIndex` is not a valid task type. Available types are `documentAdditionOrUpdate`, `documentEdition`, `documentDeletion`, `settingsUpdate`, `indexCreation`, `indexDeletion`, `indexUpdate`, `indexSwap`, `taskCancelation`, `taskDeletion`, `dumpCreation`, `snapshotCreation`, `export`, `upgradeDatabase`.",
               "code": "invalid_task_types",
               "type": "invalid_request",
               "link": "https://docs.meilisearch.com/errors#invalid_task_types"
             }
-            "###);
+            "#);
         }
     }
     #[test]

crates/meilisearch/src/search/federated/perform.rs

@@ -17,13 +17,11 @@ use meilisearch_types::milli::vector::Embedding;
 use meilisearch_types::milli::{self, DocumentId, OrderBy, TimeBudget, DEFAULT_VALUES_PER_FACET};
 use roaring::RoaringBitmap;
 use tokio::task::JoinHandle;
-use uuid::Uuid;
 
 use super::super::ranking_rules::{self, RankingRules};
 use super::super::{
     compute_facet_distribution_stats, prepare_search, AttributesFormat, ComputedFacets, HitMaker,
-    HitsInfo, RetrieveVectors, SearchHit, SearchKind, SearchMetadata, SearchQuery,
-    SearchQueryWithIndex,
+    HitsInfo, RetrieveVectors, SearchHit, SearchKind, SearchQuery, SearchQueryWithIndex,
 };
 use super::proxy::{proxy_search, ProxySearchError, ProxySearchParams};
 use super::types::{
@@ -41,58 +39,32 @@ pub async fn perform_federated_search(
     federation: Federation,
     features: RoFeatures,
     is_proxy: bool,
-    request_uid: Uuid,
-    include_metadata: bool,
 ) -> Result<FederatedSearchResult, ResponseError> {
     if is_proxy {
         features.check_network("Performing a remote federated search")?;
     }
     let before_search = std::time::Instant::now();
-
-    let timeout = std::env::var("MEILI_EXPERIMENTAL_REMOTE_SEARCH_TIMEOUT_SECONDS")
-        .ok()
-        .map(|p| p.parse().unwrap())
-        .unwrap_or(25);
-
-    let deadline = before_search + std::time::Duration::from_secs(timeout);
+    let deadline = before_search + std::time::Duration::from_secs(9);
 
     let required_hit_count = federation.limit + federation.offset;
     let retrieve_vectors = queries.iter().any(|q| q.retrieve_vectors);
 
     let network = index_scheduler.network();
 
-    // Preconstruct metadata keeping the original queries order for later metadata building
-    let precomputed_query_metadata: Option<Vec<_>> = include_metadata.then(|| {
-        queries
-            .iter()
-            .map(|q| {
-                (
-                    q.index_uid.to_string(),
-                    q.federation_options.as_ref().and_then(|o| o.remote.clone()),
-                )
-            })
-            .collect()
-    });
-
     // this implementation partition the queries by index to guarantee an important property:
     // - all the queries to a particular index use the same read transaction.
     // This is an important property, otherwise we cannot guarantee the self-consistency of the results.
 
     // 1. partition queries by host and index
     let mut partitioned_queries = PartitionedQueries::new();
-
     for (query_index, federated_query) in queries.into_iter().enumerate() {
         partitioned_queries.partition(federated_query, query_index, &network, features)?
     }
 
     // 2. perform queries, merge and make hits index by index
     // 2.1. start remote queries
-    let remote_search = RemoteSearch::start(
-        partitioned_queries.remote_queries_by_host,
-        &federation,
-        deadline,
-        include_metadata,
-    );
+    let remote_search =
+        RemoteSearch::start(partitioned_queries.remote_queries_by_host, &federation, deadline);
 
     // 2.2. concurrently execute local queries
     let params = SearchByIndexParams {
@@ -134,25 +106,11 @@ pub async fn perform_federated_search(
     let after_waiting_remote_results = std::time::Instant::now();
 
     // 3. merge hits and metadata across indexes and hosts
-
-    // 3.1. Build metadata in the same order as the original queries
-    let query_metadata = precomputed_query_metadata.map(|precomputed_query_metadata| {
-        // If a remote is present, set the local remote name
-        let local_remote_name = network.local.clone().filter(|_| partitioned_queries.has_remote);
-
-        build_query_metadata(
-            precomputed_query_metadata,
-            local_remote_name,
-            &remote_results,
-            &results_by_index,
-        )
-    });
-
-    // 3.2. merge federation metadata
+    // 3.1. merge metadata
     let (estimated_total_hits, degraded, used_negative_operator, facets, max_remote_duration) =
         merge_metadata(&mut results_by_index, &remote_results);
 
-    // 3.3. merge hits
+    // 3.2. merge hits
     let merged_hits: Vec<_> = merge_index_global_results(results_by_index, &mut remote_results)
         .skip(federation.offset)
         .take(federation.limit)
@@ -167,7 +125,7 @@ pub async fn perform_federated_search(
         .map(|hit| hit.hit())
         .collect();
 
-    // 3.4. merge query vectors
+    // 3.3. merge query vectors
     let query_vectors = if retrieve_vectors {
         for remote_results in remote_results.iter_mut() {
             if let Some(remote_vectors) = remote_results.query_vectors.take() {
@@ -186,7 +144,7 @@ pub async fn perform_federated_search(
         None
     };
 
-    // 3.5. merge facets
+    // 3.4. merge facets
     let (facet_distribution, facet_stats, facets_by_index) =
         facet_order.merge(federation.merge_facets, remote_results, facets);
 
@@ -212,8 +170,6 @@ pub async fn perform_federated_search(
         facet_stats,
         facets_by_index,
         remote_errors: partitioned_queries.has_remote.then_some(remote_errors),
-        request_uid: Some(request_uid),
-        metadata: query_metadata,
     })
 }
 
@@ -437,7 +393,6 @@ struct SearchHitByIndex {
 
 struct SearchResultByIndex {
     index: String,
-    primary_key: Option<String>,
     hits: Vec<SearchHitByIndex>,
     estimated_total_hits: usize,
     degraded: bool,
@@ -445,61 +400,6 @@ struct SearchResultByIndex {
     facets: Option<ComputedFacets>,
 }
 
-/// Builds query metadata for federated search results.
-///
-/// This function creates metadata for each query in the same order as the original queries,
-/// combining information from both local and remote search results. It handles the mapping
-/// of primary keys to their respective indexes and remotes to prevent collisions when
-/// multiple remotes have the same index_uid but different primary keys.
-fn build_query_metadata(
-    precomputed_query_metadata: Vec<(String, Option<String>)>,
-    local_remote_name: Option<String>,
-    remote_results: &[FederatedSearchResult],
-    results_by_index: &[SearchResultByIndex],
-) -> Vec<SearchMetadata> {
-    // Create a map of (remote, index_uid) -> primary_key for quick lookup
-    // This prevents collisions when multiple remotes have the same index_uid but different primary keys
-    let mut primary_key_per_index = std::collections::HashMap::new();
-
-    // Build metadata for remote results
-    for remote_result in remote_results {
-        if let Some(remote_metadata) = &remote_result.metadata {
-            for remote_meta in remote_metadata {
-                if let SearchMetadata {
-                    remote: Some(remote_name),
-                    index_uid,
-                    primary_key: Some(primary_key),
-                    ..
-                } = remote_meta
-                {
-                    let key = (Some(remote_name), index_uid);
-                    primary_key_per_index.insert(key, primary_key);
-                }
-            }
-        }
-    }
-
-    // Build metadata for local results
-    for local_meta in results_by_index {
-        if let SearchResultByIndex { index, primary_key: Some(primary_key), .. } = local_meta {
-            let key = (None, index);
-            primary_key_per_index.insert(key, primary_key);
-        }
-    }
-
-    // Build metadata in the same order as the original queries
-    let mut query_metadata = Vec::new();
-    for (index_uid, remote) in precomputed_query_metadata {
-        let primary_key =
-            primary_key_per_index.get(&(remote.as_ref(), &index_uid)).map(|pk| pk.to_string());
-        let query_uid = Uuid::now_v7();
-        // if the remote is not set, use the local remote name
-        let remote = remote.or_else(|| local_remote_name.clone());
-        query_metadata.push(SearchMetadata { query_uid, primary_key, index_uid, remote });
-    }
-    query_metadata
-}
-
 fn merge_metadata(
     results_by_index: &mut Vec<SearchResultByIndex>,
     remote_results: &Vec<FederatedSearchResult>,
@@ -511,7 +411,6 @@ fn merge_metadata(
     let mut max_remote_duration = Duration::ZERO;
     for SearchResultByIndex {
         index,
-        primary_key: _,
         hits: _,
         estimated_total_hits: estimated_total_hits_by_index,
         facets: facets_by_index,
@@ -540,8 +439,6 @@ fn merge_metadata(
         degraded: degraded_for_host,
         used_negative_operator: host_used_negative_operator,
         remote_errors: _,
-        metadata: _,
-        request_uid: _,
     } in remote_results
     {
         let this_remote_duration = Duration::from_millis(*processing_time_ms as u64);
@@ -669,12 +566,7 @@ struct RemoteSearch {
 }
 
 impl RemoteSearch {
-    fn start(
-        queries: RemoteQueriesByHost,
-        federation: &Federation,
-        deadline: Instant,
-        include_metadata: bool,
-    ) -> Self {
+    fn start(queries: RemoteQueriesByHost, federation: &Federation, deadline: Instant) -> Self {
         let mut in_flight_remote_queries = BTreeMap::new();
         let client = reqwest::ClientBuilder::new()
             .connect_timeout(std::time::Duration::from_millis(200))
@@ -694,10 +586,7 @@ impl RemoteSearch {
                     // never merge distant facets
                     proxy_federation.merge_facets = None;
                     let params = params.clone();
-                    async move {
-                        proxy_search(&node, queries, proxy_federation, &params, include_metadata)
-                            .await
-                    }
+                    async move { proxy_search(&node, queries, proxy_federation, &params).await }
                 }),
             );
         }
@@ -741,13 +630,6 @@ impl RemoteSearch {
                             continue 'remote_queries;
                         }
 
-                        // Add remote name to metadata
-                        if let Some(metadata) = res.metadata.as_mut() {
-                            for meta in metadata {
-                                meta.remote = Some(node_name.clone());
-                            }
-                        }
-
                         federation.insert(
                             FEDERATION_REMOTE.to_string(),
                             serde_json::Value::String(node_name.clone()),
@@ -843,7 +725,6 @@ impl SearchByIndex {
             }
         };
         let rtxn = index.read_txn()?;
-        let primary_key = index.primary_key(&rtxn)?.map(|pk| pk.to_string());
         let criteria = index.criteria(&rtxn)?;
         let dictionary = index.dictionary(&rtxn)?;
         let dictionary: Option<Vec<_>> =
@@ -870,12 +751,6 @@ impl SearchByIndex {
             return Err(error);
         }
         let mut results_by_query = Vec::with_capacity(queries.len());
-
-        // all queries for an index share the same budget
-        let time_budget = match cutoff {
-            Some(cutoff) => TimeBudget::new(Duration::from_millis(cutoff)),
-            None => TimeBudget::default(),
-        };
         for QueryByIndex { query, weight, query_index } in queries {
             // use an immediately invoked lambda to capture the result without returning from the function
 
@@ -945,13 +820,17 @@ impl SearchByIndex {
 
                 let retrieve_vectors = RetrieveVectors::new(query.retrieve_vectors);
 
+                let time_budget = match cutoff {
+                    Some(cutoff) => TimeBudget::new(Duration::from_millis(cutoff)),
+                    None => TimeBudget::default(),
+                };
+
                 let (mut search, _is_finite_pagination, _max_total_hits, _offset) = prepare_search(
                     &index,
                     &rtxn,
                     &query,
                     &search_kind,
-                    // clones of `TimeBudget` share the budget rather than restart it
-                    time_budget.clone(),
+                    time_budget,
                     params.features,
                 )?;
 
@@ -1098,7 +977,6 @@ impl SearchByIndex {
             })?;
         self.results_by_index.push(SearchResultByIndex {
             index: index_uid,
-            primary_key,
             hits: merged_result,
             estimated_total_hits,
             degraded,

crates/meilisearch/src/search/federated/proxy.rs

@@ -7,7 +7,7 @@ use serde::de::DeserializeOwned;
 use serde_json::Value;
 
 use super::types::{FederatedSearch, FederatedSearchResult, Federation};
-use crate::search::{SearchQueryWithIndex, INCLUDE_METADATA_HEADER};
+use crate::search::SearchQueryWithIndex;
 
 pub const PROXY_SEARCH_HEADER: &str = "Meili-Proxy-Search";
 pub const PROXY_SEARCH_HEADER_VALUE: &str = "true";
@@ -98,7 +98,6 @@ pub async fn proxy_search(
     queries: Vec<SearchQueryWithIndex>,
     federation: Federation,
     params: &ProxySearchParams,
-    include_metadata: bool,
 ) -> Result<FederatedSearchResult, ProxySearchError> {
     let url = format!("{}/multi-search", node.url);
 
@@ -106,12 +105,7 @@ pub async fn proxy_search(
 
     let search_api_key = node.search_api_key.as_deref();
 
-    let timeout = std::env::var("MEILI_EXPERIMENTAL_REMOTE_SEARCH_TIMEOUT_SECONDS")
-        .ok()
-        .map(|p| p.parse().unwrap())
-        .unwrap_or(25);
-
-    let max_deadline = std::time::Instant::now() + std::time::Duration::from_secs(timeout);
+    let max_deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
 
     let deadline = if let Some(deadline) = params.deadline {
         std::time::Instant::min(deadline, max_deadline)
@@ -120,16 +114,7 @@ pub async fn proxy_search(
     };
 
     for i in 0..params.try_count {
-        match try_proxy_search(
-            &url,
-            search_api_key,
-            &federated,
-            &params.client,
-            deadline,
-            include_metadata,
-        )
-        .await
-        {
+        match try_proxy_search(&url, search_api_key, &federated, &params.client, deadline).await {
             Ok(response) => return Ok(response),
             Err(retry) => {
                 let duration = retry.into_duration(i)?;
@@ -137,7 +122,7 @@ pub async fn proxy_search(
             }
         }
     }
-    try_proxy_search(&url, search_api_key, &federated, &params.client, deadline, include_metadata)
+    try_proxy_search(&url, search_api_key, &federated, &params.client, deadline)
         .await
         .map_err(Retry::into_error)
 }
@@ -148,7 +133,6 @@ async fn try_proxy_search(
     federated: &FederatedSearch,
     client: &Client,
     deadline: std::time::Instant,
-    include_metadata: bool,
 ) -> Result<FederatedSearchResult, Retry> {
     let timeout = deadline.saturating_duration_since(std::time::Instant::now());
 
@@ -159,8 +143,6 @@ async fn try_proxy_search(
         request
     };
     let request = request.header(PROXY_SEARCH_HEADER, PROXY_SEARCH_HEADER_VALUE);
-    let request =
-        if include_metadata { request.header(INCLUDE_METADATA_HEADER, "true") } else { request };
 
     let response = request.send().await;
     let response = match response {

crates/meilisearch/src/search/federated/types.rs

@@ -16,9 +16,6 @@ use meilisearch_types::milli::order_by_map::OrderByMap;
 use meilisearch_types::milli::OrderBy;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
-use uuid::Uuid;
-
-use crate::search::SearchMetadata;
 
 use super::super::{ComputedFacets, FacetStats, HitsInfo, SearchHit, SearchQueryWithIndex};
 use crate::milli::vector::Embedding;
@@ -134,10 +131,6 @@ pub struct FederatedSearchResult {
     pub facet_stats: Option<BTreeMap<String, FacetStats>>,
     #[serde(default, skip_serializing_if = "FederatedFacets::is_empty")]
     pub facets_by_index: FederatedFacets,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub request_uid: Option<Uuid>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub metadata: Option<Vec<SearchMetadata>>,
 
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub remote_errors: Option<BTreeMap<String, ResponseError>>,
@@ -163,8 +156,6 @@ impl fmt::Debug for FederatedSearchResult {
             facet_stats,
             facets_by_index,
             remote_errors,
-            request_uid,
-            metadata,
         } = self;
 
         let mut debug = f.debug_struct("SearchResult");
@@ -197,12 +188,6 @@ impl fmt::Debug for FederatedSearchResult {
         if let Some(remote_errors) = remote_errors {
             debug.field("remote_errors", &remote_errors);
         }
-        if let Some(request_uid) = request_uid {
-            debug.field("request_uid", &request_uid);
-        }
-        if let Some(metadata) = metadata {
-            debug.field("metadata", &metadata);
-        }
 
         debug.finish()
     }

crates/meilisearch/src/search/mod.rs

@@ -36,7 +36,6 @@ use serde_json::{json, Value};
 #[cfg(test)]
 mod mod_test;
 use utoipa::ToSchema;
-use uuid::Uuid;
 
 use crate::error::MeilisearchHttpError;
 
@@ -57,7 +56,13 @@ pub const DEFAULT_CROP_MARKER: fn() -> String = || "…".to_string();
 pub const DEFAULT_HIGHLIGHT_PRE_TAG: fn() -> String = || "<em>".to_string();
 pub const DEFAULT_HIGHLIGHT_POST_TAG: fn() -> String = || "</em>".to_string();
 pub const DEFAULT_SEMANTIC_RATIO: fn() -> SemanticRatio = || SemanticRatio(0.5);
-pub const INCLUDE_METADATA_HEADER: &str = "Meili-Include-Metadata";
+
+#[derive(Clone, Default, PartialEq, Deserr, ToSchema, Debug)]
+#[deserr(error = DeserrJsonError<InvalidSearchPersonalize>, rename_all = camelCase, deny_unknown_fields)]
+pub struct Personalize {
+    #[deserr(default, error = DeserrJsonError<InvalidSearchPersonalizeUserContext>)]
+    pub user_context: Option<String>,
+}
 
 #[derive(Clone, Default, PartialEq, Deserr, ToSchema)]
 #[deserr(error = DeserrJsonError, rename_all = camelCase, deny_unknown_fields)]
@@ -122,6 +127,8 @@ pub struct SearchQuery {
     pub ranking_score_threshold: Option<RankingScoreThreshold>,
     #[deserr(default, error = DeserrJsonError<InvalidSearchLocales>)]
     pub locales: Option<Vec<Locale>>,
+    #[deserr(default, error = DeserrJsonError<InvalidSearchPersonalize>, default)]
+    pub personalize: Option<Personalize>,
 }
 
 impl From<SearchParameters> for SearchQuery {
@@ -169,6 +176,7 @@ impl From<SearchParameters> for SearchQuery {
             highlight_post_tag: DEFAULT_HIGHLIGHT_POST_TAG(),
             crop_marker: DEFAULT_CROP_MARKER(),
             locales: None,
+            personalize: None,
         }
     }
 }
@@ -250,6 +258,7 @@ impl fmt::Debug for SearchQuery {
             attributes_to_search_on,
             ranking_score_threshold,
             locales,
+            personalize,
         } = self;
 
         let mut debug = f.debug_struct("SearchQuery");
@@ -338,6 +347,10 @@ impl fmt::Debug for SearchQuery {
             debug.field("locales", &locales);
         }
 
+        if let Some(personalize) = personalize {
+            debug.field("personalize", &personalize);
+        }
+
         debug.finish()
     }
 }
@@ -543,6 +556,9 @@ pub struct SearchQueryWithIndex {
     pub ranking_score_threshold: Option<RankingScoreThreshold>,
     #[deserr(default, error = DeserrJsonError<InvalidSearchLocales>, default)]
     pub locales: Option<Vec<Locale>>,
+    #[deserr(default, error = DeserrJsonError<InvalidSearchPersonalize>, default)]
+    #[serde(skip)]
+    pub personalize: Option<Personalize>,
 
     #[deserr(default)]
     pub federation_options: Option<FederationOptions>,
@@ -600,6 +616,7 @@ impl SearchQueryWithIndex {
             attributes_to_search_on,
             ranking_score_threshold,
             locales,
+            personalize,
         } = query;
 
         SearchQueryWithIndex {
@@ -631,6 +648,7 @@ impl SearchQueryWithIndex {
             attributes_to_search_on,
             ranking_score_threshold,
             locales,
+            personalize,
             federation_options,
         }
     }
@@ -666,6 +684,7 @@ impl SearchQueryWithIndex {
             hybrid,
             ranking_score_threshold,
             locales,
+            personalize,
         } = self;
         (
             index_uid,
@@ -697,6 +716,7 @@ impl SearchQueryWithIndex {
                 hybrid,
                 ranking_score_threshold,
                 locales,
+                personalize,
                 // do not use ..Default::default() here,
                 // rather add any missing field from `SearchQuery` to `SearchQueryWithIndex`
             },
@@ -837,18 +857,6 @@ pub struct SearchHit {
     pub ranking_score_details: Option<serde_json::Map<String, serde_json::Value>>,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, ToSchema)]
-#[serde(rename_all = "camelCase")]
-#[schema(rename_all = "camelCase")]
-pub struct SearchMetadata {
-    pub query_uid: Uuid,
-    pub index_uid: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub primary_key: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub remote: Option<String>,
-}
-
 #[derive(Serialize, Clone, PartialEq, ToSchema)]
 #[serde(rename_all = "camelCase")]
 #[schema(rename_all = "camelCase")]
@@ -865,10 +873,6 @@ pub struct SearchResult {
     pub facet_distribution: Option<BTreeMap<String, IndexMap<String, u64>>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub facet_stats: Option<BTreeMap<String, FacetStats>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub request_uid: Option<Uuid>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub metadata: Option<SearchMetadata>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub semantic_hit_count: Option<u32>,
@@ -890,8 +894,6 @@ impl fmt::Debug for SearchResult {
             hits_info,
             facet_distribution,
             facet_stats,
-            request_uid,
-            metadata,
             semantic_hit_count,
             degraded,
             used_negative_operator,
@@ -921,12 +923,6 @@ impl fmt::Debug for SearchResult {
         if let Some(semantic_hit_count) = semantic_hit_count {
             debug.field("semantic_hit_count", &semantic_hit_count);
         }
-        if let Some(request_uid) = request_uid {
-            debug.field("request_uid", &request_uid);
-        }
-        if let Some(metadata) = metadata {
-            debug.field("metadata", &metadata);
-        }
 
         debug.finish()
     }
@@ -951,7 +947,7 @@ pub struct SearchResultWithIndex {
     pub result: SearchResult,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, ToSchema)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, ToSchema)]
 #[serde(untagged)]
 pub enum HitsInfo {
     #[serde(rename_all = "camelCase")]
@@ -1139,28 +1135,15 @@ pub fn prepare_search<'t>(
     Ok((search, is_finite_pagination, max_total_hits, offset))
 }
 
-pub struct SearchParams {
-    pub index_uid: String,
-    pub query: SearchQuery,
-    pub search_kind: SearchKind,
-    pub retrieve_vectors: RetrieveVectors,
-    pub features: RoFeatures,
-    pub request_uid: Uuid,
-    pub include_metadata: bool,
-}
-
-pub fn perform_search(params: SearchParams, index: &Index) -> Result<SearchResult, ResponseError> {
-    let SearchParams {
-        index_uid,
-        query,
-        search_kind,
-        retrieve_vectors,
-        features,
-        request_uid,
-        include_metadata,
-    } = params;
+pub fn perform_search(
+    index_uid: String,
+    index: &Index,
+    query: SearchQuery,
+    search_kind: SearchKind,
+    retrieve_vectors: RetrieveVectors,
+    features: RoFeatures,
+) -> Result<SearchResult, ResponseError> {
     let before_search = Instant::now();
-    let index_uid_for_metadata = index_uid.clone();
     let rtxn = index.read_txn()?;
     let time_budget = match index.search_cutoff(&rtxn)? {
         Some(cutoff) => TimeBudget::new(Duration::from_millis(cutoff)),
@@ -1181,20 +1164,7 @@ pub fn perform_search(params: SearchParams, index: &Index) -> Result<SearchResul
             query_vector,
         },
         semantic_hit_count,
-    ) = search_from_kind(index_uid.clone(), search_kind, search)?;
-
-    let metadata = if include_metadata {
-        let query_uid = Uuid::now_v7();
-        let primary_key = index.primary_key(&rtxn)?.map(|pk| pk.to_string());
-        Some(SearchMetadata {
-            query_uid,
-            index_uid: index_uid_for_metadata,
-            primary_key,
-            remote: None, // Local searches don't have a remote
-        })
-    } else {
-        None
-    };
+    ) = search_from_kind(index_uid, search_kind, search)?;
 
     let SearchQuery {
         q,
@@ -1226,6 +1196,7 @@ pub fn perform_search(params: SearchParams, index: &Index) -> Result<SearchResul
         attributes_to_search_on: _,
         filter: _,
         distinct: _,
+        personalize: _,
     } = query;
 
     let format = AttributesFormat {
@@ -1277,6 +1248,7 @@ pub fn perform_search(params: SearchParams, index: &Index) -> Result<SearchResul
         .transpose()?
         .map(|ComputedFacets { distribution, stats }| (distribution, stats))
         .unzip();
+
     let result = SearchResult {
         hits: documents,
         hits_info,
@@ -1288,8 +1260,6 @@ pub fn perform_search(params: SearchParams, index: &Index) -> Result<SearchResul
         degraded,
         used_negative_operator,
         semantic_hit_count,
-        request_uid: Some(request_uid),
-        metadata,
     };
     Ok(result)
 }

crates/meilisearch/tests/auth/api_keys.rs

@@ -419,14 +419,14 @@ async fn error_add_api_key_invalid_parameters_actions() {
     let (response, code) = server.add_api_key(content).await;
 
     meili_snap::snapshot!(code, @"400 Bad Request");
-    meili_snap::snapshot!(meili_snap::json_string!(response, { ".createdAt" => "[ignored]", ".updatedAt" => "[ignored]" }), @r###"
+    meili_snap::snapshot!(meili_snap::json_string!(response, { ".createdAt" => "[ignored]", ".updatedAt" => "[ignored]" }), @r#"
     {
-      "message": "Unknown value `doc.add` at `.actions[0]`: expected one of `*`, `search`, `documents.*`, `documents.add`, `documents.get`, `documents.delete`, `indexes.*`, `indexes.create`, `indexes.get`, `indexes.update`, `indexes.delete`, `indexes.swap`, `tasks.*`, `tasks.cancel`, `tasks.delete`, `tasks.get`, `settings.*`, `settings.get`, `settings.update`, `stats.*`, `stats.get`, `metrics.*`, `metrics.get`, `dumps.*`, `dumps.create`, `snapshots.*`, `snapshots.create`, `version`, `keys.create`, `keys.get`, `keys.update`, `keys.delete`, `experimental.get`, `experimental.update`, `export`, `network.get`, `network.update`, `chatCompletions`, `chats.*`, `chats.get`, `chats.delete`, `chatsSettings.*`, `chatsSettings.get`, `chatsSettings.update`, `*.get`, `webhooks.get`, `webhooks.update`, `webhooks.delete`, `webhooks.create`, `webhooks.*`, `indexes.compact`",
+      "message": "Unknown value `doc.add` at `.actions[0]`: expected one of `*`, `search`, `documents.*`, `documents.add`, `documents.get`, `documents.delete`, `indexes.*`, `indexes.create`, `indexes.get`, `indexes.update`, `indexes.delete`, `indexes.swap`, `tasks.*`, `tasks.cancel`, `tasks.delete`, `tasks.get`, `settings.*`, `settings.get`, `settings.update`, `stats.*`, `stats.get`, `metrics.*`, `metrics.get`, `dumps.*`, `dumps.create`, `snapshots.*`, `snapshots.create`, `version`, `keys.create`, `keys.get`, `keys.update`, `keys.delete`, `experimental.get`, `experimental.update`, `export`, `network.get`, `network.update`, `chatCompletions`, `chats.*`, `chats.get`, `chats.delete`, `chatsSettings.*`, `chatsSettings.get`, `chatsSettings.update`, `*.get`, `webhooks.get`, `webhooks.update`, `webhooks.delete`, `webhooks.create`, `webhooks.*`",
       "code": "invalid_api_key_actions",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#invalid_api_key_actions"
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]

crates/meilisearch/tests/auth/errors.rs

@@ -91,14 +91,14 @@ async fn create_api_key_bad_actions() {
     // can't parse
     let (response, code) = server.add_api_key(json!({ "actions": ["doggo"] })).await;
     snapshot!(code, @"400 Bad Request");
-    snapshot!(json_string!(response), @r###"
+    snapshot!(json_string!(response), @r#"
     {
-      "message": "Unknown value `doggo` at `.actions[0]`: expected one of `*`, `search`, `documents.*`, `documents.add`, `documents.get`, `documents.delete`, `indexes.*`, `indexes.create`, `indexes.get`, `indexes.update`, `indexes.delete`, `indexes.swap`, `tasks.*`, `tasks.cancel`, `tasks.delete`, `tasks.get`, `settings.*`, `settings.get`, `settings.update`, `stats.*`, `stats.get`, `metrics.*`, `metrics.get`, `dumps.*`, `dumps.create`, `snapshots.*`, `snapshots.create`, `version`, `keys.create`, `keys.get`, `keys.update`, `keys.delete`, `experimental.get`, `experimental.update`, `export`, `network.get`, `network.update`, `chatCompletions`, `chats.*`, `chats.get`, `chats.delete`, `chatsSettings.*`, `chatsSettings.get`, `chatsSettings.update`, `*.get`, `webhooks.get`, `webhooks.update`, `webhooks.delete`, `webhooks.create`, `webhooks.*`, `indexes.compact`",
+      "message": "Unknown value `doggo` at `.actions[0]`: expected one of `*`, `search`, `documents.*`, `documents.add`, `documents.get`, `documents.delete`, `indexes.*`, `indexes.create`, `indexes.get`, `indexes.update`, `indexes.delete`, `indexes.swap`, `tasks.*`, `tasks.cancel`, `tasks.delete`, `tasks.get`, `settings.*`, `settings.get`, `settings.update`, `stats.*`, `stats.get`, `metrics.*`, `metrics.get`, `dumps.*`, `dumps.create`, `snapshots.*`, `snapshots.create`, `version`, `keys.create`, `keys.get`, `keys.update`, `keys.delete`, `experimental.get`, `experimental.update`, `export`, `network.get`, `network.update`, `chatCompletions`, `chats.*`, `chats.get`, `chats.delete`, `chatsSettings.*`, `chatsSettings.get`, `chatsSettings.update`, `*.get`, `webhooks.get`, `webhooks.update`, `webhooks.delete`, `webhooks.create`, `webhooks.*`",
       "code": "invalid_api_key_actions",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#invalid_api_key_actions"
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]

crates/meilisearch/tests/batches/errors.rs

@@ -40,14 +40,14 @@ async fn batch_bad_types() {
 
     let (response, code) = server.batches_filter("types=doggo").await;
     snapshot!(code, @"400 Bad Request");
-    snapshot!(json_string!(response), @r###"
+    snapshot!(json_string!(response), @r#"
     {
-      "message": "Invalid value in parameter `types`: `doggo` is not a valid task type. Available types are `documentAdditionOrUpdate`, `documentEdition`, `documentDeletion`, `settingsUpdate`, `indexCreation`, `indexDeletion`, `indexUpdate`, `indexSwap`, `taskCancelation`, `taskDeletion`, `dumpCreation`, `snapshotCreation`, `export`, `upgradeDatabase`, `indexCompaction`.",
+      "message": "Invalid value in parameter `types`: `doggo` is not a valid task type. Available types are `documentAdditionOrUpdate`, `documentEdition`, `documentDeletion`, `settingsUpdate`, `indexCreation`, `indexDeletion`, `indexUpdate`, `indexSwap`, `taskCancelation`, `taskDeletion`, `dumpCreation`, `snapshotCreation`, `export`, `upgradeDatabase`.",
       "code": "invalid_task_types",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#invalid_task_types"
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]

crates/meilisearch/tests/common/index.rs

@@ -516,18 +516,6 @@ impl<State> Index<'_, State> {
         self.service.post_encoded(url, query, self.encoder).await
     }
 
-    pub async fn search_with_headers(
-        &self,
-        query: Value,
-        headers: Vec<(&str, &str)>,
-    ) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}/search", urlencode(self.uid.as_ref()));
-        let body = serde_json::to_string(&query).unwrap();
-        let mut all_headers = vec![("content-type", "application/json")];
-        all_headers.extend(headers);
-        self.service.post_str(url, body, all_headers).await
-    }
-
     pub async fn search_get(&self, query: &str) -> (Value, StatusCode) {
         let url = format!("/indexes/{}/search{}", urlencode(self.uid.as_ref()), query);
         self.service.get(url).await

crates/meilisearch/tests/common/server.rs

@@ -390,17 +390,6 @@ impl<State> Server<State> {
         self.service.post("/multi-search", queries).await
     }
 
-    pub async fn multi_search_with_headers(
-        &self,
-        queries: Value,
-        headers: Vec<(&str, &str)>,
-    ) -> (Value, StatusCode) {
-        let body = serde_json::to_string(&queries).unwrap();
-        let mut all_headers = vec![("content-type", "application/json")];
-        all_headers.extend(headers);
-        self.service.post_str("/multi-search", body, all_headers).await
-    }
-
     pub async fn list_indexes_raw(&self, parameters: &str) -> (Value, StatusCode) {
         self.service.get(format!("/indexes{parameters}")).await
     }
@@ -501,8 +490,6 @@ pub fn default_settings(dir: impl AsRef<Path>) -> Opt {
             max_indexing_threads: MaxThreads::from_str("2").unwrap(),
             experimental_no_edition_2024_for_settings: false,
             experimental_no_edition_2024_for_dumps: false,
-            experimental_no_edition_2024_for_prefix_post_processing: false,
-            experimental_no_edition_2024_for_facet_post_processing: false,
         },
         experimental_enable_metrics: false,
         ..Parser::parse_from(None as Option<&str>)

crates/meilisearch/tests/documents/add_documents.rs

@@ -1853,7 +1853,7 @@ async fn add_documents_with_geo_field() {
         .await;
     snapshot!(code, @"200 OK");
     // we are expecting docs 4 and 3 first as they have geo
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }),
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }),
     @r###"
     {
       "hits": [
@@ -1885,8 +1885,7 @@ async fn add_documents_with_geo_field() {
       "processingTimeMs": "[time]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 4,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 4
     }
     "###);
 }
@@ -1941,7 +1940,7 @@ async fn update_documents_with_geo_field() {
     let (response, code) = index.search_post(json!({"sort": ["_geoPoint(10,0):asc"]})).await;
     snapshot!(code, @"200 OK");
     // we are expecting docs 4 and 3 first as they have geo
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }),
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }),
     @r###"
     {
       "hits": [
@@ -1973,8 +1972,7 @@ async fn update_documents_with_geo_field() {
       "processingTimeMs": "[time]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 4,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 4
     }
     "###);
 
@@ -2046,7 +2044,7 @@ async fn update_documents_with_geo_field() {
     let (response, code) = index.search_post(json!({"sort": ["_geoPoint(10,0):asc"]})).await;
     snapshot!(code, @"200 OK");
     // the search response should not have changed: we are expecting docs 4 and 3 first as they have geo
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }),
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }),
     @r###"
     {
       "hits": [
@@ -2079,8 +2077,7 @@ async fn update_documents_with_geo_field() {
       "processingTimeMs": "[time]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 4,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 4
     }
     "###);
 }

crates/meilisearch/tests/documents/geojson/mod.rs

@@ -14,18 +14,17 @@ async fn basic_add_settings_and_geojson_documents() {
     server.wait_task(task.uid()).await.succeeded();
 
     let (response, _) = index.search_get("?filter=_geoPolygon([0,0],[0,2],[2,2],[2,0])").await;
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }),
-    @r###"
+    snapshot!(response,
+    @r#"
     {
       "hits": [],
       "query": "",
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 0,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 0
     }
-    "###);
+    "#);
 
     let lille: serde_json::Value = serde_json::from_str(LILLE).unwrap();
     let documents = json!([
@@ -93,8 +92,8 @@ async fn basic_add_settings_and_geojson_documents() {
     "#);
 
     let (response, _code) = index.search_get("?filter=_geoPolygon([0,0],[0,2],[2,2],[2,0])").await;
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }),
-    @r###"
+    snapshot!(response,
+    @r#"
     {
       "hits": [
         {
@@ -112,10 +111,9 @@ async fn basic_add_settings_and_geojson_documents() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 1,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 1
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -176,8 +174,8 @@ async fn basic_add_geojson_documents_and_settings() {
         index.update_settings(json!({"filterableAttributes": ["_geojson"]})).await;
     server.wait_task(task.uid()).await.succeeded();
     let (response, _code) = index.search_get("?filter=_geoPolygon([0,0],[0,2],[2,2],[2,0])").await;
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }),
-    @r###"
+    snapshot!(response,
+    @r#"
     {
       "hits": [
         {
@@ -195,10 +193,9 @@ async fn basic_add_geojson_documents_and_settings() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 1,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 1
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -295,7 +292,7 @@ async fn geo_bounding_box() {
     let (response, code) =
         index.search_get("?filter=_geoBoundingBox([50.53987503447863,21.43443989912143],[43.76393151539099,0.54979129195425])&attributesToRetrieve=name").await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(response, @r#"
     {
       "hits": [
         {
@@ -354,17 +351,16 @@ async fn geo_bounding_box() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 17,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 17
     }
-    "###);
+    "#);
 
     // Between Russia and Alaska
     let (response, code) = index
         .search_get("?filter=_geoBoundingBox([70,-148],[63,152])&attributesToRetrieve=name")
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(response, @r#"
     {
       "hits": [
         {
@@ -381,41 +377,44 @@ async fn geo_bounding_box() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
-async fn bug_5904() {
-    // https://github.com/meilisearch/meilisearch/issues/5904
+async fn geo_radius() {
+    let index = shared_index_geojson_documents().await;
 
-    let server = Server::new_shared();
-    let index = server.unique_index();
-    let (response, _code) =
-        index.update_settings(json!({"filterableAttributes": ["_geojson"]})).await;
-    server.wait_task(response.uid()).await.succeeded();
-
-    let geojson = json!({
-      "id": 1,
-      "_geojson": {
-        "type": "FeatureCollection",
-        "features": [
-          {
-            "type": "Feature",
-            "geometry": {
-              "type": "Point",
-              "coordinates": [
-                4.23914,
-                48.382893
-              ]
-            },
-            "properties": {}
-          }
-        ]
-      }
-    });
-    let (response, _code) = index.add_documents(geojson, Some("id")).await;
-    server.wait_task(response.uid()).await.succeeded();
+    // 200km around Luxembourg
+    let (response, code) = index
+        .search_get("?filter=_geoRadius(49.4369862,6.5576591,200000)&attributesToRetrieve=name")
+        .await;
+    snapshot!(code, @"200 OK");
+    snapshot!(response, @r#"
+    {
+      "hits": [
+        {
+          "name": "Belgium"
+        },
+        {
+          "name": "Germany"
+        },
+        {
+          "name": "France"
+        },
+        {
+          "name": "Luxembourg"
+        },
+        {
+          "name": "Netherlands"
+        }
+      ],
+      "query": "",
+      "processingTimeMs": "[duration]",
+      "limit": 20,
+      "offset": 0,
+      "estimatedTotalHits": 5
+    }
+    "#);
 }

crates/meilisearch/tests/search/filters.rs

@@ -742,7 +742,7 @@ async fn vector_filter_all_embedders() {
             "attributesToRetrieve": ["name"]
         }))
         .await;
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -762,10 +762,9 @@ async fn vector_filter_all_embedders() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 4,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 4
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -840,7 +839,7 @@ async fn vector_filter_specific_embedder() {
             "attributesToRetrieve": ["name"]
         }))
         .await;
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -860,10 +859,9 @@ async fn vector_filter_specific_embedder() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 4,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 4
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -876,7 +874,7 @@ async fn vector_filter_user_provided() {
             "attributesToRetrieve": ["name"]
         }))
         .await;
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -887,10 +885,9 @@ async fn vector_filter_user_provided() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 1,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 1
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -903,7 +900,7 @@ async fn vector_filter_specific_fragment() {
             "attributesToRetrieve": ["name"]
         }))
         .await;
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -917,10 +914,9 @@ async fn vector_filter_specific_fragment() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 2,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 2
     }
-    "###);
+    "#);
 
     let (value, _code) = index
         .search_post(json!({
@@ -928,7 +924,7 @@ async fn vector_filter_specific_fragment() {
             "attributesToRetrieve": ["name"]
         }))
         .await;
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -945,10 +941,9 @@ async fn vector_filter_specific_fragment() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -981,17 +976,16 @@ async fn vector_filter_document_template_but_fragments_used() {
             "attributesToRetrieve": ["name"]
         }))
         .await;
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [],
       "query": "",
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 0,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 0
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -1029,7 +1023,7 @@ async fn vector_filter_document_template() {
             "attributesToRetrieve": ["name"]
         }))
         .await;
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -1046,10 +1040,9 @@ async fn vector_filter_document_template() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -1082,7 +1075,7 @@ async fn vector_filter_negation() {
             "attributesToRetrieve": ["name"]
         }))
         .await;
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -1099,10 +1092,9 @@ async fn vector_filter_negation() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -1115,7 +1107,7 @@ async fn vector_filter_or_combination() {
             "attributesToRetrieve": ["name"]
         }))
         .await;
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -1132,10 +1124,9 @@ async fn vector_filter_or_combination() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -1148,7 +1139,7 @@ async fn vector_filter_regenerate() {
             "attributesToRetrieve": ["name"]
         }))
         .await;
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -1165,8 +1156,7 @@ async fn vector_filter_regenerate() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
-    "###);
+    "#);
 }

crates/meilisearch/tests/search/geo.rs

@@ -33,7 +33,7 @@ async fn geo_bounding_box_with_string_and_number() {
             }),
             |response, code| {
                 assert_eq!(code, 200, "{response}");
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
                 {
                   "hits": [
                     {
@@ -63,8 +63,7 @@ async fn geo_bounding_box_with_string_and_number() {
                   "processingTimeMs": "[time]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 2,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 2
                 }
                 "###);
             },
@@ -85,7 +84,7 @@ async fn bug_4640() {
             }),
             |response, code| {
                 assert_eq!(code, 200, "{response}");
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
                 {
                   "hits": [
                     {
@@ -124,8 +123,7 @@ async fn bug_4640() {
                   "processingTimeMs": "[time]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 3,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 3
                 }
                 "###);
             },
@@ -149,7 +147,7 @@ async fn geo_asc_with_words() {
         &json!({"q": "jean"}),
         |response, code| {
             assert_eq!(code, 200, "{response}");
-            snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+            snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
             {
               "hits": [
                 {
@@ -181,8 +179,7 @@ async fn geo_asc_with_words() {
               "processingTimeMs": "[time]",
               "limit": 20,
               "offset": 0,
-              "estimatedTotalHits": 3,
-              "requestUid": "[uuid]"
+              "estimatedTotalHits": 3
             }
             "###);
         },
@@ -195,7 +192,7 @@ async fn geo_asc_with_words() {
         &json!({"q": "bob"}),
         |response, code| {
             assert_eq!(code, 200, "{response}");
-            snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+            snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
             {
               "hits": [
                 {
@@ -219,8 +216,7 @@ async fn geo_asc_with_words() {
               "processingTimeMs": "[time]",
               "limit": 20,
               "offset": 0,
-              "estimatedTotalHits": 2,
-              "requestUid": "[uuid]"
+              "estimatedTotalHits": 2
             }
             "###);
         },
@@ -233,7 +229,7 @@ async fn geo_asc_with_words() {
         &json!({"q": "intel"}),
         |response, code| {
             assert_eq!(code, 200, "{response}");
-            snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+            snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
             {
               "hits": [
                 {
@@ -249,8 +245,7 @@ async fn geo_asc_with_words() {
               "processingTimeMs": "[time]",
               "limit": 20,
               "offset": 0,
-              "estimatedTotalHits": 1,
-              "requestUid": "[uuid]"
+              "estimatedTotalHits": 1
             }
             "###);
         },
@@ -274,7 +269,7 @@ async fn geo_sort_with_words() {
       &json!({"q": "jean", "sort": ["_geoPoint(0.0, 0.0):asc"]}),
       |response, code| {
           assert_eq!(code, 200, "{response}");
-          snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+          snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
           {
             "hits": [
               {
@@ -309,8 +304,7 @@ async fn geo_sort_with_words() {
             "processingTimeMs": "[time]",
             "limit": 20,
             "offset": 0,
-            "estimatedTotalHits": 3,
-            "requestUid": "[uuid]"
+            "estimatedTotalHits": 3
           }
           "###);
       },

crates/meilisearch/tests/search/hybrid.rs

@@ -1,4 +1,4 @@
-use meili_snap::{json_string, snapshot};
+use meili_snap::snapshot;
 use once_cell::sync::Lazy;
 
 use crate::common::index::Index;
@@ -148,7 +148,7 @@ async fn simple_search() {
         )
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(response, @r#"
     {
       "hits": [
         {
@@ -209,10 +209,9 @@ async fn simple_search() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 3,
-      "requestUid": "[uuid]",
       "semanticHitCount": 0
     }
-    "###);
+    "#);
     snapshot!(response["semanticHitCount"], @"0");
 
     let (response, code) = index
@@ -221,7 +220,7 @@ async fn simple_search() {
         )
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(response, @r#"
     {
       "hits": [
         {
@@ -285,10 +284,9 @@ async fn simple_search() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 3,
-      "requestUid": "[uuid]",
       "semanticHitCount": 2
     }
-    "###);
+    "#);
     snapshot!(response["semanticHitCount"], @"2");
 
     let (response, code) = index
@@ -297,7 +295,7 @@ async fn simple_search() {
         )
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(response, @r#"
     {
       "hits": [
         {
@@ -361,10 +359,9 @@ async fn simple_search() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 3,
-      "requestUid": "[uuid]",
       "semanticHitCount": 3
     }
-    "###);
+    "#);
     snapshot!(response["semanticHitCount"], @"3");
 }
 

crates/meilisearch/tests/search/locales.rs

@@ -104,7 +104,7 @@ async fn simple_search() {
     // english
     index
         .search(json!({"q": "Atta", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+            snapshot!(response, @r###"
             {
               "hits": [
                 {
@@ -115,8 +115,7 @@ async fn simple_search() {
               "processingTimeMs": "[duration]",
               "limit": 20,
               "offset": 0,
-              "estimatedTotalHits": 1,
-              "requestUid": "[uuid]"
+              "estimatedTotalHits": 1
             }
             "###);
             snapshot!(code, @"200 OK");
@@ -126,7 +125,7 @@ async fn simple_search() {
     // japanese
     index
         .search(json!({"q": "進撃", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+            snapshot!(response, @r###"
             {
               "hits": [
                 {
@@ -137,8 +136,7 @@ async fn simple_search() {
               "processingTimeMs": "[duration]",
               "limit": 20,
               "offset": 0,
-              "estimatedTotalHits": 1,
-              "requestUid": "[uuid]"
+              "estimatedTotalHits": 1
             }
             "###);
             snapshot!(code, @"200 OK");
@@ -149,7 +147,7 @@ async fn simple_search() {
         .search(
             json!({"q": "進撃", "locales": ["jpn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r#"
                 {
                   "hits": [
                     {
@@ -160,10 +158,9 @@ async fn simple_search() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 1
                 }
-                "###);
+                "#);
                 snapshot!(code, @"200 OK");
             },
         )
@@ -172,7 +169,7 @@ async fn simple_search() {
     // chinese
     index
         .search(json!({"q": "进击", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+            snapshot!(response, @r#"
             {
               "hits": [
                 {
@@ -183,10 +180,9 @@ async fn simple_search() {
               "processingTimeMs": "[duration]",
               "limit": 20,
               "offset": 0,
-              "estimatedTotalHits": 1,
-              "requestUid": "[uuid]"
+              "estimatedTotalHits": 1
             }
-            "###);
+            "#);
             snapshot!(code, @"200 OK");
         })
         .await;
@@ -226,7 +222,7 @@ async fn force_locales() {
         .search(
             json!({"q": "\"进击的巨人\"", "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -237,8 +233,7 @@ async fn force_locales() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 1
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -251,7 +246,7 @@ async fn force_locales() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["jpn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -262,8 +257,7 @@ async fn force_locales() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 1
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -306,7 +300,7 @@ async fn force_locales_with_pattern() {
         .search(
             json!({"q": "\"进击的巨人\"", "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -317,8 +311,7 @@ async fn force_locales_with_pattern() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 1
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -331,7 +324,7 @@ async fn force_locales_with_pattern() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["jpn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -342,8 +335,7 @@ async fn force_locales_with_pattern() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 1
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -384,15 +376,14 @@ async fn force_locales_with_pattern_nested() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["cmn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [],
                   "query": "\"进击的巨人\"",
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 0,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 0
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -405,7 +396,7 @@ async fn force_locales_with_pattern_nested() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["jpn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -416,8 +407,7 @@ async fn force_locales_with_pattern_nested() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 1
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -461,15 +451,14 @@ async fn force_different_locales_with_pattern() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["cmn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [],
                   "query": "\"进击的巨人\"",
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 0,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 0
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -482,7 +471,7 @@ async fn force_different_locales_with_pattern() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["jpn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -493,8 +482,7 @@ async fn force_different_locales_with_pattern() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 1
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -541,15 +529,14 @@ async fn auto_infer_locales_at_search_with_attributes_to_search_on() {
         .search(
             json!({"q": "\"进击的巨人\"", "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [],
                   "query": "\"进击的巨人\"",
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 0,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 0
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -562,7 +549,7 @@ async fn auto_infer_locales_at_search_with_attributes_to_search_on() {
             .search(
                 json!({"q": "\"进击的巨人\"", "attributesToRetrieve": ["id"], "attributesToSearchOn": ["name_zh", "description_zh"]}),
                 |response, code| {
-                    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                    snapshot!(response, @r###"
                     {
                       "hits": [
                         {
@@ -573,8 +560,7 @@ async fn auto_infer_locales_at_search_with_attributes_to_search_on() {
                       "processingTimeMs": "[duration]",
                       "limit": 20,
                       "offset": 0,
-                      "estimatedTotalHits": 1,
-                      "requestUid": "[uuid]"
+                      "estimatedTotalHits": 1
                     }
                     "###);
                     snapshot!(code, @"200 OK");
@@ -616,7 +602,7 @@ async fn auto_infer_locales_at_search() {
         .search(
             json!({"q": "\"进击的巨人\"", "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -627,8 +613,7 @@ async fn auto_infer_locales_at_search() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 1
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -640,21 +625,20 @@ async fn auto_infer_locales_at_search() {
         .search(
             json!({"q": "\"进击的巨人\"", "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
-                {
-                  "hits": [
+                snapshot!(response, @r###"
                     {
-                      "id": 853
+                      "hits": [
+                        {
+                          "id": 853
+                        }
+                      ],
+                      "query": "\"进击的巨人\"",
+                      "processingTimeMs": "[duration]",
+                      "limit": 20,
+                      "offset": 0,
+                      "estimatedTotalHits": 1
                     }
-                  ],
-                  "query": "\"进击的巨人\"",
-                  "processingTimeMs": "[duration]",
-                  "limit": 20,
-                  "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
-                }
-                "###);
+                    "###);
                 snapshot!(code, @"200 OK");
             },
         )
@@ -664,7 +648,7 @@ async fn auto_infer_locales_at_search() {
         .search(
             json!({"q": "\"进击的巨人\"", "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -675,8 +659,7 @@ async fn auto_infer_locales_at_search() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 1
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -719,15 +702,14 @@ async fn force_different_locales_with_pattern_nested() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["cmn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [],
                   "query": "\"进击的巨人\"",
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 0,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 0
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -740,21 +722,20 @@ async fn force_different_locales_with_pattern_nested() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["jpn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
-                {
-                  "hits": [
+                snapshot!(response, @r###"
                     {
-                      "id": 852
+                      "hits": [
+                        {
+                          "id": 852
+                        }
+                      ],
+                      "query": "\"进击的巨人\"",
+                      "processingTimeMs": "[duration]",
+                      "limit": 20,
+                      "offset": 0,
+                      "estimatedTotalHits": 1
                     }
-                  ],
-                  "query": "\"进击的巨人\"",
-                  "processingTimeMs": "[duration]",
-                  "limit": 20,
-                  "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
-                }
-                "###);
+                    "###);
                 snapshot!(code, @"200 OK");
             },
         )
@@ -765,7 +746,7 @@ async fn force_different_locales_with_pattern_nested() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["ja"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -776,8 +757,7 @@ async fn force_different_locales_with_pattern_nested() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 1
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -819,15 +799,14 @@ async fn settings_change() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["cmn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [],
                   "query": "\"进击的巨人\"",
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 0,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 0
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -840,15 +819,14 @@ async fn settings_change() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["jpn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [],
                   "query": "\"进击的巨人\"",
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 0,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 0
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -884,15 +862,14 @@ async fn settings_change() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["cmn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [],
                   "query": "\"进击的巨人\"",
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 0,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 0
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -905,15 +882,14 @@ async fn settings_change() {
         .search(
             json!({"q": "\"进击的巨人\"", "locales": ["jpn"], "attributesToRetrieve": ["id"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [],
                   "query": "\"进击的巨人\"",
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 0,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 0
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -1188,7 +1164,7 @@ async fn swedish_search() {
     // infer swedish
     index
         .search(json!({"q": "trä", "attributesToRetrieve": ["product"]}), |response, code| {
-            snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+            snapshot!(response, @r###"
             {
               "hits": [
                 {
@@ -1202,8 +1178,7 @@ async fn swedish_search() {
               "processingTimeMs": "[duration]",
               "limit": 20,
               "offset": 0,
-              "estimatedTotalHits": 2,
-              "requestUid": "[uuid]"
+              "estimatedTotalHits": 2
             }
             "###);
             snapshot!(code, @"200 OK");
@@ -1212,7 +1187,7 @@ async fn swedish_search() {
 
     index
         .search(json!({"q": "tra", "attributesToRetrieve": ["product"]}), |response, code| {
-            snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+            snapshot!(response, @r###"
             {
               "hits": [
                 {
@@ -1226,8 +1201,7 @@ async fn swedish_search() {
               "processingTimeMs": "[duration]",
               "limit": 20,
               "offset": 0,
-              "estimatedTotalHits": 2,
-              "requestUid": "[uuid]"
+              "estimatedTotalHits": 2
             }
             "###);
             snapshot!(code, @"200 OK");
@@ -1239,7 +1213,7 @@ async fn swedish_search() {
         .search(
             json!({"q": "trä", "locales": ["swe"], "attributesToRetrieve": ["product"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -1253,8 +1227,7 @@ async fn swedish_search() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 2,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 2
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -1265,7 +1238,7 @@ async fn swedish_search() {
         .search(
             json!({"q": "tra", "locales": ["swe"], "attributesToRetrieve": ["product"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
                 {
                   "hits": [
                     {
@@ -1279,8 +1252,7 @@ async fn swedish_search() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 2,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 2
                 }
                 "###);
                 snapshot!(code, @"200 OK");
@@ -1315,21 +1287,20 @@ async fn german_search() {
         .search(
             json!({"q": "kulturalität", "attributesToRetrieve": ["product"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
+            {
+              "hits": [
                 {
-                  "hits": [
-                    {
-                      "product": "Interkulturalität"
-                    }
-                  ],
-                  "query": "kulturalität",
-                  "processingTimeMs": "[duration]",
-                  "limit": 20,
-                  "offset": 0,
-                  "estimatedTotalHits": 1,
-                  "requestUid": "[uuid]"
+                  "product": "Interkulturalität"
                 }
-                "###);
+              ],
+              "query": "kulturalität",
+              "processingTimeMs": "[duration]",
+              "limit": 20,
+              "offset": 0,
+              "estimatedTotalHits": 1
+            }
+            "###);
                 snapshot!(code, @"200 OK");
             },
         )
@@ -1339,7 +1310,7 @@ async fn german_search() {
         .search(
             json!({"q": "organisation", "attributesToRetrieve": ["product"]}),
             |response, code| {
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(response, @r###"
             {
               "hits": [
                 {
@@ -1350,8 +1321,7 @@ async fn german_search() {
               "processingTimeMs": "[duration]",
               "limit": 20,
               "offset": 0,
-              "estimatedTotalHits": 1,
-              "requestUid": "[uuid]"
+              "estimatedTotalHits": 1
             }
             "###);
                 snapshot!(code, @"200 OK");

crates/meilisearch/tests/search/metadata.rs

@@ -1,387 +0,0 @@
-use meili_snap::{json_string, snapshot};
-
-use crate::common::{shared_index_with_documents, Server, DOCUMENTS};
-use crate::json;
-
-#[actix_rt::test]
-async fn search_without_metadata_header() {
-    let index = shared_index_with_documents().await;
-
-    // Test that metadata is not included by default
-    index
-        .search(json!({"q": "glass"}), |response, code| {
-            snapshot!(code, @"200 OK");
-            snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
-            {
-              "hits": [
-                {
-                  "title": "Gläss",
-                  "id": "450465",
-                  "color": [
-                    "blue",
-                    "red"
-                  ]
-                }
-              ],
-              "query": "glass",
-              "processingTimeMs": "[duration]",
-              "limit": 20,
-              "offset": 0,
-              "estimatedTotalHits": 1,
-              "requestUid": "[uuid]"
-            }
-            "###);
-        })
-        .await;
-}
-
-#[actix_rt::test]
-async fn search_with_metadata_header() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-
-    let documents = DOCUMENTS.clone();
-    let (task, _code) = index.add_documents(documents, None).await;
-    server.wait_task(task.uid()).await.succeeded();
-
-    // Test with Meili-Include-Metadata header
-    let (response, code) = index
-        .search_with_headers(json!({"q": "glass"}), vec![("Meili-Include-Metadata", "true")])
-        .await;
-
-    snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]", ".metadata.queryUid" => "[uuid]" }), @r###"
-    {
-      "hits": [
-        {
-          "title": "Gläss",
-          "id": "450465",
-          "color": [
-            "blue",
-            "red"
-          ]
-        }
-      ],
-      "query": "glass",
-      "processingTimeMs": "[duration]",
-      "limit": 20,
-      "offset": 0,
-      "estimatedTotalHits": 1,
-      "requestUid": "[uuid]",
-      "metadata": {
-        "queryUid": "[uuid]",
-        "indexUid": "[uuid]",
-        "primaryKey": "id"
-      }
-    }
-    "###);
-}
-
-#[actix_rt::test]
-async fn search_with_metadata_header_and_primary_key() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-
-    let documents = DOCUMENTS.clone();
-    let (task, _code) = index.add_documents(documents, Some("id")).await;
-    server.wait_task(task.uid()).await.succeeded();
-
-    // Test with Meili-Include-Metadata header
-    let (response, code) = index
-        .search_with_headers(json!({"q": "glass"}), vec![("Meili-Include-Metadata", "true")])
-        .await;
-
-    snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]", ".metadata.queryUid" => "[uuid]" }), @r###"
-    {
-      "hits": [
-        {
-          "id": "450465",
-          "title": "Gläss",
-          "color": [
-            "blue",
-            "red"
-          ]
-        }
-      ],
-      "query": "glass",
-      "processingTimeMs": "[duration]",
-      "limit": 20,
-      "offset": 0,
-      "estimatedTotalHits": 1,
-      "requestUid": "[uuid]",
-      "metadata": {
-        "queryUid": "[uuid]",
-        "indexUid": "[uuid]",
-        "primaryKey": "id"
-      }
-    }
-    "###);
-}
-
-#[actix_rt::test]
-async fn multi_search_without_metadata_header() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-
-    let documents = DOCUMENTS.clone();
-    let (task, _code) = index.add_documents(documents, None).await;
-    server.wait_task(task.uid()).await.succeeded();
-
-    // Test multi-search without metadata header
-    let (response, code) = server
-        .multi_search(json!({
-            "queries": [
-                {"indexUid": index.uid, "q": "glass"},
-                {"indexUid": index.uid, "q": "dragon"}
-            ]
-        }))
-        .await;
-
-    snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".results[0].processingTimeMs" => "[duration]", ".results[0].requestUid" => "[uuid]", ".results[1].processingTimeMs" => "[duration]", ".results[1].requestUid" => "[uuid]" }), @r###"
-    {
-      "results": [
-        {
-          "indexUid": "[uuid]",
-          "hits": [
-            {
-              "title": "Gläss",
-              "id": "450465",
-              "color": [
-                "blue",
-                "red"
-              ]
-            }
-          ],
-          "query": "glass",
-          "processingTimeMs": "[duration]",
-          "limit": 20,
-          "offset": 0,
-          "estimatedTotalHits": 1,
-          "requestUid": "[uuid]"
-        },
-        {
-          "indexUid": "[uuid]",
-          "hits": [
-            {
-              "title": "How to Train Your Dragon: The Hidden World",
-              "id": "166428",
-              "color": [
-                "green",
-                "red"
-              ]
-            }
-          ],
-          "query": "dragon",
-          "processingTimeMs": "[duration]",
-          "limit": 20,
-          "offset": 0,
-          "estimatedTotalHits": 1,
-          "requestUid": "[uuid]"
-        }
-      ]
-    }
-    "###);
-}
-
-#[actix_rt::test]
-async fn multi_search_with_metadata_header() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-
-    let documents = DOCUMENTS.clone();
-    let (task, _code) = index.add_documents(documents, Some("id")).await;
-    server.wait_task(task.uid()).await.succeeded();
-
-    // Test multi-search with metadata header
-    let (response, code) = server
-        .multi_search_with_headers(
-            json!({
-                "queries": [
-                    {"indexUid": index.uid, "q": "glass"},
-                    {"indexUid": index.uid, "q": "dragon"}
-                ]
-            }),
-            vec![("Meili-Include-Metadata", "true")],
-        )
-        .await;
-
-    snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".results[0].processingTimeMs" => "[duration]", ".results[0].requestUid" => "[uuid]", ".results[0].metadata.queryUid" => "[uuid]", ".results[1].processingTimeMs" => "[duration]", ".results[1].requestUid" => "[uuid]", ".results[1].metadata.queryUid" => "[uuid]" }), @r###"
-    {
-      "results": [
-        {
-          "indexUid": "[uuid]",
-          "hits": [
-            {
-              "id": "450465",
-              "title": "Gläss",
-              "color": [
-                "blue",
-                "red"
-              ]
-            }
-          ],
-          "query": "glass",
-          "processingTimeMs": "[duration]",
-          "limit": 20,
-          "offset": 0,
-          "estimatedTotalHits": 1,
-          "requestUid": "[uuid]",
-          "metadata": {
-            "queryUid": "[uuid]",
-            "indexUid": "[uuid]",
-            "primaryKey": "id"
-          }
-        },
-        {
-          "indexUid": "[uuid]",
-          "hits": [
-            {
-              "id": "166428",
-              "title": "How to Train Your Dragon: The Hidden World",
-              "color": [
-                "green",
-                "red"
-              ]
-            }
-          ],
-          "query": "dragon",
-          "processingTimeMs": "[duration]",
-          "limit": 20,
-          "offset": 0,
-          "estimatedTotalHits": 1,
-          "requestUid": "[uuid]",
-          "metadata": {
-            "queryUid": "[uuid]",
-            "indexUid": "[uuid]",
-            "primaryKey": "id"
-          }
-        }
-      ]
-    }
-    "###);
-}
-
-#[actix_rt::test]
-async fn search_metadata_header_false_value() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-
-    let documents = DOCUMENTS.clone();
-    let (task, _code) = index.add_documents(documents, None).await;
-    server.wait_task(task.uid()).await.succeeded();
-
-    // Test with header set to false
-    let (response, code) = index
-        .search_with_headers(json!({"q": "glass"}), vec![("Meili-Include-Metadata", "false")])
-        .await;
-
-    snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
-    {
-      "hits": [
-        {
-          "title": "Gläss",
-          "id": "450465",
-          "color": [
-            "blue",
-            "red"
-          ]
-        }
-      ],
-      "query": "glass",
-      "processingTimeMs": "[duration]",
-      "limit": 20,
-      "offset": 0,
-      "estimatedTotalHits": 1,
-      "requestUid": "[uuid]"
-    }
-    "###);
-}
-
-#[actix_rt::test]
-async fn search_metadata_uuid_format() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-
-    let documents = DOCUMENTS.clone();
-    let (task, _code) = index.add_documents(documents, None).await;
-    server.wait_task(task.uid()).await.succeeded();
-
-    let (response, code) = index
-        .search_with_headers(json!({"q": "glass"}), vec![("Meili-Include-Metadata", "true")])
-        .await;
-
-    snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]", ".metadata.queryUid" => "[uuid]" }), @r###"
-    {
-      "hits": [
-        {
-          "title": "Gläss",
-          "id": "450465",
-          "color": [
-            "blue",
-            "red"
-          ]
-        }
-      ],
-      "query": "glass",
-      "processingTimeMs": "[duration]",
-      "limit": 20,
-      "offset": 0,
-      "estimatedTotalHits": 1,
-      "requestUid": "[uuid]",
-      "metadata": {
-        "queryUid": "[uuid]",
-        "indexUid": "[uuid]",
-        "primaryKey": "id"
-      }
-    }
-    "###);
-}
-
-#[actix_rt::test]
-async fn search_metadata_consistency_across_requests() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-
-    let documents = DOCUMENTS.clone();
-    let (task, _code) = index.add_documents(documents, Some("id")).await;
-    server.wait_task(task.uid()).await.succeeded();
-
-    // Make multiple requests and check that metadata is consistent
-    for _i in 0..3 {
-        let (response, code) = index
-            .search_with_headers(json!({"q": "glass"}), vec![("Meili-Include-Metadata", "true")])
-            .await;
-
-        snapshot!(code, @"200 OK");
-        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]", ".metadata.queryUid" => "[uuid]" }), @r###"
-        {
-          "hits": [
-            {
-              "id": "450465",
-              "title": "Gläss",
-              "color": [
-                "blue",
-                "red"
-              ]
-            }
-          ],
-          "query": "glass",
-          "processingTimeMs": "[duration]",
-          "limit": 20,
-          "offset": 0,
-          "estimatedTotalHits": 1,
-          "requestUid": "[uuid]",
-          "metadata": {
-            "queryUid": "[uuid]",
-            "indexUid": "[uuid]",
-            "primaryKey": "id"
-          }
-        }
-        "###);
-    }
-}

crates/meilisearch/tests/search/mod.rs

@@ -11,7 +11,6 @@ mod hybrid;
 #[cfg(not(feature = "chinese-pinyin"))]
 mod locales;
 mod matching_strategy;
-mod metadata;
 mod multi;
 mod pagination;
 mod restrict_searchable;
@@ -1045,7 +1044,7 @@ async fn test_degraded_score_details() {
             }),
             |response, code| {
                 snapshot!(code, @"200 OK");
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+                snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
                 {
                   "hits": [
                     {
@@ -1104,8 +1103,7 @@ async fn test_degraded_score_details() {
                   "processingTimeMs": "[duration]",
                   "limit": 20,
                   "offset": 0,
-                  "estimatedTotalHits": 3,
-                  "requestUid": "[uuid]"
+                  "estimatedTotalHits": 3
                 }
                 "###);
             },
@@ -2129,102 +2127,3 @@ async fn simple_search_changing_unrelated_settings() {
         })
         .await;
 }
-
-#[actix_rt::test]
-async fn ranking_score_bug_with_sort() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-
-    // Create documents with a "created" field for sorting
-    let documents = json!([
-        {
-            "id": "1",
-            "title": "Coffee Mug",
-            "created": "2023-01-01T00:00:00Z"
-        },
-        {
-            "id": "2",
-            "title": "Water Bottle",
-            "created": "2023-01-02T00:00:00Z"
-        },
-        {
-            "id": "3",
-            "title": "Tumbler Cup",
-            "created": "2023-01-03T00:00:00Z"
-        },
-        {
-            "id": "4",
-            "title": "Stainless Steel Tumbler",
-            "created": "2023-01-04T00:00:00Z"
-        }
-    ]);
-
-    // Add documents
-    let (task, code) = index.add_documents(documents, None).await;
-    assert_eq!(code, 202, "{task}");
-    server.wait_task(task.uid()).await.succeeded();
-
-    // Configure sortable attributes
-    let (task, code) = index
-        .update_settings(json!({
-            "sortableAttributes": ["created"]
-        }))
-        .await;
-    assert_eq!(code, 202, "{task}");
-    server.wait_task(task.uid()).await.succeeded();
-
-    // Test 1: Search without sort - should have proper ranking scores
-    index
-        .search(
-            json!({
-                "q": "tumbler",
-                "showRankingScore": true,
-                "rankingScoreThreshold": 0.0,
-                "attributesToRetrieve": ["title"]
-            }),
-            |response, code| {
-                assert_eq!(code, 200, "{response}");
-                snapshot!(json_string!(response["hits"]), @r###"
-                [
-                  {
-                    "title": "Tumbler Cup",
-                    "_rankingScore": 0.9848484848484848
-                  },
-                  {
-                    "title": "Stainless Steel Tumbler",
-                    "_rankingScore": 0.8787878787878788
-                  }
-                ]
-                "###);
-            },
-        )
-        .await;
-
-    // Test 2: Search with sort - this is where the bug occurs
-    index
-        .search(
-            json!({
-                "q": "tumbler",
-                "showRankingScore": true,
-                "rankingScoreThreshold": 0.0,
-                "sort": ["created:desc"],
-                "attributesToRetrieve": ["title"]
-            }),
-            |response, code| {
-                assert_eq!(code, 200, "{response}");
-                snapshot!(json_string!(response["hits"]), @r###"
-                [
-                  {
-                    "title": "Tumbler Cup",
-                    "_rankingScore": 0.9848484848484848
-                  },
-                  {
-                    "title": "Stainless Steel Tumbler",
-                    "_rankingScore": 0.8787878787878788
-                  }
-                ]
-                "###);
-            },
-        )
-        .await;
-}

crates/meilisearch/tests/search/multi/mod.rs

@@ -93,14 +93,13 @@ async fn federation_empty_list() {
 
     let (response, code) = server.multi_search(json!({"federation": {}, "queries": []})).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(response, @r###"
     {
       "hits": [],
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 0,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 0
     }
     "###);
 }
@@ -165,7 +164,7 @@ async fn simple_search_single_index() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response["results"], { ".**.processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response["results"], { ".**.processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
     [
       {
         "indexUid": "SHARED_DOCUMENTS",
@@ -183,8 +182,7 @@ async fn simple_search_single_index() {
         "processingTimeMs": "[duration]",
         "limit": 20,
         "offset": 0,
-        "estimatedTotalHits": 1,
-        "requestUid": "[uuid]"
+        "estimatedTotalHits": 1
       },
       {
         "indexUid": "SHARED_DOCUMENTS",
@@ -202,8 +200,7 @@ async fn simple_search_single_index() {
         "processingTimeMs": "[duration]",
         "limit": 20,
         "offset": 0,
-        "estimatedTotalHits": 1,
-        "requestUid": "[uuid]"
+        "estimatedTotalHits": 1
       }
     ]
     "###);
@@ -220,7 +217,7 @@ async fn federation_single_search_single_index() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
     {
       "hits": [
         {
@@ -240,8 +237,7 @@ async fn federation_single_search_single_index() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 1,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 1
     }
     "###);
 }
@@ -260,7 +256,7 @@ async fn federation_multiple_search_single_index() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
     {
       "hits": [
         {
@@ -312,8 +308,7 @@ async fn federation_multiple_search_single_index() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 5,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 5
     }
     "###);
 }
@@ -330,7 +325,7 @@ async fn federation_two_search_single_index() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
     {
       "hits": [
         {
@@ -363,8 +358,7 @@ async fn federation_two_search_single_index() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 2,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 2
     }
     "###);
 }
@@ -463,7 +457,7 @@ async fn simple_search_two_indexes() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response["results"], { ".**.processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response["results"], { ".**.processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
     [
       {
         "indexUid": "SHARED_DOCUMENTS",
@@ -481,8 +475,7 @@ async fn simple_search_two_indexes() {
         "processingTimeMs": "[duration]",
         "limit": 20,
         "offset": 0,
-        "estimatedTotalHits": 1,
-        "requestUid": "[uuid]"
+        "estimatedTotalHits": 1
       },
       {
         "indexUid": "SHARED_NESTED_DOCUMENTS",
@@ -523,8 +516,7 @@ async fn simple_search_two_indexes() {
         "processingTimeMs": "[duration]",
         "limit": 20,
         "offset": 0,
-        "estimatedTotalHits": 2,
-        "requestUid": "[uuid]"
+        "estimatedTotalHits": 2
       }
     ]
     "###);
@@ -543,7 +535,7 @@ async fn federation_two_search_two_indexes() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
     {
       "hits": [
         {
@@ -604,8 +596,7 @@ async fn federation_two_search_two_indexes() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
     "###);
 }
@@ -635,7 +626,7 @@ async fn federation_multiple_search_multiple_indexes() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
     {
       "hits": [
         {
@@ -804,8 +795,7 @@ async fn federation_multiple_search_multiple_indexes() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 12,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 12
     }
     "###);
 }
@@ -1111,7 +1101,7 @@ async fn federation_filter() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(response, @r###"
     {
       "hits": [
         {
@@ -1150,8 +1140,7 @@ async fn federation_filter() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
     "###);
 }
@@ -1188,7 +1177,7 @@ async fn federation_sort_same_indexes_same_criterion_same_direction() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -1277,8 +1266,7 @@ async fn federation_sort_same_indexes_same_criterion_same_direction() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 4,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 4
     }
     "###);
 
@@ -1290,7 +1278,7 @@ async fn federation_sort_same_indexes_same_criterion_same_direction() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -1365,8 +1353,7 @@ async fn federation_sort_same_indexes_same_criterion_same_direction() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
     "###);
 }
@@ -1462,7 +1449,7 @@ async fn federation_sort_same_indexes_different_criterion_same_direction() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -1551,8 +1538,7 @@ async fn federation_sort_same_indexes_different_criterion_same_direction() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 4,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 4
     }
     "###);
 
@@ -1565,7 +1551,7 @@ async fn federation_sort_same_indexes_different_criterion_same_direction() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -1640,8 +1626,7 @@ async fn federation_sort_same_indexes_different_criterion_same_direction() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
     "###);
 }
@@ -1719,7 +1704,7 @@ async fn federation_sort_different_indexes_same_criterion_same_direction() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -1846,8 +1831,7 @@ async fn federation_sort_different_indexes_same_criterion_same_direction() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 10,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 10
     }
     "###);
 
@@ -1860,7 +1844,7 @@ async fn federation_sort_different_indexes_same_criterion_same_direction() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -1931,8 +1915,7 @@ async fn federation_sort_different_indexes_same_criterion_same_direction() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 6,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 6
     }
     "###);
 }
@@ -1953,7 +1936,7 @@ async fn federation_sort_different_ranking_rules() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -2080,8 +2063,7 @@ async fn federation_sort_different_ranking_rules() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 10,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 10
     }
     "###);
 
@@ -2160,7 +2142,7 @@ async fn federation_sort_different_indexes_different_criterion_same_direction()
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -2287,8 +2269,7 @@ async fn federation_sort_different_indexes_different_criterion_same_direction()
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 10,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 10
     }
     "###);
 
@@ -2301,7 +2282,7 @@ async fn federation_sort_different_indexes_different_criterion_same_direction()
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -2372,8 +2353,7 @@ async fn federation_sort_different_indexes_different_criterion_same_direction()
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 6,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 6
     }
     "###);
 }
@@ -2444,7 +2424,7 @@ async fn federation_limit_offset() {
             ]}))
             .await;
         snapshot!(code, @"200 OK");
-        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
         {
           "hits": [
             {
@@ -2547,8 +2527,7 @@ async fn federation_limit_offset() {
           "processingTimeMs": "[duration]",
           "limit": 20,
           "offset": 0,
-          "estimatedTotalHits": 12,
-          "requestUid": "[uuid]"
+          "estimatedTotalHits": 12
         }
         "###);
     }
@@ -2570,7 +2549,7 @@ async fn federation_limit_offset() {
             ]}))
             .await;
         snapshot!(code, @"200 OK");
-        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".requestUid" => "[uuid]" }), @r###"
+        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
         {
           "hits": [
             {
@@ -2585,8 +2564,7 @@ async fn federation_limit_offset() {
           "processingTimeMs": "[duration]",
           "limit": 1,
           "offset": 0,
-          "estimatedTotalHits": 12,
-          "requestUid": "[uuid]"
+          "estimatedTotalHits": 12
         }
         "###);
     }
@@ -2608,7 +2586,7 @@ async fn federation_limit_offset() {
             ]}))
             .await;
         snapshot!(code, @"200 OK");
-        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".requestUid" => "[uuid]" }), @r###"
+        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
         {
           "hits": [
             {
@@ -2695,8 +2673,7 @@ async fn federation_limit_offset() {
           "processingTimeMs": "[duration]",
           "limit": 20,
           "offset": 2,
-          "estimatedTotalHits": 12,
-          "requestUid": "[uuid]"
+          "estimatedTotalHits": 12
         }
         "###);
     }
@@ -2718,14 +2695,13 @@ async fn federation_limit_offset() {
             ]}))
             .await;
         snapshot!(code, @"200 OK");
-        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".requestUid" => "[uuid]" }), @r###"
+        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
         {
           "hits": [],
           "processingTimeMs": "[duration]",
           "limit": 20,
           "offset": 12,
-          "estimatedTotalHits": 12,
-          "requestUid": "[uuid]"
+          "estimatedTotalHits": 12
         }
         "###);
     }
@@ -2755,7 +2731,7 @@ async fn federation_formatting() {
             ]}))
             .await;
         snapshot!(code, @"200 OK");
-        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
         {
           "hits": [
             {
@@ -2885,8 +2861,7 @@ async fn federation_formatting() {
           "processingTimeMs": "[duration]",
           "limit": 20,
           "offset": 0,
-          "estimatedTotalHits": 12,
-          "requestUid": "[uuid]"
+          "estimatedTotalHits": 12
         }
         "###);
     }
@@ -2908,7 +2883,7 @@ async fn federation_formatting() {
             ]}))
             .await;
         snapshot!(code, @"200 OK");
-        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".requestUid" => "[uuid]" }), @r###"
+        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
         {
           "hits": [
             {
@@ -2923,8 +2898,7 @@ async fn federation_formatting() {
           "processingTimeMs": "[duration]",
           "limit": 1,
           "offset": 0,
-          "estimatedTotalHits": 12,
-          "requestUid": "[uuid]"
+          "estimatedTotalHits": 12
         }
         "###);
     }
@@ -2946,7 +2920,7 @@ async fn federation_formatting() {
             ]}))
             .await;
         snapshot!(code, @"200 OK");
-        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".requestUid" => "[uuid]" }), @r###"
+        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
         {
           "hits": [
             {
@@ -3033,8 +3007,7 @@ async fn federation_formatting() {
           "processingTimeMs": "[duration]",
           "limit": 20,
           "offset": 2,
-          "estimatedTotalHits": 12,
-          "requestUid": "[uuid]"
+          "estimatedTotalHits": 12
         }
         "###);
     }
@@ -3056,14 +3029,13 @@ async fn federation_formatting() {
             ]}))
             .await;
         snapshot!(code, @"200 OK");
-        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".requestUid" => "[uuid]" }), @r###"
+        snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
         {
           "hits": [],
           "processingTimeMs": "[duration]",
           "limit": 20,
           "offset": 12,
-          "estimatedTotalHits": 12,
-          "requestUid": "[uuid]"
+          "estimatedTotalHits": 12
         }
         "###);
     }
@@ -3126,7 +3098,7 @@ async fn federation_null_weight() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -3165,8 +3137,7 @@ async fn federation_null_weight() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
     "###);
 }
@@ -3273,7 +3244,7 @@ async fn federation_federated_contains_facets() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -3309,8 +3280,7 @@ async fn federation_federated_contains_facets() {
       "processingTimeMs": "[duration]",
       "limit": 20,
       "offset": 0,
-      "estimatedTotalHits": 3,
-      "requestUid": "[uuid]"
+      "estimatedTotalHits": 3
     }
     "###);
 
@@ -3518,7 +3488,7 @@ async fn federation_vector_single_index() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
     {
       "hits": [
         {
@@ -3562,8 +3532,7 @@ async fn federation_vector_single_index() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 4,
-      "semanticHitCount": 4,
-      "requestUid": "[uuid]"
+      "semanticHitCount": 4
     }
     "###);
 
@@ -3576,7 +3545,7 @@ async fn federation_vector_single_index() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
     {
       "hits": [
         {
@@ -3620,8 +3589,7 @@ async fn federation_vector_single_index() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 4,
-      "semanticHitCount": 4,
-      "requestUid": "[uuid]"
+      "semanticHitCount": 4
     }
     "###);
 
@@ -3635,7 +3603,7 @@ async fn federation_vector_single_index() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r###"
     {
       "hits": [
         {
@@ -3683,8 +3651,7 @@ async fn federation_vector_single_index() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 4,
-      "semanticHitCount": 3,
-      "requestUid": "[uuid]"
+      "semanticHitCount": 3
     }
     "###);
 }
@@ -3736,7 +3703,7 @@ async fn federation_vector_two_indexes() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r#"
     {
       "hits": [
         {
@@ -3955,10 +3922,9 @@ async fn federation_vector_two_indexes() {
           0.6
         ]
       },
-      "semanticHitCount": 6,
-      "requestUid": "[uuid]"
+      "semanticHitCount": 6
     }
-    "###);
+    "#);
 
     // hybrid search, distinct embedder
     let (response, code) = server
@@ -3968,7 +3934,7 @@ async fn federation_vector_two_indexes() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]", ".**.requestUid" => "[uuid]" }), @r#"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".**._rankingScore" => "[score]" }), @r#"
     {
       "hits": [
         {
@@ -4195,8 +4161,7 @@ async fn federation_vector_two_indexes() {
           0.6
         ]
       },
-      "semanticHitCount": 8,
-      "requestUid": "[uuid]"
+      "semanticHitCount": 8
     }
     "#);
 }
@@ -4244,7 +4209,7 @@ async fn federation_facets_different_indexes_same_facet() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -4415,8 +4380,7 @@ async fn federation_facets_different_indexes_same_facet() {
           },
           "stats": {}
         }
-      },
-      "requestUid": "[uuid]"
+      }
     }
     "###);
 
@@ -4435,7 +4399,7 @@ async fn federation_facets_different_indexes_same_facet() {
     ]}))
     .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -4577,8 +4541,7 @@ async fn federation_facets_different_indexes_same_facet() {
           "Shazam!": 1
         }
       },
-      "facetStats": {},
-      "requestUid": "[uuid]"
+      "facetStats": {}
     }
     "###);
 
@@ -4598,7 +4561,7 @@ async fn federation_facets_different_indexes_same_facet() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -4723,8 +4686,7 @@ async fn federation_facets_different_indexes_same_facet() {
           "distribution": {},
           "stats": {}
         }
-      },
-      "requestUid": "[uuid]"
+      }
     }
     "###);
 }
@@ -4786,7 +4748,7 @@ async fn federation_facets_same_indexes() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -4844,8 +4806,7 @@ async fn federation_facets_same_indexes() {
             }
           }
         }
-      },
-      "requestUid": "[uuid]"
+      }
     }
     "###);
 
@@ -4861,7 +4822,7 @@ async fn federation_facets_same_indexes() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -4947,8 +4908,7 @@ async fn federation_facets_same_indexes() {
             }
           }
         }
-      },
-      "requestUid": "[uuid]"
+      }
     }
     "###);
 
@@ -4965,7 +4925,7 @@ async fn federation_facets_same_indexes() {
         ]}))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -5027,8 +4987,7 @@ async fn federation_facets_same_indexes() {
           "min": 2.0,
           "max": 6.0
         }
-      },
-      "requestUid": "[uuid]"
+      }
     }
     "###);
 }
@@ -5081,7 +5040,7 @@ async fn federation_inconsistent_merge_order() {
       ]}))
       .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -5258,8 +5217,7 @@ async fn federation_inconsistent_merge_order() {
           },
           "stats": {}
         }
-      },
-      "requestUid": "[uuid]"
+      }
     }
     "###);
 
@@ -5306,7 +5264,7 @@ async fn federation_inconsistent_merge_order() {
  ]}))
  .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[duration]" }), @r###"
     {
       "hits": [
         {
@@ -5446,8 +5404,7 @@ async fn federation_inconsistent_merge_order() {
           "Batman Returns": 1
         }
       },
-      "facetStats": {},
-      "requestUid": "[uuid]"
+      "facetStats": {}
     }
     "###);
 }

crates/meilisearch/tests/search/multi/proxy.rs

@@ -229,7 +229,7 @@ async fn remote_sharding() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -287,13 +287,12 @@ async fn remote_sharding() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 5,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
     "###);
     let (response, _status_code) = ms1.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -351,13 +350,12 @@ async fn remote_sharding() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 5,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
     "###);
     let (response, _status_code) = ms2.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -415,7 +413,6 @@ async fn remote_sharding() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 5,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
     "###);
@@ -597,7 +594,7 @@ async fn remote_sharding_retrieve_vectors() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r#"
     {
       "hits": [],
       "processingTimeMs": "[time]",
@@ -622,10 +619,9 @@ async fn remote_sharding_retrieve_vectors() {
         ]
       },
       "semanticHitCount": 0,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
-    "###);
+    "#);
 
     // multi vector search: two local queries, one remote
 
@@ -673,7 +669,7 @@ async fn remote_sharding_retrieve_vectors() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r#"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r#"
     {
       "hits": [],
       "processingTimeMs": "[time]",
@@ -698,7 +694,6 @@ async fn remote_sharding_retrieve_vectors() {
         ]
       },
       "semanticHitCount": 0,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
     "#);
@@ -749,7 +744,7 @@ async fn remote_sharding_retrieve_vectors() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r#"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r#"
     {
       "hits": [],
       "processingTimeMs": "[time]",
@@ -774,7 +769,6 @@ async fn remote_sharding_retrieve_vectors() {
         ]
       },
       "semanticHitCount": 0,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
     "#);
@@ -825,7 +819,7 @@ async fn remote_sharding_retrieve_vectors() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r#"
     {
       "hits": [],
       "processingTimeMs": "[time]",
@@ -845,10 +839,9 @@ async fn remote_sharding_retrieve_vectors() {
         ]
       },
       "semanticHitCount": 0,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
-    "###);
+    "#);
 
     // multi vector search: no local queries, all remote
 
@@ -896,7 +889,7 @@ async fn remote_sharding_retrieve_vectors() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r#"
     {
       "hits": [],
       "processingTimeMs": "[time]",
@@ -920,10 +913,9 @@ async fn remote_sharding_retrieve_vectors() {
           0.2
         ]
       },
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -1141,7 +1133,7 @@ async fn error_no_weighted_score() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -1169,7 +1161,6 @@ async fn error_no_weighted_score() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 2,
-      "requestUid": "[uuid]",
       "remoteErrors": {
         "ms1": {
           "message": "remote hit does not contain `._federation.weightedScoreValues`\n  - hint: check that the remote instance is a Meilisearch instance running the same version",
@@ -1281,7 +1272,7 @@ async fn error_bad_response() {
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
 
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -1309,7 +1300,6 @@ async fn error_bad_response() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 2,
-      "requestUid": "[uuid]",
       "remoteErrors": {
         "ms1": {
           "message": "could not parse response from the remote host as a federated search response:\n  - response from remote: <html>Returning an HTML page</html>\n  - hint: check that the remote instance is a Meilisearch instance running the same version",
@@ -1414,7 +1404,7 @@ async fn error_bad_request() {
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
 
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -1442,7 +1432,6 @@ async fn error_bad_request() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 2,
-      "requestUid": "[uuid]",
       "remoteErrors": {
         "ms1": {
           "message": "remote host responded with code 400:\n  - response from remote: {\"message\":\"Inside `.queries[1]`: Index `nottest` not found.\",\"code\":\"index_not_found\",\"type\":\"invalid_request\",\"link\":\"https://docs.meilisearch.com/errors#index_not_found\"}\n  - hint: check that the remote instance has the correct index configuration for that request\n  - hint: check that the `network` experimental feature is enabled on the remote instance",
@@ -1552,7 +1541,7 @@ async fn error_bad_request_facets_by_index() {
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
 
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -1586,7 +1575,6 @@ async fn error_bad_request_facets_by_index() {
           "stats": {}
         }
       },
-      "requestUid": "[uuid]",
       "remoteErrors": {
         "ms1": {
           "message": "remote host responded with code 400:\n  - response from remote: {\"message\":\"Inside `.federation.facetsByIndex.test0`: Index `test0` not found.\\n - Note: index `test0` is not used in queries\",\"code\":\"index_not_found\",\"type\":\"invalid_request\",\"link\":\"https://docs.meilisearch.com/errors#index_not_found\"}\n  - hint: check that the remote instance has the correct index configuration for that request\n  - hint: check that the `network` experimental feature is enabled on the remote instance",
@@ -1699,7 +1687,7 @@ async fn error_bad_request_facets_by_index_facet() {
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
 
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -1738,7 +1726,6 @@ async fn error_bad_request_facets_by_index_facet() {
           "stats": {}
         }
       },
-      "requestUid": "[uuid]",
       "remoteErrors": {
         "ms1": {
           "message": "remote host responded with code 400:\n  - response from remote: {\"message\":\"Inside `.federation.facetsByIndex.test`: Invalid facet distribution: Attribute `id` is not filterable. This index does not have configured filterable attributes.\\n - Note: index `test` used in `.queries[1]`\",\"code\":\"invalid_multi_search_facets\",\"type\":\"invalid_request\",\"link\":\"https://docs.meilisearch.com/errors#invalid_multi_search_facets\"}\n  - hint: check that the remote instance has the correct index configuration for that request\n  - hint: check that the `network` experimental feature is enabled on the remote instance",
@@ -2048,7 +2035,7 @@ async fn error_remote_404() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -2076,7 +2063,6 @@ async fn error_remote_404() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 2,
-      "requestUid": "[uuid]",
       "remoteErrors": {
         "ms1": {
           "message": "remote host responded with code 404:\n  - response from remote: null\n  - hint: check that the remote instance has the correct index configuration for that request\n  - hint: check that the `network` experimental feature is enabled on the remote instance",
@@ -2089,7 +2075,7 @@ async fn error_remote_404() {
     "###);
     let (response, _status_code) = ms1.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -2127,7 +2113,6 @@ async fn error_remote_404() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 3,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
     "###);
@@ -2259,7 +2244,7 @@ async fn error_remote_sharding_auth() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -2287,7 +2272,6 @@ async fn error_remote_sharding_auth() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 2,
-      "requestUid": "[uuid]",
       "remoteErrors": {
         "ms1-notsearch": {
           "message": "could not authenticate against the remote host\n  - hint: check that the remote instance was registered with a valid API key having the `search` action",
@@ -2421,7 +2405,7 @@ async fn remote_sharding_auth() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -2469,7 +2453,6 @@ async fn remote_sharding_auth() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 4,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
     "###);
@@ -2572,7 +2555,7 @@ async fn error_remote_500() {
 
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -2600,7 +2583,6 @@ async fn error_remote_500() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 2,
-      "requestUid": "[uuid]",
       "remoteErrors": {
         "ms1": {
           "message": "remote host responded with code 500:\n  - response from remote: {\"error\":\"provoked error\",\"code\":\"test_error\",\"link\":\"https://docs.meilisearch.com/errors#test_error\"}",
@@ -2614,7 +2596,7 @@ async fn error_remote_500() {
     let (response, _status_code) = ms1.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
     // the response if full because we queried the instance that works
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -2652,7 +2634,6 @@ async fn error_remote_500() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 3,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
     "###);
@@ -2756,7 +2737,7 @@ async fn error_remote_500_once() {
     // Meilisearch is tolerant to a single failure
     let (response, _status_code) = ms0.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -2794,13 +2775,12 @@ async fn error_remote_500_once() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 3,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
     "###);
     let (response, _status_code) = ms1.multi_search(request.clone()).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
     {
       "hits": [
         {
@@ -2838,7 +2818,6 @@ async fn error_remote_500_once() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 3,
-      "requestUid": "[uuid]",
       "remoteErrors": {}
     }
     "###);
@@ -2866,8 +2845,7 @@ async fn error_remote_timeout() {
     snapshot!(json_string!(response), @r###"
     {
       "self": "ms0",
-      "remotes": {},
-      "sharding": false
+      "remotes": {}
     }
     "###);
     let (response, code) = ms1.set_network(json!({"self": "ms1"})).await;
@@ -2875,8 +2853,7 @@ async fn error_remote_timeout() {
     snapshot!(json_string!(response), @r###"
     {
       "self": "ms1",
-      "remotes": {},
-      "sharding": false
+      "remotes": {}
     }
     "###);
 
@@ -2897,7 +2874,7 @@ async fn error_remote_timeout() {
     let rms0 = LocalMeili::new(ms0.clone()).await;
     let rms1 = LocalMeili::with_params(
         ms1.clone(),
-        LocalMeiliParams { delay: Some(std::time::Duration::from_secs(31)), ..Default::default() },
+        LocalMeiliParams { delay: Some(std::time::Duration::from_secs(6)), ..Default::default() },
     )
     .await;
 

crates/meilisearch/tests/search/pagination.rs

@@ -175,8 +175,7 @@ async fn test_issue_5274() {
 
     snapshot!(json_string!(rep, {
         ".processingTimeMs" => "[ignored]",
-        ".requestUid" => "[uuid]"
-    }), @r###"
+    }), @r#"
     {
       "hits": [
         {
@@ -190,8 +189,7 @@ async fn test_issue_5274() {
       "hitsPerPage": 1,
       "page": 1,
       "totalPages": 1,
-      "totalHits": 1,
-      "requestUid": "[uuid]"
+      "totalHits": 1
     }
-    "###);
+    "#);
 }

crates/meilisearch/tests/tasks/errors.rs

@@ -97,7 +97,7 @@ async fn task_bad_types() {
     snapshot!(code, @"400 Bad Request");
     snapshot!(json_string!(response), @r#"
     {
-      "message": "Invalid value in parameter `types`: `doggo` is not a valid task type. Available types are `documentAdditionOrUpdate`, `documentEdition`, `documentDeletion`, `settingsUpdate`, `indexCreation`, `indexDeletion`, `indexUpdate`, `indexSwap`, `taskCancelation`, `taskDeletion`, `dumpCreation`, `snapshotCreation`, `export`, `upgradeDatabase`, `indexCompaction`.",
+      "message": "Invalid value in parameter `types`: `doggo` is not a valid task type. Available types are `documentAdditionOrUpdate`, `documentEdition`, `documentDeletion`, `settingsUpdate`, `indexCreation`, `indexDeletion`, `indexUpdate`, `indexSwap`, `taskCancelation`, `taskDeletion`, `dumpCreation`, `snapshotCreation`, `export`, `upgradeDatabase`.",
       "code": "invalid_task_types",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#invalid_task_types"
@@ -108,7 +108,7 @@ async fn task_bad_types() {
     snapshot!(code, @"400 Bad Request");
     snapshot!(json_string!(response), @r#"
     {
-      "message": "Invalid value in parameter `types`: `doggo` is not a valid task type. Available types are `documentAdditionOrUpdate`, `documentEdition`, `documentDeletion`, `settingsUpdate`, `indexCreation`, `indexDeletion`, `indexUpdate`, `indexSwap`, `taskCancelation`, `taskDeletion`, `dumpCreation`, `snapshotCreation`, `export`, `upgradeDatabase`, `indexCompaction`.",
+      "message": "Invalid value in parameter `types`: `doggo` is not a valid task type. Available types are `documentAdditionOrUpdate`, `documentEdition`, `documentDeletion`, `settingsUpdate`, `indexCreation`, `indexDeletion`, `indexUpdate`, `indexSwap`, `taskCancelation`, `taskDeletion`, `dumpCreation`, `snapshotCreation`, `export`, `upgradeDatabase`.",
       "code": "invalid_task_types",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#invalid_task_types"
@@ -119,7 +119,7 @@ async fn task_bad_types() {
     snapshot!(code, @"400 Bad Request");
     snapshot!(json_string!(response), @r#"
     {
-      "message": "Invalid value in parameter `types`: `doggo` is not a valid task type. Available types are `documentAdditionOrUpdate`, `documentEdition`, `documentDeletion`, `settingsUpdate`, `indexCreation`, `indexDeletion`, `indexUpdate`, `indexSwap`, `taskCancelation`, `taskDeletion`, `dumpCreation`, `snapshotCreation`, `export`, `upgradeDatabase`, `indexCompaction`.",
+      "message": "Invalid value in parameter `types`: `doggo` is not a valid task type. Available types are `documentAdditionOrUpdate`, `documentEdition`, `documentDeletion`, `settingsUpdate`, `indexCreation`, `indexDeletion`, `indexUpdate`, `indexSwap`, `taskCancelation`, `taskDeletion`, `dumpCreation`, `snapshotCreation`, `export`, `upgradeDatabase`.",
       "code": "invalid_task_types",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#invalid_task_types"

crates/meilisearch/tests/upgrade/mod.rs

@@ -43,7 +43,7 @@ async fn version_too_old() {
     std::fs::write(db_path.join("VERSION"), "1.11.9999").unwrap();
     let options = Opt { experimental_dumpless_upgrade: true, ..default_settings };
     let err = Server::new_with_options(options).await.map(|_| ()).unwrap_err();
-    snapshot!(err, @"Database version 1.11.9999 is too old for the experimental dumpless upgrade feature. Please generate a dump using the v1.11.9999 and import it in the v1.24.0");
+    snapshot!(err, @"Database version 1.11.9999 is too old for the experimental dumpless upgrade feature. Please generate a dump using the v1.11.9999 and import it in the v1.22.0");
 }
 
 #[actix_rt::test]
@@ -58,7 +58,7 @@ async fn version_requires_downgrade() {
     std::fs::write(db_path.join("VERSION"), format!("{major}.{minor}.{patch}")).unwrap();
     let options = Opt { experimental_dumpless_upgrade: true, ..default_settings };
     let err = Server::new_with_options(options).await.map(|_| ()).unwrap_err();
-    snapshot!(err, @"Database version 1.24.1 is higher than the Meilisearch version 1.24.0. Downgrade is not supported");
+    snapshot!(err, @"Database version 1.22.1 is higher than the Meilisearch version 1.22.0. Downgrade is not supported");
 }
 
 #[actix_rt::test]

crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_features/search_with_sort_and_filter.snap

@@ -1,5 +1,6 @@
 ---
 source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
+snapshot_kind: text
 ---
 {
   "hits": [
@@ -20,6 +21,5 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
   "processingTimeMs": "[duration]",
   "limit": 20,
   "offset": 0,
-  "estimatedTotalHits": 1,
-  "requestUid": "[uuid]"
+  "estimatedTotalHits": 1
 }

crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap

@@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
       "progress": null,
       "details": {
         "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.24.0"
+        "upgradeTo": "v1.22.0"
       },
       "stats": {
         "totalNbTasks": 1,

crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap

@@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
       "progress": null,
       "details": {
         "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.24.0"
+        "upgradeTo": "v1.22.0"
       },
       "stats": {
         "totalNbTasks": 1,

crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap

@@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
       "progress": null,
       "details": {
         "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.24.0"
+        "upgradeTo": "v1.22.0"
       },
       "stats": {
         "totalNbTasks": 1,

crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap

@@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
       "canceledBy": null,
       "details": {
         "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.24.0"
+        "upgradeTo": "v1.22.0"
       },
       "error": null,
       "duration": "[duration]",

crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap

@@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
       "canceledBy": null,
       "details": {
         "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.24.0"
+        "upgradeTo": "v1.22.0"
       },
       "error": null,
       "duration": "[duration]",

crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap

@@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
       "canceledBy": null,
       "details": {
         "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.24.0"
+        "upgradeTo": "v1.22.0"
       },
       "error": null,
       "duration": "[duration]",

crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap

@@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
       "progress": null,
       "details": {
         "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.24.0"
+        "upgradeTo": "v1.22.0"
       },
       "stats": {
         "totalNbTasks": 1,

crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_task_queue_once_everything_has_been_processed.snap

@@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs
       "canceledBy": null,
       "details": {
         "upgradeFrom": "v1.12.0",
-        "upgradeTo": "v1.24.0"
+        "upgradeTo": "v1.22.0"
       },
       "error": null,
       "duration": "[duration]",

crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs

@@ -294,7 +294,7 @@ async fn check_the_index_features(server: &Server) {
 
     let (results, _status) =
         kefir.search_post(json!({ "sort": ["age:asc"], "filter": "surname = kefirounet" })).await;
-    snapshot!(json_string!(results, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), name: "search_with_sort_and_filter");
+    snapshot!(results, name: "search_with_sort_and_filter");
 
     // ensuring we can get the vectors and their `regenerate` is still good.
     let (results, _status) = kefir.search_post(json!({"retrieveVectors": true})).await;

crates/meilisearch/tests/vector/binary_quantized.rs

@@ -323,7 +323,7 @@ async fn binary_quantize_clear_documents() {
     // Make sure the vector DB has been cleared
     let (documents, _code) =
         index.search_post(json!({ "hybrid": { "embedder": "manual" }, "vector": [1, 1, 1] })).await;
-    snapshot!(json_string!(documents, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(documents, @r#"
     {
       "hits": [],
       "query": "",
@@ -331,10 +331,9 @@ async fn binary_quantize_clear_documents() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 0,
-      "requestUid": "[uuid]",
       "semanticHitCount": 0
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]

crates/meilisearch/tests/vector/fragments.rs

@@ -257,7 +257,7 @@ async fn search_with_vector() {
         json!({"vector": [1.0, 1.0, 1.0], "hybrid": {"semanticRatio": 1.0, "embedder": "rest"}, "limit": 1}
     )).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(value, { ".requestUid" => "[uuid]", ".processingTimeMs" => "[duration]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -270,10 +270,9 @@ async fn search_with_vector() {
       "limit": 1,
       "offset": 0,
       "estimatedTotalHits": 4,
-      "requestUid": "[uuid]",
       "semanticHitCount": 1
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -289,7 +288,7 @@ async fn search_with_media() {
         ))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(value, { ".requestUid" => "[uuid]", ".processingTimeMs" => "[duration]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -303,10 +302,9 @@ async fn search_with_media() {
       "limit": 1,
       "offset": 0,
       "estimatedTotalHits": 4,
-      "requestUid": "[uuid]",
       "semanticHitCount": 1
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -392,7 +390,7 @@ async fn search_with_query() {
         ))
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(value, { ".requestUid" => "[uuid]", ".processingTimeMs" => "[duration]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -406,10 +404,9 @@ async fn search_with_query() {
       "limit": 1,
       "offset": 0,
       "estimatedTotalHits": 4,
-      "requestUid": "[uuid]",
       "semanticHitCount": 1
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -2079,7 +2076,7 @@ async fn composite() {
         json!({"vector": [1.0, 1.0, 1.0], "hybrid": {"semanticRatio": 1.0, "embedder": "rest"}, "limit": 1}
     )).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(value, { ".requestUid" => "[uuid]", ".processingTimeMs" => "[duration]" }), @r###"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -2092,10 +2089,9 @@ async fn composite() {
       "limit": 1,
       "offset": 0,
       "estimatedTotalHits": 4,
-      "requestUid": "[uuid]",
       "semanticHitCount": 1
     }
-    "###);
+    "#);
 
     let (value, code) = index
         .search_post(
@@ -2104,7 +2100,7 @@ async fn composite() {
         )
         .await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(value, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r#"
+    snapshot!(value, @r#"
     {
       "hits": [
         {
@@ -2118,7 +2114,6 @@ async fn composite() {
       "limit": 1,
       "offset": 0,
       "estimatedTotalHits": 4,
-      "requestUid": "[uuid]",
       "semanticHitCount": 1
     }
     "#);

crates/meilisearch/tests/vector/mod.rs

@@ -689,7 +689,7 @@ async fn clear_documents() {
     // Make sure the vector DB has been cleared
     let (documents, _code) =
         index.search_post(json!({ "vector": [1, 1, 1], "hybrid": {"embedder": "manual"} })).await;
-    snapshot!(json_string!(documents, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(documents, @r#"
     {
       "hits": [],
       "query": "",
@@ -697,10 +697,9 @@ async fn clear_documents() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 0,
-      "requestUid": "[uuid]",
       "semanticHitCount": 0
     }
-    "###);
+    "#);
 }
 
 #[actix_rt::test]
@@ -744,7 +743,7 @@ async fn add_remove_one_vector_4588() {
             json!({"vector": [1, 1, 1], "hybrid": {"semanticRatio": 1.0, "embedder": "manual"} }),
         )
         .await;
-    snapshot!(json_string!(documents, { ".processingTimeMs" => "[duration]", ".requestUid" => "[uuid]" }), @r###"
+    snapshot!(documents, @r#"
     {
       "hits": [
         {
@@ -757,10 +756,9 @@ async fn add_remove_one_vector_4588() {
       "limit": 20,
       "offset": 0,
       "estimatedTotalHits": 1,
-      "requestUid": "[uuid]",
       "semanticHitCount": 1
     }
-    "###);
+    "#);
 
     let (documents, _code) = index
         .get_all_documents(GetAllDocumentsOptions { retrieve_vectors: true, ..Default::default() })

crates/meilitool/src/main.rs

@@ -126,7 +126,7 @@ enum Command {
     /// before running the copy and compaction. This way the current indexation must finish before
     /// the compaction operation can start. Once the compaction is done, the big index is replaced
     /// by the compacted one and the mutable transaction is released.
-    IndexCompaction { index_name: String },
+    CompactIndex { index_name: String },
 
     /// Uses the hair dryer the dedicate pages hot in cache
     ///
@@ -165,7 +165,7 @@ fn main() -> anyhow::Result<()> {
             let target_version = parse_version(&target_version).context("While parsing `--target-version`. Make sure `--target-version` is in the format MAJOR.MINOR.PATCH")?;
             OfflineUpgrade { db_path, current_version: detected_version, target_version }.upgrade()
         }
-        Command::IndexCompaction { index_name } => compact_index(db_path, &index_name),
+        Command::CompactIndex { index_name } => compact_index(db_path, &index_name),
         Command::HairDryer { index_name, index_part } => {
             hair_dryer(db_path, &index_name, &index_part)
         }

crates/milli/Cargo.toml

@@ -19,7 +19,7 @@ bstr = "1.12.0"
 bytemuck = { version = "1.23.1", features = ["extern_crate_alloc"] }
 byteorder = "1.5.0"
 charabia = { version = "0.9.7", default-features = false }
-cellulite = "0.3.1-nested-rtxns-2"
+cellulite = "0.3.0"
 concat-arrays = "0.1.2"
 convert_case = "0.8.0"
 crossbeam-channel = "0.5.15"
@@ -34,7 +34,7 @@ grenad = { version = "0.5.0", default-features = false, features = [
     "rayon",
     "tempfile",
 ] }
-heed = { version = "0.22.1-nested-rtxns", default-features = false, features = [
+heed = { version = "0.22.0", default-features = false, features = [
     "serde-json",
     "serde-bincode",
 ] }
@@ -89,8 +89,8 @@ rhai = { version = "1.22.2", features = [
     "no_time",
     "sync",
 ] }
-arroy = "0.6.4-nested-rtxns"
-hannoy = { version = "0.0.9-nested-rtxns-2", features = ["arroy"] }
+arroy = "0.6.3"
+hannoy = { version = "0.0.8", features = ["arroy"] }
 rand = "0.8.5"
 tracing = "0.1.41"
 ureq = { version = "2.12.1", features = ["json"] }
@@ -119,7 +119,7 @@ twox-hash = { version = "2.1.1", default-features = false, features = [
     "xxhash64",
 ] }
 geo-types = "0.7.16"
-zerometry = "0.3.0"
+zerometry = "0.1.0"
 
 [dev-dependencies]
 mimalloc = { version = "0.1.47", default-features = false }

crates/milli/src/score_details.rs

@@ -66,29 +66,15 @@ impl ScoreDetails {
         }
     }
 
-    /// Calculate the global score of the details.
-    ///
-    /// It is computed from the ranks of the ranking rules, excluding the sort/geo sort rules.
-    /// If the details contain a semantic score (ScoreDetails::Vector), it is used instead of the ranking score.
-    ///
-    /// note: this function expects a maximum of one semantic score, otherwise only the last one will be used.
     pub fn global_score<'a>(details: impl Iterator<Item = &'a Self> + 'a) -> f64 {
-        // Filter out only the ranking scores (Rank values) and exclude sort/geo sort
-        let mut semantic_score = None;
-        let ranking_ranks = details.filter_map(|detail| match detail.rank_or_value() {
-            RankOrValue::Rank(rank) => Some(rank),
-            RankOrValue::Score(score) => {
-                semantic_score = Some(score);
-                None
-            }
-            RankOrValue::Sort(_) => None,
-            RankOrValue::GeoSort(_) => None,
-        });
-
-        let ranking_score = Rank::global_score(ranking_ranks);
-
-        // If we have semantic score, use it, otherwise use ranking score
-        semantic_score.unwrap_or(ranking_score)
+        Self::score_values(details)
+            .find_map(|x| {
+                let ScoreValue::Score(score) = x else {
+                    return None;
+                };
+                Some(score)
+            })
+            .unwrap_or(1.0f64)
     }
 
     pub fn score_values<'a>(

crates/milli/src/search/new/bucket_sort.rs

@@ -97,7 +97,7 @@ pub fn bucket_sort<'ctx, Q: RankingRuleQueryTrait>(
 
     logger.start_iteration_ranking_rule(0, ranking_rules[0].as_ref(), query, universe);
 
-    ranking_rules[0].start_iteration(ctx, logger, universe, query, &time_budget)?;
+    ranking_rules[0].start_iteration(ctx, logger, universe, query)?;
 
     let mut ranking_rule_scores: Vec<ScoreDetails> = vec![];
 
@@ -168,6 +168,42 @@ pub fn bucket_sort<'ctx, Q: RankingRuleQueryTrait>(
         };
 
     while valid_docids.len() < max_len_to_evaluate {
+        if time_budget.exceeded() {
+            loop {
+                let bucket = std::mem::take(&mut ranking_rule_universes[cur_ranking_rule_index]);
+                ranking_rule_scores.push(ScoreDetails::Skipped);
+
+                // remove candidates from the universe without adding them to result if their score is below the threshold
+                let is_below_threshold =
+                    ranking_score_threshold.is_some_and(|ranking_score_threshold| {
+                        let current_score = ScoreDetails::global_score(ranking_rule_scores.iter());
+                        current_score < ranking_score_threshold
+                    });
+
+                if is_below_threshold {
+                    all_candidates -= &bucket;
+                    all_candidates -= &ranking_rule_universes[cur_ranking_rule_index];
+                } else {
+                    maybe_add_to_results!(bucket);
+                }
+
+                ranking_rule_scores.pop();
+
+                if cur_ranking_rule_index == 0 {
+                    break;
+                }
+
+                back!();
+            }
+
+            return Ok(BucketSortOutput {
+                scores: valid_scores,
+                docids: valid_docids,
+                all_candidates,
+                degraded: true,
+            });
+        }
+
         // The universe for this bucket is zero, so we don't need to sort
         // anything, just go back to the parent ranking rule.
         if ranking_rule_universes[cur_ranking_rule_index].is_empty()
@@ -180,63 +216,14 @@ pub fn bucket_sort<'ctx, Q: RankingRuleQueryTrait>(
             continue;
         }
 
-        let next_bucket = if time_budget.exceeded() {
-            match ranking_rules[cur_ranking_rule_index].non_blocking_next_bucket(
-                ctx,
-                logger,
-                &ranking_rule_universes[cur_ranking_rule_index],
-            )? {
-                std::task::Poll::Ready(bucket) => bucket,
-                std::task::Poll::Pending => {
-                    loop {
-                        let bucket =
-                            std::mem::take(&mut ranking_rule_universes[cur_ranking_rule_index]);
-                        ranking_rule_scores.push(ScoreDetails::Skipped);
-
-                        // remove candidates from the universe without adding them to result if their score is below the threshold
-                        let is_below_threshold =
-                            ranking_score_threshold.is_some_and(|ranking_score_threshold| {
-                                let current_score =
-                                    ScoreDetails::global_score(ranking_rule_scores.iter());
-                                current_score < ranking_score_threshold
-                            });
-
-                        if is_below_threshold {
-                            all_candidates -= &bucket;
-                            all_candidates -= &ranking_rule_universes[cur_ranking_rule_index];
-                        } else {
-                            maybe_add_to_results!(bucket);
-                        }
-
-                        ranking_rule_scores.pop();
-
-                        if cur_ranking_rule_index == 0 {
-                            break;
-                        }
-
-                        back!();
-                    }
-
-                    return Ok(BucketSortOutput {
-                        scores: valid_scores,
-                        docids: valid_docids,
-                        all_candidates,
-                        degraded: true,
-                    });
-                }
-            }
-        } else {
-            let Some(next_bucket) = ranking_rules[cur_ranking_rule_index].next_bucket(
-                ctx,
-                logger,
-                &ranking_rule_universes[cur_ranking_rule_index],
-                &time_budget,
-            )?
-            else {
-                back!();
-                continue;
-            };
-            next_bucket
+        let Some(next_bucket) = ranking_rules[cur_ranking_rule_index].next_bucket(
+            ctx,
+            logger,
+            &ranking_rule_universes[cur_ranking_rule_index],
+        )?
+        else {
+            back!();
+            continue;
         };
 
         ranking_rule_scores.push(next_bucket.score);
@@ -288,7 +275,6 @@ pub fn bucket_sort<'ctx, Q: RankingRuleQueryTrait>(
             logger,
             &next_bucket.candidates,
             &next_bucket.query,
-            &time_budget,
         )?;
     }
 

crates/milli/src/search/new/exact_attribute.rs

@@ -6,7 +6,7 @@ use super::ranking_rules::{RankingRule, RankingRuleOutput};
 use crate::score_details::{self, ScoreDetails};
 use crate::search::new::query_graph::QueryNodeData;
 use crate::search::new::query_term::ExactTerm;
-use crate::{CboRoaringBitmapCodec, Result, SearchContext, SearchLogger, TimeBudget};
+use crate::{CboRoaringBitmapCodec, Result, SearchContext, SearchLogger};
 
 /// A ranking rule that produces 3 disjoint buckets:
 ///
@@ -35,7 +35,6 @@ impl<'ctx> RankingRule<'ctx, QueryGraph> for ExactAttribute {
         _logger: &mut dyn SearchLogger<QueryGraph>,
         universe: &roaring::RoaringBitmap,
         query: &QueryGraph,
-        _time_budget: &TimeBudget,
     ) -> Result<()> {
         self.state = State::start_iteration(ctx, universe, query)?;
         Ok(())
@@ -47,7 +46,6 @@ impl<'ctx> RankingRule<'ctx, QueryGraph> for ExactAttribute {
         _ctx: &mut SearchContext<'ctx>,
         _logger: &mut dyn SearchLogger<QueryGraph>,
         universe: &roaring::RoaringBitmap,
-        _time_budget: &TimeBudget,
     ) -> Result<Option<RankingRuleOutput<QueryGraph>>> {
         let state = std::mem::take(&mut self.state);
         let (state, output) = State::next(state, universe);

crates/milli/src/search/new/geo_sort.rs

@@ -7,7 +7,7 @@ use super::ranking_rules::{RankingRule, RankingRuleOutput, RankingRuleQueryTrait
 use crate::documents::geo_sort::{fill_cache, next_bucket};
 use crate::documents::{GeoSortParameter, GeoSortStrategy};
 use crate::score_details::{self, ScoreDetails};
-use crate::{GeoPoint, Result, SearchContext, SearchLogger, TimeBudget};
+use crate::{GeoPoint, Result, SearchContext, SearchLogger};
 
 pub struct GeoSort<Q: RankingRuleQueryTrait> {
     query: Option<Q>,
@@ -84,7 +84,6 @@ impl<'ctx, Q: RankingRuleQueryTrait> RankingRule<'ctx, Q> for GeoSort<Q> {
         _logger: &mut dyn SearchLogger<Q>,
         universe: &RoaringBitmap,
         query: &Q,
-        _time_budget: &TimeBudget,
     ) -> Result<()> {
         assert!(self.query.is_none());
 
@@ -111,7 +110,6 @@ impl<'ctx, Q: RankingRuleQueryTrait> RankingRule<'ctx, Q> for GeoSort<Q> {
         ctx: &mut SearchContext<'ctx>,
         _logger: &mut dyn SearchLogger<Q>,
         universe: &RoaringBitmap,
-        _time_budget: &TimeBudget,
     ) -> Result<Option<RankingRuleOutput<Q>>> {
         let query = self.query.as_ref().unwrap().clone();
 

crates/milli/src/search/new/graph_based_ranking_rule.rs

@@ -53,7 +53,7 @@ use super::{QueryGraph, RankingRule, RankingRuleOutput, SearchContext};
 use crate::score_details::Rank;
 use crate::search::new::query_term::LocatedQueryTermSubset;
 use crate::search::new::ranking_rule_graph::PathVisitor;
-use crate::{Result, TermsMatchingStrategy, TimeBudget};
+use crate::{Result, TermsMatchingStrategy};
 
 pub type Words = GraphBasedRankingRule<WordsGraph>;
 impl GraphBasedRankingRule<WordsGraph> {
@@ -135,7 +135,6 @@ impl<'ctx, G: RankingRuleGraphTrait> RankingRule<'ctx, QueryGraph> for GraphBase
         _logger: &mut dyn SearchLogger<QueryGraph>,
         _universe: &RoaringBitmap,
         query_graph: &QueryGraph,
-        _time_budget: &TimeBudget,
     ) -> Result<()> {
         // the `next_max_cost` is the successor integer to the maximum cost of the paths in the graph.
         //
@@ -218,7 +217,6 @@ impl<'ctx, G: RankingRuleGraphTrait> RankingRule<'ctx, QueryGraph> for GraphBase
         ctx: &mut SearchContext<'ctx>,
         logger: &mut dyn SearchLogger<QueryGraph>,
         universe: &RoaringBitmap,
-        _time_budget: &TimeBudget,
     ) -> Result<Option<RankingRuleOutput<QueryGraph>>> {
         // Will crash if `next_bucket` is called before `start_iteration` or after `end_iteration`,
         // should never happen

crates/milli/src/search/new/mod.rs

@@ -21,7 +21,7 @@ mod vector_sort;
 #[cfg(test)]
 mod tests;
 
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use std::ops::AddAssign;
 use std::time::Duration;
 
@@ -64,12 +64,6 @@ use crate::{
     UserError, Weight,
 };
 
-/// Cache for synonyms to avoid repeated database access
-#[derive(Default)]
-pub struct SynonymCache {
-    pub cache: Option<HashMap<Vec<String>, Vec<Vec<String>>>>,
-}
-
 /// A structure used throughout the execution of a search query.
 pub struct SearchContext<'ctx> {
     pub index: &'ctx Index,
@@ -79,7 +73,6 @@ pub struct SearchContext<'ctx> {
     pub phrase_interner: DedupInterner<Phrase>,
     pub term_interner: Interner<QueryTerm>,
     pub phrase_docids: PhraseDocIdsCache,
-    pub synonym_cache: SynonymCache,
     pub restricted_fids: Option<RestrictedFids>,
     pub prefix_search: PrefixSearch,
     pub vector_store_stats: Option<VectorStoreStats>,
@@ -110,7 +103,6 @@ impl<'ctx> SearchContext<'ctx> {
             phrase_interner: <_>::default(),
             term_interner: <_>::default(),
             phrase_docids: <_>::default(),
-            synonym_cache: <_>::default(),
             restricted_fids: None,
             prefix_search,
             vector_store_stats: None,
@@ -121,17 +113,6 @@ impl<'ctx> SearchContext<'ctx> {
         self.prefix_search != PrefixSearch::Disabled
     }
 
-    /// Get synonyms with caching to avoid repeated database access
-    pub fn get_synonyms(&mut self) -> Result<&HashMap<Vec<String>, Vec<Vec<String>>>> {
-        match self.synonym_cache.cache {
-            Some(ref synonyms) => Ok(synonyms),
-            None => {
-                let synonyms = self.index.synonyms(self.txn)?;
-                Ok(self.synonym_cache.cache.insert(synonyms))
-            }
-        }
-    }
-
     pub fn attributes_to_search_on(
         &mut self,
         attributes_to_search_on: &'ctx [String],

crates/milli/src/search/new/query_term/compute_derivations.rs

@@ -214,7 +214,7 @@ pub fn partially_initialized_term_from_word(
     if is_prefix && use_prefix_db.is_none() {
         find_zero_typo_prefix_derivations(ctx, word_interned, &mut prefix_of)?;
     }
-    let synonyms = ctx.get_synonyms()?;
+    let synonyms = ctx.index.synonyms(ctx.txn)?;
     let mut synonym_word_count = 0;
     let synonyms = synonyms
         .get(&vec![word.to_owned()])

crates/milli/src/search/new/query_term/parse_query.rs

@@ -258,7 +258,7 @@ pub fn make_ngram(
         partially_initialized_term_from_word(ctx, &ngram_str, max_nbr_typos, is_prefix, true)?;
 
     // Now add the synonyms
-    let index_synonyms = ctx.get_synonyms()?;
+    let index_synonyms = ctx.index.synonyms(ctx.txn)?;
 
     term.zero_typo.synonyms.extend(
         index_synonyms.get(&words).cloned().unwrap_or_default().into_iter().map(|words| {

crates/milli/src/search/new/ranking_rules.rs

@@ -1,11 +1,9 @@
-use std::task::Poll;
-
 use roaring::RoaringBitmap;
 
 use super::logger::SearchLogger;
 use super::{QueryGraph, SearchContext};
 use crate::score_details::ScoreDetails;
-use crate::{Result, TimeBudget};
+use crate::Result;
 
 /// An internal trait implemented by only [`PlaceholderQuery`] and [`QueryGraph`]
 pub trait RankingRuleQueryTrait: Sized + Clone + 'static {}
@@ -30,15 +28,12 @@ pub trait RankingRule<'ctx, Query: RankingRuleQueryTrait> {
     /// buckets using [`next_bucket`](RankingRule::next_bucket).
     ///
     /// The given universe is the universe that will be given to [`next_bucket`](RankingRule::next_bucket).
-    ///
-    /// If this function may take a long time, it should check the `time_budget` and return early if exceeded.
     fn start_iteration(
         &mut self,
         ctx: &mut SearchContext<'ctx>,
         logger: &mut dyn SearchLogger<Query>,
         universe: &RoaringBitmap,
         query: &Query,
-        time_budget: &TimeBudget,
     ) -> Result<()>;
 
     /// Return the next bucket of this ranking rule.
@@ -48,31 +43,13 @@ pub trait RankingRule<'ctx, Query: RankingRuleQueryTrait> {
     /// The universe given as argument is either:
     /// - a subset of the universe given to the previous call to [`next_bucket`](RankingRule::next_bucket); OR
     /// - the universe given to [`start_iteration`](RankingRule::start_iteration)
-    ///
-    /// If this function may take a long time, it should check the `time_budget` and return early if exceeded.
     fn next_bucket(
         &mut self,
         ctx: &mut SearchContext<'ctx>,
         logger: &mut dyn SearchLogger<Query>,
         universe: &RoaringBitmap,
-        time_budget: &TimeBudget,
     ) -> Result<Option<RankingRuleOutput<Query>>>;
 
-    /// Return the next bucket of this ranking rule, if doing so can be done without blocking
-    ///
-    /// Even if the time budget is exceeded, when getting the next bucket is a fast operation, this should return `true`
-    /// to allow Meilisearch to collect the results.
-    ///
-    /// Default implementation conservatively returns that it would block.
-    fn non_blocking_next_bucket(
-        &mut self,
-        _ctx: &mut SearchContext<'ctx>,
-        _logger: &mut dyn SearchLogger<Query>,
-        _universe: &RoaringBitmap,
-    ) -> Result<Poll<RankingRuleOutput<Query>>> {
-        Ok(Poll::Pending)
-    }
-
     /// Finish iterating over the buckets, which yields control to the parent ranking rule
     /// The next call to this ranking rule, if any, will be [`start_iteration`](RankingRule::start_iteration).
     fn end_iteration(

crates/milli/src/search/new/sort.rs

@@ -7,7 +7,7 @@ use crate::heed_codec::facet::{FacetGroupKeyCodec, OrderedF64Codec};
 use crate::heed_codec::{BytesRefCodec, StrRefCodec};
 use crate::score_details::{self, ScoreDetails};
 use crate::search::facet::{ascending_facet_sort, descending_facet_sort};
-use crate::{FieldId, Index, Result, TimeBudget};
+use crate::{FieldId, Index, Result};
 
 pub trait RankingRuleOutputIter<'ctx, Query> {
     fn next_bucket(&mut self) -> Result<Option<RankingRuleOutput<Query>>>;
@@ -96,7 +96,6 @@ impl<'ctx, Query: RankingRuleQueryTrait> RankingRule<'ctx, Query> for Sort<'ctx,
         _logger: &mut dyn SearchLogger<Query>,
         parent_candidates: &RoaringBitmap,
         parent_query: &Query,
-        _time_budget: &TimeBudget,
     ) -> Result<()> {
         let iter: RankingRuleOutputIterWrapper<'ctx, Query> = match self.field_id {
             Some(field_id) => {
@@ -195,7 +194,6 @@ impl<'ctx, Query: RankingRuleQueryTrait> RankingRule<'ctx, Query> for Sort<'ctx,
         _ctx: &mut SearchContext<'ctx>,
         _logger: &mut dyn SearchLogger<Query>,
         universe: &RoaringBitmap,
-        _time_budget: &TimeBudget,
     ) -> Result<Option<RankingRuleOutput<Query>>> {
         let iter = self.iter.as_mut().unwrap();
         if let Some(mut bucket) = iter.next_bucket()? {