Merge pull request #70 from IBM/main

openshift-merge-bot[bot] · web-flow · commit abca422f27ee · 2024-04-18T13:27:16.000Z
[pull] main from IBM:main
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ## Global Args #################################################################
 ARG BASE_UBI_IMAGE_TAG=9.3-1610
-ARG PROTOC_VERSION=25.2
+ARG PROTOC_VERSION=25.3
 ARG PYTORCH_INDEX="https://download.pytorch.org/whl"
 # ARG PYTORCH_INDEX="https://download.pytorch.org/whl/nightly"
 ARG AUTO_GPTQ_VERSION=0.7.1
@@ -86,7 +86,7 @@ ENV LIBRARY_PATH="$CUDA_HOME/lib64/stubs"
 
 ## Rust builder ################################################################
 # Specific debian version so that compatible glibc version is used
-FROM rust:1.77-bullseye as rust-builder
+FROM rust:1.77.2-bullseye as rust-builder
 ARG PROTOC_VERSION
 
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
diff --git a/integration_tests/Makefile b/integration_tests/Makefile
@@ -1,6 +1,6 @@
 gen-client:
 	# Compile protos
-	pip install grpcio-tools==1.60.0 mypy-protobuf==3.5.0 'types-protobuf>=3.20.4' --no-cache-dir
+	pip install grpcio-tools==1.62.1 mypy-protobuf==3.5.0 'types-protobuf>=3.20.4' --no-cache-dir
 	mkdir text_generation_tests/pb || true
 	python -m grpc_tools.protoc -I../proto --python_out=text_generation_tests/pb \
 		--grpc_python_out=text_generation_tests/pb --mypy_out=text_generation_tests/pb ../proto/generation.proto
diff --git a/integration_tests/poetry.lock b/integration_tests/poetry.lock
diff --git a/launcher/Cargo.toml b/launcher/Cargo.toml
@@ -6,10 +6,10 @@ authors = ["Olivier Dehaene"]
 description = "Text Generation Launcher"
 
 [dependencies]
-clap = { version = "4.5.3", features = ["derive", "env"] }
+clap = { version = "4.5.4", features = ["derive", "env"] }
 ctrlc = { version = "3.4.4", features = ["termination"] }
 nix = { version = "0.28.0", features = ["process", "signal"] }
-serde_json = "^1.0.114"
+serde_json = "^1.0.11"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] }
 uuid = { version = "1.8.0", features = ["v4", "fast-rng"] }
diff --git a/router/Cargo.toml b/router/Cargo.toml
@@ -17,33 +17,33 @@ path = "src/main.rs"
 axum = { version = "0.6.20", features = ["json"] }
 axum-tracing-opentelemetry = "0.10.0"
 text-generation-client = { path = "client" }
-clap = { version = "^4.5.2", features = ["derive", "env"] }
+clap = { version = "^4.5.4", features = ["derive", "env"] }
 futures = "^0.3.30"
 flume = "^0.11.0"
 metrics = "0.21.1"
 metrics-exporter-prometheus = { version = "0.12.2", features = [] }
-moka = { version = "0.12.5", features = ["future"] }
+moka = { version = "0.12.6", features = ["future"] }
 nohash-hasher = "^0.2.0"
-num = "^0.4.1"
+num = "^0.4.2"
 num_cpus = "^1.16.0"
 hyper = "^0.14.28" # Override to address CVE-2023-26964
 openssl = "^0.10.64" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195
-openssl-sys = "^0.9.101" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195
+openssl-sys = "^0.9.102" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195
 rustls-webpki = "0.102.2" # Override to address WS-2023-0305, CVE-2018-16875
 rand = "^0.8.5"
-serde = "^1.0.197"
-serde_json = "^1.0.114"
+serde = "^1.0.198"
+serde_json = "^1.0.116"
 thiserror = "^1.0.57"
-tokenizers = "0.15.2"
-tokio = { version = "1.36.0", features = ["rt", "rt-multi-thread", "parking_lot", "signal", "sync", "fs"] }
-tokio-rustls = "^0.25.0"
-rustls = "0.22.2"
+tokenizers = "0.19.1"
+tokio = { version = "1.37.0", features = ["rt", "rt-multi-thread", "parking_lot", "signal", "sync", "fs"] }
+tokio-rustls = "^0.26.0"
+rustls = "0.22.3"
 tracing = "^0.1.40"
-prost = "^0.12.3"
+prost = "^0.12.4"
 tonic = { version = "^0.11.0", features = ["tls"] }
 tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] }
 tracing-opentelemetry = "0.23.0"
-tokio-stream ="^0.1.14"
+tokio-stream ="^0.1.15"
 unicode-segmentation = "^1.11.0"
 unicode-truncate = "^0.2.0"
 opentelemetry = "0.22.0"
diff --git a/router/client/Cargo.toml b/router/client/Cargo.toml
@@ -6,9 +6,9 @@ build="build.rs"
 
 [dependencies]
 futures = "^0.3.30"
-prost = "^0.12.3"
+prost = "^0.12.4"
 thiserror = "^1.0.58"
-tokio = { version = "1.36.0", features = ["sync"] }
+tokio = { version = "1.37.0", features = ["sync"] }
 tonic = "^0.11.0"
 tower = "^0.4.13"
 tracing = "^0.1.40"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.77"
+channel = "1.77.2"
 components = ["rustfmt", "clippy"]
diff --git a/server/Makefile b/server/Makefile
@@ -4,7 +4,7 @@ all: install run-dev
 .PHONY: gen-server
 gen-server:
 	# Compile protos
-	pip install grpcio-tools==1.60.0 mypy-protobuf==3.5.0 'types-protobuf>=3.20.4' --no-cache-dir
+	pip install grpcio-tools==1.62.1 mypy-protobuf==3.5.0 'types-protobuf>=3.20.4' --no-cache-dir
 	mkdir -p text_generation_server/pb
 	python -m grpc_tools.protoc -I../proto \
 		--python_out=text_generation_server/pb \
diff --git a/server/poetry.lock b/server/poetry.lock
diff --git a/server/pyproject.toml b/server/pyproject.toml
@@ -9,15 +9,16 @@ text-generation-server = 'text_generation_server.cli:app'
 
 [tool.poetry.dependencies]
 python = ">=3.11.0,<3.13"
+# grpc is not yet compatible with newer protobuf
 protobuf = "^4.25.3"
 grpcio = "^1.62.1"
 grpcio-reflection = "^1.62.1"
 loguru = "^0.7.2"
-typer = "^0.9.0"
+typer = "^0.12.3"
 accelerate = { version = "0.27.2", optional = true }
 bitsandbytes = { version = "^0.42.0", optional = true }
 scipy = "^1.11.4"
-safetensors = "^0.4.2"
+safetensors = "^0.4.3"
 sentencepiece = "^0.2.0"
 datasets = { version = "^2.15.0", optional = true }
 texttable = { version = "^1.7.0", optional = true }
