Skip to content

Commit affb2d3

Browse files
zk-stevezk-steve
committed
chore: update Cargo.toml
1 parent d888b63 commit affb2d3

File tree

16 files changed

+204
-364
lines changed

16 files changed

+204
-364
lines changed

‎Cargo.lock

Lines changed: 45 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,46 @@
11
[workspace]
2+
resolver = "2"
3+
24
members = [
3-
"src/adapter",
4-
"src/common",
5-
"src/core",
6-
"src/gpt_answer_server",
7-
"src/public",
5+
"src/adapter",
6+
"src/common",
7+
"src/core",
8+
"src/gpt_answer_server",
9+
"src/public",
810
]
9-
resolver = "2"
11+
12+
[workspace.dependencies]
13+
adapter = { path = "./src/adapter" }
14+
common = { path = "./src/common" }
15+
rust_core = { path = "./src/core" }
16+
17+
anyhow = { version = "1.0.86" }
18+
async = { version = "0.0.2" }
19+
async-trait = { version = "0.1.81" }
20+
clap = { version = "4.5.15" }
21+
config = { version = "0.14.0" }
22+
deadpool-diesel = { version = "0.6.1" }
23+
diesel = { version = "2.1.6" }
24+
diesel_migrations = { version = "2.2.0" }
25+
glob = { version = "0.3.1" }
26+
openssl = { version = "0.10.66" }
27+
opentelemetry = { version = "0.24.0" }
28+
opentelemetry-otlp = { version = "0.17.0" }
29+
opentelemetry-semantic-conventions = { version = "0.16.0" }
30+
opentelemetry_sdk = { version = "0.24.1" }
31+
prost = { version = "0.13.1" }
32+
rand = { version = "0.9.0-alpha.2" }
33+
readonly = { version = "0.2.12" }
34+
redis-async = { version = "0.17.2" }
35+
serde = { version = "1.0" }
36+
serde_json = { version = "1.0.124" }
37+
testcontainers-modules = { version = "0.9.0" }
38+
thiserror = { version = "1.0.63" }
39+
tokio = { version = "1.39.2" }
40+
tonic = { version = "0.12.1" }
41+
tonic-build = { version = "0.12.1" }
42+
tracing = { version = "0.1.40" }
43+
tracing-bunyan-formatter = { version = "0.3.9" }
44+
tracing-opentelemetry = { version = "0.25.0" }
45+
tracing-subscriber = { version = "0.3.18" }
46+
warp = { version = "0.3.7" }

‎Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ PKG_NAME_GRPC=rust-grpc-server
66
BUILD_VERSION=$(shell git describe --long)
77
BUILD_RELEASE=$(shell git describe --tags --abbrev=0)
88

9+
cargo-fmt:
10+
taplo fmt -o reorder_keys=true
11+
912
lint:
1013
cargo clippy --fix --allow-dirty --allow-staged
1114

‎deploy/docker/01_gpt_answer_server_custom.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
service_name = "rust-grpc-server-docker"
21
exporter_endpoint = "http://localhost:7281"
32
server_endpoint = "0.0.0.0:50051"
3+
service_name = "rust-grpc-server-docker"
44

55
[redis]
66
host = "redis"
77
port = 6379
88

99
[log]
10-
level = "info"
10+
level = "info"

‎deploy/docker/01_public_custom.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
service_name = "rust-api-server-docker"
21
exporter_endpoint = "http://quickwit:7281"
32
gpt_answer_service_url = "grpc://gpt_answer_server:50051"
3+
service_name = "rust-api-server-docker"
44

55
[server]
6-
url = "0.0.0.0"
76
port = 8888
7+
url = "0.0.0.0"
88

99
[log]
1010
level = "info"
1111

1212
[db.pg]
13-
url = "postgres://postgres:changeme@postgres:5432/postgres"
1413
max_size = 10
14+
url = "postgres://postgres:changeme@postgres:5432/postgres"

