Skip to content

Commit 7bfb2bb

Browse files
authored
Merge branch 'main' into remove-bors
2 parents c39bfd4 + 2449b6a commit 7bfb2bb

File tree

24 files changed

+2041
-31
lines changed

24 files changed

+2041
-31
lines changed

.code-samples.meilisearch.yaml

Lines changed: 71 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ update_an_index_1: |-
9494
.execute()
9595
.await
9696
.unwrap();
97+
rename_an_index_1: |-
98+
curl \
99+
-X PATCH 'MEILISEARCH_URL/indexes/INDEX_A' \
100+
-H 'Content-Type: application/json' \
101+
--data-binary '{ "uid": "INDEX_B" }'
97102
delete_an_index_1: |-
98103
client.index("movies")
99104
.delete()
@@ -137,6 +142,13 @@ get_documents_post_1: |-
137142
.execute::<Movies>()
138143
.await
139144
.unwrap();
145+
get_documents_by_ids_1: |-
146+
let index = client.index("books");
147+
let documents: DocumentsResults = DocumentsQuery::new(&index)
148+
.with_ids(["1", "2"]) // retrieve documents by IDs
149+
.execute::<Movies>()
150+
.await
151+
.unwrap();
140152
add_or_replace_documents_1: |-
141153
let task: TaskInfo = client
142154
.index("movies")
@@ -444,6 +456,23 @@ reset_typo_tolerance_1: |-
444456
.reset_typo_tolerance()
445457
.await
446458
.unwrap();
459+
get_all_batches_1: |-
460+
let mut query = meilisearch_sdk::batches::BatchesQuery::new(&client);
461+
query.with_limit(20);
462+
let batches: meilisearch_sdk::batches::BatchesResults =
463+
client.get_batches_with(&query).await.unwrap();
464+
get_batch_1: |-
465+
let uid: u32 = 42;
466+
let batch: meilisearch_sdk::batches::Batch = client
467+
.get_batch(uid)
468+
.await
469+
.unwrap();
470+
get_all_batches_paginating_1: |-
471+
let mut query = meilisearch_sdk::batches::BatchesQuery::new(&client);
472+
query.with_limit(2);
473+
query.with_from(40);
474+
let batches: meilisearch_sdk::batches::BatchesResults =
475+
client.get_batches_with(&query).await.unwrap();
447476
get_stop_words_1: |-
448477
let stop_words: Vec<String> = client
449478
.index("movies")
@@ -690,10 +719,16 @@ distinct_attribute_guide_1: |-
690719
.set_distinct_attribute("product_id")
691720
.await
692721
.unwrap();
722+
compact_index_1: |-
723+
let task: TaskInfo = client
724+
.index("INDEX_UID")
725+
.compact()
726+
.await
727+
.unwrap();
693728
field_properties_guide_searchable_1: |-
694729
let searchable_attributes = [
695730
"title",
696-
"overvieww",
731+
"overview",
697732
"genres"
698733
];
699734
@@ -705,7 +740,7 @@ field_properties_guide_searchable_1: |-
705740
field_properties_guide_displayed_1: |-
706741
let displayed_attributes = [
707742
"title",
708-
"overvieww",
743+
"overview",
709744
"genres",
710745
"release_date"
711746
];
@@ -1060,7 +1095,7 @@ primary_field_guide_add_document_primary_key: |-
10601095
getting_started_add_documents: |-
10611096
// In your .toml file:
10621097
[dependencies]
1063-
meilisearch-sdk = "0.29.1"
1098+
meilisearch-sdk = "0.31.0"
10641099
# futures: because we want to block on futures
10651100
futures = "0.3"
10661101
# serde: required if you are going to use documents
@@ -1936,6 +1971,20 @@ search_parameter_reference_retrieve_vectors_1: |-
19361971
.execute()
19371972
.await
19381973
.unwrap();
1974+
search_parameter_reference_media_1: |-
1975+
let results = index
1976+
.search()
1977+
.with_hybrid("EMBEDDER_NAME", 0.5)
1978+
.with_media(json!({
1979+
"FIELD_A": "VALUE_A",
1980+
"FIELD_B": {
1981+
"FIELD_C": "VALUE_B",
1982+
"FIELD_D": "VALUE_C"
1983+
}
1984+
}))
1985+
.execute()
1986+
.await
1987+
.unwrap();
19391988
update_embedders_1: |-
19401989
let embedders = HashMap::from([(
19411990
String::from("default"),
@@ -1951,3 +2000,22 @@ update_embedders_1: |-
19512000
.set_embedders(&embedders)
19522001
.await
19532002
.unwrap();
2003+
webhooks_get_1: |-
2004+
let webhooks = client.get_webhooks().await.unwrap();
2005+
webhooks_get_single_1: |-
2006+
let webhook = client.get_webhook("WEBHOOK_UUID").await.unwrap();
2007+
webhooks_post_1: |-
2008+
let mut payload = meilisearch_sdk::webhooks::WebhookCreate::new("WEBHOOK_TARGET_URL");
2009+
payload
2010+
.insert_header("authorization", "SECURITY_KEY")
2011+
.insert_header("referer", "https://example.com");
2012+
let webhook = client.create_webhook(&payload).await.unwrap();
2013+
webhooks_patch_1: |-
2014+
let mut update = meilisearch_sdk::webhooks::WebhookUpdate::new();
2015+
update.remove_header("referer");
2016+
let webhook = client
2017+
.update_webhook("WEBHOOK_UUID", &update)
2018+
.await
2019+
.unwrap();
2020+
webhooks_delete_1: |-
2021+
client.delete_webhook("WEBHOOK_UUID").await.unwrap();

.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ updates:
55
schedule:
66
interval: "monthly"
77
labels:
8-
- 'skip-changelog'
98
- 'dependencies'
109
rebase-strategy: disabled
1110

@@ -16,6 +15,5 @@ updates:
1615
time: "04:00"
1716
open-pull-requests-limit: 10
1817
labels:
19-
- skip-changelog
2018
- dependencies
2119
rebase-strategy: disabled

.github/release-draft-template.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ categories:
1818
label: 'security'
1919
- title: '⚙️ Maintenance/misc'
2020
label:
21+
- 'dependencies'
2122
- 'maintenance'
2223
- 'documentation'
2324
template: |

.github/workflows/pre-release-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: integration-tests-against-rc
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
- name: Build
2121
run: cargo build --verbose
2222
- name: Get the latest Meilisearch RC

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Rust project
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- uses: hecrj/setup-rust-action@master
1414
with:
1515
rust-version: stable

.github/workflows/tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
name: integration-tests
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
- name: Build
2323
run: cargo build --verbose
2424
- name: Meilisearch (latest version) setup with Docker
@@ -40,7 +40,7 @@ jobs:
4040
name: clippy-check
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v5
4444
- name: Install clippy
4545
run: rustup component add clippy
4646
- name: Run linter (clippy)
@@ -51,23 +51,23 @@ jobs:
5151
name: rust-format
5252
runs-on: ubuntu-latest
5353
steps:
54-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5555
- name: Run formatter
5656
run: cargo fmt --all -- --check
5757

5858
readme_check:
5959
name: readme-check
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@v4
62+
- uses: actions/checkout@v5
6363
- name: Check the README.md file is up-to-date
6464
run: sh scripts/check-readme.sh
6565

6666
wasm_build:
6767
name: wasm-build
6868
runs-on: ubuntu-latest
6969
steps:
70-
- uses: actions/checkout@v4
70+
- uses: actions/checkout@v5
7171
- name: Build
7272
run: |
7373
rustup target add wasm32-unknown-unknown
@@ -76,7 +76,7 @@ jobs:
7676
name: Yaml linting check
7777
runs-on: ubuntu-latest
7878
steps:
79-
- uses: actions/checkout@v4
79+
- uses: actions/checkout@v5
8080
- name: Yaml lint check
8181
uses: ibiqlik/action-yamllint@v3
8282
with:
@@ -88,7 +88,7 @@ jobs:
8888
needs: integration_tests
8989
name: Code Coverage
9090
steps:
91-
- uses: actions/checkout@v4
91+
- uses: actions/checkout@v5
9292
- name: Meilisearch (latest version) setup with Docker
9393
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --no-analytics --master-key=masterKey
9494
- name: Install cargo-llvm-cov

Cargo.toml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "meilisearch-sdk"
3-
version = "0.29.1"
3+
version = "0.31.0"
44
authors = ["Mubelotix <[email protected]>"]
55
edition = "2018"
66
description = "Rust wrapper for the Meilisearch API. Meilisearch is a powerful, fast, open-source, easy to use and deploy search engine."
@@ -22,29 +22,32 @@ time = { version = "0.3.41", features = ["serde-well-known", "formatting", "pars
2222
yaup = "0.3.1"
2323
either = { version = "1.15.0", features = ["serde"] }
2424
thiserror = "2.0.12"
25-
meilisearch-index-setting-macro = { path = "meilisearch-index-setting-macro", version = "0.29.1" }
25+
meilisearch-index-setting-macro = { path = "meilisearch-index-setting-macro", version = "0.31.0" }
2626
pin-project-lite = { version = "0.2.16", optional = true }
27-
reqwest = { version = "0.12.22", optional = true, default-features = false, features = ["rustls-tls", "http2", "stream"] }
27+
reqwest = { version = "0.12.22", optional = true, default-features = false, features = ["http2", "stream"] }
2828
bytes = { version = "1.10.1", optional = true }
29-
uuid = { version = "1.17.0", features = ["v4"] }
29+
uuid = { version = "1.17.0", features = ["v4", "serde"] }
3030
futures-core = "0.3.31"
3131
futures-io = "0.3.31"
3232
futures-channel = "0.3.31"
3333
futures-util = { version = "0.3.31", default-features = false, features = ["io"] }
3434

3535
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
36-
jsonwebtoken = { version = "9.3.1", default-features = false }
36+
jsonwebtoken = { version = "10.2.0", default-features = false }
3737
tokio = { version = "1.38", optional = true, features = ["time"] }
3838

3939
[target.'cfg(target_arch = "wasm32")'.dependencies]
40-
uuid = { version = "1.17.0", default-features = false, features = ["v4", "js"] }
40+
uuid = { version = "1.17.0", default-features = false, features = ["v4", "js", "serde"] }
4141
web-sys = "0.3.77"
4242
wasm-bindgen-futures = "0.4"
4343

4444
[features]
45-
default = ["reqwest"]
45+
default = ["reqwest", "tls", "jwt_aws_lc_rs"]
4646
reqwest = ["dep:reqwest", "dep:tokio", "pin-project-lite", "bytes"]
47+
tls = ["reqwest/rustls-tls"]
4748
futures-unsend = []
49+
jwt_aws_lc_rs = ["jsonwebtoken/aws_lc_rs"]
50+
jwt_rust_crypto = ["jsonwebtoken/rust_crypto"]
4851

4952
[dev-dependencies]
5053
futures-await-test = "0.3"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ To use `meilisearch-sdk`, add this to your `Cargo.toml`:
5353

5454
```toml
5555
[dependencies]
56-
meilisearch-sdk = "0.29.1"
56+
meilisearch-sdk = "0.31.0"
5757
```
5858

5959
The following optional dependencies may also be useful:

README.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ To use `meilisearch-sdk`, add this to your `Cargo.toml`:
5353

5454
```toml
5555
[dependencies]
56-
meilisearch-sdk = "0.29.1"
56+
meilisearch-sdk = "0.31.0"
5757
```
5858

5959
The following optional dependencies may also be useful:

examples/web_app_graphql/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ actix-web = "4.4.0"
1212
async-graphql = "6.0.11"
1313
async-graphql-actix-web = "6.0.11"
1414
diesel = { version = "2.1.4", features = ["postgres"] }
15-
diesel-async = { version = "0.5.0", features = ["postgres", "deadpool"] }
15+
diesel-async = { version = "0.7.3", features = ["postgres", "deadpool"] }
1616
diesel_migrations = "2.1.0"
1717
dotenvy = "0.15.7"
1818
env_logger = "0.11.3"
@@ -22,5 +22,5 @@ log = "0.4.20"
2222
meilisearch-sdk = "0.24.3"
2323
serde = { version = "1.0.192", features = ["derive"] }
2424
serde_json = "1.0.108"
25-
thiserror = "1.0.51"
26-
validator = { version = "0.18.1", features = ["derive"] }
25+
thiserror = "2.0.17"
26+
validator = { version = "0.20.0", features = ["derive"] }

0 commit comments

Comments
 (0)