From bfdaf5773c9688cccb4fede7c22e204c2dcf69e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 8 Jul 2025 13:28:51 +0000 Subject: [PATCH 1/6] Add outlines upper bound Version 1.0.0 and later does not have fsm.guides module. We should update against the 1.0.0 API later. --- server/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/pyproject.toml b/server/pyproject.toml index 7f2addb69a1..4e174a59579 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -80,7 +80,7 @@ peft = [ "peft>=0.14.0", ] outlines = [ - "outlines>=0.1.13", + "outlines>=0.1.13,<1.0", ] dev = [ "grpcio-tools>=1.51.1,<2.0", From 48bb4b4f1e334e22bec1151159766734520235c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 8 Jul 2025 13:32:04 +0000 Subject: [PATCH 2/6] protobuf < 6.0 --- server/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/pyproject.toml b/server/pyproject.toml index 4e174a59579..f4c0f413c8d 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -25,7 +25,7 @@ dependencies = [ "opentelemetry-instrumentation-grpc>=0.50b0", "pillow>=11.1.0", "prometheus-client>=0.21.0", - "protobuf>=5.28.3", + "protobuf>=5.28.3,<6.0", "py-cpuinfo>=9.0.0", "rich>=13.8.1", "safetensors>=0.4.5", From 5a6e09e32e38b3079167314ce90a40ec482bf38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 8 Jul 2025 13:53:13 +0000 Subject: [PATCH 3/6] Revert "protobuf < 6.0" This reverts commit 48bb4b4f1e334e22bec1151159766734520235c6. --- server/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/pyproject.toml b/server/pyproject.toml index f4c0f413c8d..4e174a59579 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -25,7 +25,7 @@ dependencies = [ "opentelemetry-instrumentation-grpc>=0.50b0", "pillow>=11.1.0", "prometheus-client>=0.21.0", - "protobuf>=5.28.3,<6.0", + "protobuf>=5.28.3", "py-cpuinfo>=9.0.0", "rich>=13.8.1", "safetensors>=0.4.5", From a3db7edd671c2138e249c83a61dd66c19b9edad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 8 Jul 2025 13:55:00 +0000 Subject: [PATCH 4/6] Set grpcio upper bound to 1.73 (exclusive) --- server/pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/pyproject.toml b/server/pyproject.toml index 4e174a59579..74615b85b0e 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -13,9 +13,9 @@ dependencies = [ "click<8.2.0", "einops>=0.8.0", "grpc-interceptor>=0.15.4", - "grpcio>=1.67.0", - "grpcio-reflection>=1.67.0", - "grpcio-status>=1.67.0", + "grpcio>=1.67.0,<1.73.0", + "grpcio-reflection>=1.67.0,<1.73.0", + "grpcio-status>=1.67.0,<1.73.0", "kernels>=0.2.1", "hf-transfer>=0.1.8", "loguru>=0.7.3", From df53facda9cdc3982d39ee7ebca7ce5af1fb1a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 8 Jul 2025 14:15:41 +0000 Subject: [PATCH 5/6] AMD grpcio? --- Dockerfile_amd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile_amd b/Dockerfile_amd index e3e9efda8a2..f208f8e10b0 100644 --- a/Dockerfile_amd +++ b/Dockerfile_amd @@ -251,7 +251,7 @@ COPY proto proto COPY server server COPY server/Makefile server/Makefile RUN cd server && \ - uv pip install grpcio-tools mypy-protobuf && \ + uv pip install "grpcio-tools>=1.67.0,<1.73.0" mypy-protobuf && \ uv pip install -e ".[accelerate, compressed-tensors, peft, outlines]" --no-cache-dir && \ make gen-server-raw RUN cd server && \ From bd33a23cac3a86feaaa976621534076773e68636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 8 Jul 2025 14:49:23 +0000 Subject: [PATCH 6/6] More grpcio shenanigans --- Dockerfile_amd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile_amd b/Dockerfile_amd index f208f8e10b0..f2ef913e7c0 100644 --- a/Dockerfile_amd +++ b/Dockerfile_amd @@ -251,7 +251,7 @@ COPY proto proto COPY server server COPY server/Makefile server/Makefile RUN cd server && \ - uv pip install "grpcio-tools>=1.67.0,<1.73.0" mypy-protobuf && \ + uv pip install "grpcio-tools>=1.67.0,<1.73.0" "grpcio>=1.67.0,<1.73.0" mypy-protobuf && \ uv pip install -e ".[accelerate, compressed-tensors, peft, outlines]" --no-cache-dir && \ make gen-server-raw RUN cd server && \