Update base image, rust, python deps, rust crates (#68)

Not including transformers, pending a bugfix

Protobuf can't be updated since grpc doesn't support the latest version
yet.

---------

Signed-off-by: Nick Hill <[email protected]>

Author: njhill

Cargo.lock

@@ -1,5 +1,5 @@
 ## Global Args #################################################################
-ARG BASE_UBI_IMAGE_TAG=9.3-1552
+ARG BASE_UBI_IMAGE_TAG=9.3-1610
 ARG PROTOC_VERSION=25.2
 ARG PYTORCH_INDEX="https://download.pytorch.org/whl"
 # ARG PYTORCH_INDEX="https://download.pytorch.org/whl/nightly"
@@ -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.76-bullseye as rust-builder
+FROM rust:1.77-bullseye as rust-builder
 ARG PROTOC_VERSION
 
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse

Dockerfile

@@ -10,8 +10,8 @@ python = ">=3.11"
 [tool.poetry.group.dev.dependencies]
 protobuf = "^4.25.3"
 grpcio-tools = "^1.62.1"
-pytest = "^8.0.2"
-pytest-asyncio = "^0.23.5"
+pytest = "^8.1.1"
+pytest-asyncio = "^0.23.6"
 requests = "^2.31.0"
 pyyaml = "^6.0.1"
 

integration_tests/poetry.lock

@@ -6,10 +6,10 @@ authors = ["Olivier Dehaene"]
 description = "Text Generation Launcher"
 
 [dependencies]
-clap = { version = "4.5.2", features = ["derive", "env"] }
-ctrlc = { version = "3.4.2", features = ["termination"] }
+clap = { version = "4.5.3", features = ["derive", "env"] }
+ctrlc = { version = "3.4.4", features = ["termination"] }
 nix = { version = "0.28.0", features = ["process", "signal"] }
 serde_json = "^1.0.114"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] }
-uuid = { version = "1.7.0", features = ["v4", "fast-rng"] }
+uuid = { version = "1.8.0", features = ["v4", "fast-rng"] }

integration_tests/pyproject.toml

@@ -42,12 +42,13 @@ tracing = "^0.1.40"
 prost = "^0.12.3"
 tonic = { version = "^0.11.0", features = ["tls"] }
 tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] }
-tracing-opentelemetry = "0.19.0"
+tracing-opentelemetry = "0.23.0"
 tokio-stream ="^0.1.14"
 unicode-segmentation = "^1.11.0"
 unicode-truncate = "^0.2.0"
-opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
-opentelemetry-otlp = "0.12.0"
+opentelemetry = "0.22.0"
+opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] }
+opentelemetry-otlp = "0.15.0"
 
 [build-dependencies]
 tonic-build = "^0.11.0"

launcher/Cargo.toml

@@ -7,7 +7,7 @@ build="build.rs"
 [dependencies]
 futures = "^0.3.30"
 prost = "^0.12.3"
-thiserror = "^1.0.57"
+thiserror = "^1.0.58"
 tokio = { version = "1.36.0", features = ["sync"] }
 tonic = "^0.11.0"
 tower = "^0.4.13"

router/Cargo.toml

@@ -9,10 +9,12 @@ use std::{
 use clap::Parser;
 use opentelemetry::{
     global,
-    sdk::{propagation::TraceContextPropagator, trace, trace::Sampler, Resource},
     KeyValue,
 };
 use opentelemetry_otlp::WithExportConfig;
+use opentelemetry_sdk::propagation::TraceContextPropagator;
+use opentelemetry_sdk::{Resource, trace};
+use opentelemetry_sdk::trace::Sampler;
 use text_generation_client::ShardedClient;
 use text_generation_router::{server, server::ServerRunArgs};
 use tokenizers::Tokenizer;
@@ -237,7 +239,7 @@ fn init_logging(otlp_endpoint: Option<String>, json_output: bool) {
                     )]))
                     .with_sampler(Sampler::AlwaysOn),
             )
-            .install_batch(opentelemetry::runtime::Tokio);
+            .install_batch(opentelemetry_sdk::runtime::Tokio);
 
         if let Ok(tracer) = tracer {
             layers.push(tracing_opentelemetry::layer().with_tracer(tracer).boxed());

router/client/Cargo.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.76"
+channel = "1.77"
 components = ["rustfmt", "clippy"]