Update to rust 1.73, transformers 4.34, other rust and py deps

Author: njhill

Cargo.lock

@@ -1,6 +1,6 @@
 ## Global Args #################################################################
 ARG BASE_UBI_IMAGE_TAG=9.2-755.1696515532
-ARG PROTOC_VERSION=24.3
+ARG PROTOC_VERSION=24.4
 ARG PYTORCH_INDEX="https://download.pytorch.org/whl"
 #ARG PYTORCH_INDEX="https://download.pytorch.org/whl/nightly"
 ARG PYTORCH_VERSION=2.1.0
@@ -88,7 +88,7 @@ ENV LIBRARY_PATH="$CUDA_HOME/lib64/stubs"
 
 ## Rust builder ################################################################
 # Specific debian version so that compatible glibc version is used
-FROM rust:1.72.1-bullseye as rust-builder
+FROM rust:1.73-bullseye as rust-builder
 ARG PROTOC_VERSION
 
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
@@ -156,7 +156,7 @@ RUN cd server && \
     make gen-server && \
     pip install ".[accelerate]" --no-cache-dir
 
-# Patch codegen model changes into transformers 4.31
+# Patch codegen model changes into transformers 4.34
 RUN cp server/transformers_patch/modeling_codegen.py \
        /usr/local/lib/python3.*/site-packages/transformers/models/codegen/modeling_codegen.py
 
@@ -255,7 +255,7 @@ COPY proto proto
 COPY server server
 RUN cd server && make gen-server && pip install ".[accelerate, onnx-gpu]" --no-cache-dir
 
-# Patch codegen model changes into transformers 4.33.2
+# Patch codegen model changes into transformers 4.34
 RUN cp server/transformers_patch/modeling_codegen.py \
        /opt/miniconda/lib/python3.*/site-packages/transformers/models/codegen/modeling_codegen.py
 

Dockerfile

@@ -8,8 +8,8 @@ authors = ["Nick Hill"]
 python = "^3.9"
 
 [tool.poetry.group.dev.dependencies]
-protobuf = "^4.24.3"
-grpcio-tools = "^1.58.0"
+protobuf = "^4.24.4"
+grpcio-tools = "^1.59.0"
 pytest = "^7.4.2"
 pytest-asyncio = "^0.21.1"
 requests = "^2.31.0"

integration_tests/poetry.lock

@@ -6,7 +6,7 @@ authors = ["Olivier Dehaene"]
 description = "Text Generation Launcher"
 
 [dependencies]
-clap = { version = "4.4.1", features = ["derive", "env"] }
+clap = { version = "4.4.6", features = ["derive", "env"] }
 ctrlc = { version = "3.4.0", features = ["termination"] }
 subprocess = "0.2.9"
 tracing = "0.1.37"

integration_tests/pyproject.toml

@@ -14,16 +14,16 @@ name = "text-generation-router"
 path = "src/main.rs"
 
 [dependencies]
-axum = { version = "0.6.17", features = ["json"] }
+axum = { version = "0.6.20", features = ["json"] }
 text-generation-client = { path = "client" }
-clap = { version = "^4.3.17", features = ["derive", "env"] }
+clap = { version = "^4.4.6", features = ["derive", "env"] }
 futures = "^0.3.28"
 metrics = "0.21.1"
 metrics-exporter-prometheus = { version = "0.12.1", features = [] }
-moka = { version = "0.11.2", features = ["future"] }
+moka = { version = "0.11.3", features = ["future"] }
 nohash-hasher = "^0.2.0"
-num = "^0.4.0"
-hyper = "^0.14.26" # Override to address CVE-2023-26964
+num = "^0.4.1"
+hyper = "^0.14.27" # Override to address CVE-2023-26964
 openssl = "^0.10.55" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195
 openssl-sys = "^0.9.90" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195
 rustls-webpki = "^0.100.2" # Override to address WS-2023-0305, CVE-2018-16875
@@ -34,19 +34,19 @@ serde_json = "^1.0.103"
 # Attempt to address WS-2023-0094
 # spin comes in via tonic->tokio-rustls->rustls->ring but this pins a specific old version 0.5.2 :(
 #spin = "=0.9.8"
-thiserror = "^1.0.43"
-tokenizers = "0.14.0"
-tokio = { version = "^1.32.0", features = ["rt", "rt-multi-thread", "parking_lot", "signal", "sync", "fs"] }
+thiserror = "^1.0.49"
+tokenizers = "0.14.1"
+tokio = { version = "1.33.0", features = ["rt", "rt-multi-thread", "parking_lot", "signal", "sync", "fs"] }
 tokio-rustls = "^0.24.1"
 rustls = "0.21.5"
 tracing = "^0.1.37"
 tracing-subscriber = { version = "0.3.16", features = ["json"] }
-prost = "^0.12.0"
-tonic = { version = "^0.10.0", features = ["tls"] }
+prost = "^0.12.1"
+tonic = { version = "^0.10.2", features = ["tls"] }
 tokio-stream ="^0.1.14"
 unicode-segmentation = "^1.10.1"
 unicode-truncate = "^0.2.0"
 
 [build-dependencies]
-tonic-build = "^0.10.0"
+tonic-build = "^0.10.2"
 tempfile = "^3.7.0" # Override 0.3.3 version from tonic-build/prost-build, due to RUSTSEC-2023-0018

launcher/Cargo.toml

@@ -6,13 +6,13 @@ build="build.rs"
 
 [dependencies]
 futures = "^0.3.28"
-prost = "^0.12.0"
-thiserror = "^1.0.43"
-tokio = { version = "^1.32.0", features = ["sync"] }
-tonic = "^0.10.0"
+prost = "^0.12.1"
+thiserror = "^1.0.49"
+tokio = { version = "1.33.0", features = ["sync"] }
+tonic = "^0.10.2"
 tower = "^0.4.13"
 tracing = "^0.1.37"
 tracing-error = "^0.2"
 
 [build-dependencies]
-tonic-build = "^0.10.0"
+tonic-build = "^0.10.2"

router/Cargo.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.72.1"
+channel = "1.73"
 components = ["rustfmt", "clippy"]