Skip to content

Commit d89b208

Browse files
Prepare release 3.5.0 (#786)
## Product change and motivation Update version & release notes; Bump dependencies
1 parent c467bc8 commit d89b208

File tree

8 files changed

+42
-23
lines changed

8 files changed

+42
-23
lines changed

RELEASE_NOTES_LATEST.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ Documentation: https://typedb.com/docs/drivers/rust/overview
99

1010

1111
```sh
12-
cargo add typedb-driver@3.5.0-rc0
12+
cargo add typedb-driver@3.5.0
1313
```
1414

1515

1616
### Java driver
1717

18-
Available through [https://repo.typedb.com](https://cloudsmith.io/~typedb/repos/public-release/packages/detail/maven/typedb-driver/3.5.0-rc0/a=noarch;xg=com.typedb/)
18+
Available through [https://repo.typedb.com](https://cloudsmith.io/~typedb/repos/public-release/packages/detail/maven/typedb-driver/3.5.0/a=noarch;xg=com.typedb/)
1919
Documentation: https://typedb.com/docs/drivers/java/overview
2020

2121
```xml
@@ -29,7 +29,7 @@ Documentation: https://typedb.com/docs/drivers/java/overview
2929
<dependency>
3030
<groupid>com.typedb</groupid>
3131
<artifactid>typedb-driver</artifactid>
32-
<version>3.5.0-rc0</version>
32+
<version>3.5.0</version>
3333
</dependency>
3434
</dependencies>
3535
```
@@ -42,7 +42,7 @@ Documentation: https://typedb.com/docs/drivers/python/overview
4242
Available through https://pypi.org
4343

4444
```
45-
pip install typedb-driver==3.5.0rc0
45+
pip install typedb-driver==3.5.0
4646
```
4747

4848
### HTTP Typescript driver
@@ -53,10 +53,17 @@ NPM package: https://www.npmjs.com/package/typedb-driver-http
5353
Documentation: https://typedb.com/docs/drivers/
5454

5555
```
56-
npm install typedb-driver-http@3.5.0-rc0
56+
npm install typedb-driver-http@3.5.0
5757
```
5858

5959
## New Features
60+
- **Implement serde traits for JSON**
61+
62+
We implement serde's `Serialize` for `ConceptDocument` and our custom `JSON` type. This allows crates like `axum` that rely on `serde` to seamlessly return `Json<ConceptDocument>` from request handlers.
63+
64+
We also implement `Deserialize` for `JSON` for convenience.
65+
66+
6067
- **Update the HTTP-TS driver with analyze endpoint response**
6168
Update the HTTP-TS driver with the response structure for the analyze endpoint
6269

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.5.0-rc0
1+
3.5.0

dependencies/typedb/artifacts.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def typedb_artifact():
2525
artifact_name = "typedb-all-{platform}-{version}.{ext}",
2626
tag_source = deployment["artifact"]["release"]["download"],
2727
commit_source = deployment["artifact"]["snapshot"]["download"],
28-
commit = "ee675e16030aaff1751f5c91cf3afa3b7c1a84ad"
28+
tag = "3.5.0-rc0"
2929
)
3030

3131
#def typedb_cloud_artifact():

dependencies/typedb/repositories.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def typedb_dependencies():
2121
git_repository(
2222
name = "typedb_dependencies",
2323
remote = "https://github.com/typedb/typedb-dependencies",
24-
commit = "fac1121c903b0c9e5924d391a883e4a0749a82a2", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_dependencies
24+
commit = "f6e710f9857b1c30ad1764c1c41afce4e4e02981", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_dependencies
2525
)
2626

2727
def typedb_protocol():
@@ -35,5 +35,5 @@ def typedb_behaviour():
3535
git_repository(
3636
name = "typedb_behaviour",
3737
remote = "https://github.com/typedb/typedb-behaviour",
38-
commit = "913455bf2923f8a6853f513bab9d3dc34d12c254", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_behaviour
38+
commit = "85079e8179d8ec9bd189281159ec0661dc6422c5", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_behaviour
3939
)

rust/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
[dev-dependencies.async-std]
3535
features = ["alloc", "async-attributes", "async-channel", "async-global-executor", "async-io", "async-lock", "attributes", "crossbeam-utils", "default", "futures-channel", "futures-core", "futures-io", "futures-lite", "gloo-timers", "kv-log-macro", "log", "memchr", "once_cell", "pin-project-lite", "pin-utils", "slab", "std", "wasm-bindgen-futures"]
36-
version = "1.13.1"
36+
version = "1.13.2"
3737
default-features = false
3838

3939
[dev-dependencies.config]
@@ -53,14 +53,14 @@
5353

5454
[dev-dependencies.serde_json]
5555
features = ["alloc", "default", "indexmap", "preserve_order", "raw_value", "std"]
56-
version = "1.0.140"
56+
version = "1.0.143"
5757
default-features = false
5858

5959
[dependencies]
6060

6161
[dependencies.tokio]
6262
features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "mio", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros"]
63-
version = "1.45.0"
63+
version = "1.47.1"
6464
default-features = false
6565

6666
[dependencies.typedb-protocol]
@@ -96,7 +96,7 @@
9696

9797
[dependencies.uuid]
9898
features = ["default", "fast-rng", "rng", "serde", "std", "v4"]
99-
version = "1.16.0"
99+
version = "1.18.0"
100100
default-features = false
101101

102102
[dependencies.prost]

rust/src/common/error.rs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,9 @@ impl Error {
318318
}
319319
}
320320

321-
fn from_message(message: &str) -> Self {
321+
fn from_message(message: String) -> Self {
322322
// TODO: Consider converting some of the messages to connection errors
323-
Self::Other(message.to_owned())
323+
Self::Other(message)
324324
}
325325

326326
fn parse_unavailable(status_message: &str) -> Error {
@@ -406,7 +406,7 @@ impl From<Status> for Error {
406406

407407
Self::Server(ServerError::new(code, domain, status.message().to_owned(), stack_trace))
408408
} else {
409-
Self::from_message(status.message())
409+
Self::from_message(concat_source_messages(&status))
410410
}
411411
} else {
412412
if status.code() == Code::Unavailable {
@@ -422,7 +422,7 @@ impl From<Status> for Error {
422422
} else if status.code() == Code::Unimplemented {
423423
Self::Connection(ConnectionError::RPCMethodUnavailable { message: status.message().to_owned() })
424424
} else {
425-
Self::from_message(status.message())
425+
Self::from_message(concat_source_messages(&status))
426426
}
427427
}
428428
}
@@ -433,6 +433,18 @@ fn is_rst_stream(status: &Status) -> bool {
433433
status.message().contains("Received Rst Stream")
434434
}
435435

436+
fn concat_source_messages(status: &Status) -> String {
437+
let mut errors = String::new();
438+
errors.push_str(status.message());
439+
let mut err: Option<&dyn std::error::Error> = status.source();
440+
while let Some(e) = err {
441+
errors.push_str(": ");
442+
errors.push_str(e.to_string().as_str());
443+
err = e.source();
444+
}
445+
errors
446+
}
447+
436448
impl From<http::uri::InvalidUri> for Error {
437449
fn from(err: http::uri::InvalidUri) -> Self {
438450
Self::Other(err.to_string())

rust/tests/behaviour/steps/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ features = {}
1616

1717
[dependencies.tokio]
1818
features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "mio", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros"]
19-
version = "1.45.0"
19+
version = "1.47.1"
2020
default-features = false
2121

2222
[dependencies.smol]
@@ -36,12 +36,12 @@ features = {}
3636

3737
[dependencies.async-std]
3838
features = ["alloc", "async-attributes", "async-channel", "async-global-executor", "async-io", "async-lock", "attributes", "crossbeam-utils", "default", "futures-channel", "futures-core", "futures-io", "futures-lite", "gloo-timers", "kv-log-macro", "log", "memchr", "once_cell", "pin-project-lite", "pin-utils", "slab", "std", "wasm-bindgen-futures"]
39-
version = "1.13.1"
39+
version = "1.13.2"
4040
default-features = false
4141

4242
[dependencies.macro_rules_attribute]
4343
features = ["default"]
44-
version = "0.2.0"
44+
version = "0.2.2"
4545
default-features = false
4646

4747
[dependencies.typedb-driver]
@@ -61,7 +61,7 @@ features = {}
6161

6262
[dependencies.uuid]
6363
features = ["default", "fast-rng", "rng", "serde", "std", "v4"]
64-
version = "1.16.0"
64+
version = "1.18.0"
6565
default-features = false
6666

6767
[dependencies.itertools]
@@ -71,6 +71,6 @@ features = {}
7171

7272
[dependencies.serde_json]
7373
features = ["alloc", "default", "indexmap", "preserve_order", "raw_value", "std"]
74-
version = "1.0.140"
74+
version = "1.0.143"
7575
default-features = false
7676

tool/test/start-community-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set -e
2121
rm -rf typedb-all
2222

2323
bazel run //tool/test:typedb-extractor -- typedb-all
24-
./typedb-all/typedb server --development-mode.enabled true --server.authentication.token_ttl_seconds 15 &
24+
./typedb-all/typedb server --development-mode.enabled true --server.authentication.token-expiration-seconds 15 &
2525

2626
set +e
2727
POLL_INTERVAL_SECS=0.5

0 commit comments

Comments
 (0)