‎deploy/local/custom.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
service_name = "rust-api-server-local"
21
gpt_answer_service_url = "grpc://0.0.0.0:50051"
2+
service_name = "rust-api-server-local"
33

44
[server]
55
port = 8888
@@ -8,5 +8,5 @@ port = 8888
88
level = "info"
99

1010
[db.pg]
11+
max_size = 100
1112
url = "postgres://postgres:changeme@localhost:5432/postgres"
12-
max_size = 100

‎deploy/local/gpt_answer_server_custom.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
service_name = "rust-grpc-server-local"
21
exporter_endpoint = "http://localhost:7281"
32
server_endpoint = "0.0.0.0:50051"
3+
service_name = "rust-grpc-server-local"
44

55
[redis]
66
host = "redis"
77
port = 6379
88

99
[log]
10-
level = "info"
10+
level = "info"

‎src/adapter/Cargo.toml

Lines changed: 21 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,26 @@
1-
bin = []
2-
bench = []
3-
test = []
4-
example = []
5-
61
[package]
7-
name = "adapter"
8-
edition = "2021"
9-
version = "0.0.1"
2+
autobenches = true
103
autobins = true
114
autoexamples = true
125
autotests = true
13-
autobenches = true
14-
15-
[dependencies.rust_core]
16-
path = "../core"
17-
18-
[dependencies.common]
19-
path = "../common"
20-
21-
[dependencies.diesel_migrations]
22-
version = "2.2.0"
23-
24-
[dependencies.async-trait]
25-
version = "0.1.81"
26-
27-
[dependencies.deadpool-diesel]
28-
version = "0.6.1"
29-
features = ["postgres", "serde"]
30-
31-
[dependencies.diesel]
32-
version = "2.2.2"
33-
features = ["postgres", "postgres_backend", "uuid"]
34-
35-
[dependencies.serde]
36-
version = "1.0"
37-
features = ["derive"]
38-
39-
[dependencies.testcontainers-modules]
40-
version = "0.9.0"
41-
features = ["postgres", "redis"]
42-
43-
[dependencies.tokio]
44-
version = "1.39.2"
45-
features = ["full"]
46-
47-
[dependencies.anyhow]
48-
version = "1.0.86"
49-
50-
[dependencies.tonic]
51-
version = "0.12.1"
6+
edition = "2021"
7+
name = "adapter"
8+
version = "0.0.1"
529

53-
[dependencies.redis-async]
54-
version = "0.17.2"
10+
[dependencies]
11+
anyhow = { workspace = true }
12+
async-trait = { workspace = true }
13+
common = { workspace = true }
14+
deadpool-diesel = { workspace = true, features = ["postgres", "serde"] }
15+
diesel = { workspace = true, features = [
16+
"postgres",
17+
"postgres_backend",
18+
"uuid",
19+
] }
20+
diesel_migrations = { workspace = true }
21+
redis-async = { workspace = true }
22+
rust_core = { workspace = true }
23+
serde = { workspace = true, features = ["derive"] }
24+
testcontainers-modules = { workspace = true, features = ["postgres", "redis"] }
25+
tokio = { workspace = true, features = ["full"] }
26+
tonic = { workspace = true }

‎src/adapter/src/repositories/postgres/diesel.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# see https://diesel.rs/guides/configuring-diesel-cli
33

44
[print_schema]
5-
file = "schema.rs"
65
custom_type_derives = ["diesel::query_builder::QueryId"]
6+
file = "schema.rs"
77

88
[migrations_directory]
99
dir = "migrations"

‎src/adapter/src/repositories/postgres/models/question.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use rust_core::entities::question::{QuestionEntity, QuestionId};
88

99
#[derive(Debug, Queryable, Serialize, Selectable, Insertable, AsChangeset, Identifiable)]
1010
#[diesel(table_name = super::super::schema::questions)]
11-
#[cfg_attr(feature = "postgres", derive(diesel::pg::Pg))]
1211
pub struct QuestionModel {
1312
pub id: i32,
1413
/// Title of the question.

0 commit comments

Comments
 (0)