Sync 2.11 with main

.github/workflows/sync-with-upstream.yml

@@ -77,14 +77,6 @@ jobs:
             exit 0
           fi
 
-          echo "Checking if PR is up-to-date"
-
-          git fetch ${upstream_url} refs/pull/${pr_number}/head
-          if git diff --stat --exit-code upstream/main FETCH_HEAD; then
-            echo "PR is up-to-date"
-            exit 0
-          fi
-
           echo "Updating PR \#${pr_number}"
           gh pr edit \
             $pr_number \

Dockerfile.ubi

@@ -125,6 +125,22 @@ RUN --mount=type=cache,target=/root/.cache/ccache \
         CMAKE_BUILD_TYPE=Release \
         python3 setup.py bdist_wheel --dist-dir=dist
 
+#################### libsodium Build IMAGE ####################
+FROM base as libsodium-builder
+
+RUN microdnf install -y gcc gzip \
+    && microdnf clean all
+
+WORKDIR /usr/src/libsodium
+
+ARG LIBSODIUM_VERSION=1.0.20
+RUN curl -LO https://github.com/jedisct1/libsodium/releases/download/${LIBSODIUM_VERSION}-RELEASE/libsodium-${LIBSODIUM_VERSION}.tar.gz \
+    && tar -xzvf libsodium*.tar.gz \
+    && rm -f libsodium*.tar.gz \
+    && mv libsodium*/* ./
+
+RUN ./configure --prefix="/usr/" && make && make check
+
 ## Release #####################################################################
 FROM python-install AS vllm-openai
 
@@ -143,7 +159,12 @@ COPY extras/custom_cache_manager.py /opt/vllm/lib/python3.11/site-packages/custo
 # install vllm wheel first, so that torch etc will be installed
 RUN --mount=type=bind,from=build,src=/workspace/dist,target=/workspace/dist \
     --mount=type=cache,target=/root/.cache/pip \
-    pip install dist/*.whl --verbose
+    pip install $(echo dist/*.whl)'[tensorizer]' --verbose
+
+# Install libsodium for Tensorizer encryption
+RUN --mount=type=bind,from=libsodium-builder,src=/usr/src/libsodium,target=/usr/src/libsodium \
+    cd /usr/src/libsodium \
+    && make install
 
 ENV HF_HUB_OFFLINE=1 \
     PORT=8000 \
@@ -168,7 +189,7 @@ FROM vllm-openai as vllm-grpc-adapter
 USER root
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-    pip install vllm-tgis-adapter
+    pip install vllm-tgis-adapter==0.1.3
 
 ENV GRPC_PORT=8033
 USER 2000

docs/requirements-docs.txt

@@ -11,3 +11,4 @@ torch
 py-cpuinfo
 transformers
 openai # Required by docs/source/serving/openai_compatible_server.md's vllm.entrypoints.openai.cli_args
+anyio>=4.4.0 # not directly required, pinned by Snyk to avoid a vulnerability