From 3ad920b50a590d63c71deccbb2cc4e8ca537bec0 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Fri, 25 Oct 2024 23:50:12 +0200 Subject: [PATCH] fix(parler-tts): pin protobuf (#3963) * fix(parler-tts): pin protobuf Signed-off-by: Ettore Di Giacinto Signed-off-by: Ettore Di Giacinto * debug Signed-off-by: Ettore Di Giacinto * Re-apply workaround Signed-off-by: Ettore Di Giacinto --------- Signed-off-by: Ettore Di Giacinto Signed-off-by: Ettore Di Giacinto --- .github/workflows/test-extra.yml | 7 +++++++ backend/python/parler-tts/install.sh | 16 +++++++++++++++- backend/python/parler-tts/requirements-after.txt | 3 ++- backend/python/parler-tts/requirements.txt | 4 +--- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-extra.yml b/.github/workflows/test-extra.yml index 8b37b52d..a2c34872 100644 --- a/.github/workflows/test-extra.yml +++ b/.github/workflows/test-extra.yml @@ -123,6 +123,13 @@ jobs: run: | make --jobs=5 --output-sync=target -C backend/python/parler-tts make --jobs=5 --output-sync=target -C backend/python/parler-tts test + - name: Setup tmate session if tests fail + if: ${{ failure() }} + uses: mxschmitt/action-tmate@v3.19 + with: + detached: true + connect-timeout-seconds: 180 + limit-access-to-actor: true tests-openvoice: runs-on: ubuntu-latest diff --git a/backend/python/parler-tts/install.sh b/backend/python/parler-tts/install.sh index fc51d564..14df9b14 100755 --- a/backend/python/parler-tts/install.sh +++ b/backend/python/parler-tts/install.sh @@ -11,4 +11,18 @@ if [ "x${BUILD_PROFILE}" == "xintel" ]; then EXTRA_PIP_INSTALL_FLAGS+=" --upgrade --index-strategy=unsafe-first-match" fi -installRequirements \ No newline at end of file + +installRequirements + + +# https://github.com/descriptinc/audiotools/issues/101 +# incompatible protobuf versions. +PYDIR=python3.10 +pyenv="${MY_DIR}/venv/lib/${PYDIR}/site-packages/google/protobuf/internal/" + +if [ ! -d ${pyenv} ]; then + echo "(parler-tts/install.sh): Error: ${pyenv} does not exist" + exit 1 +fi + +curl -L https://raw.githubusercontent.com/protocolbuffers/protobuf/main/python/google/protobuf/internal/builder.py -o ${pyenv}/builder.py diff --git a/backend/python/parler-tts/requirements-after.txt b/backend/python/parler-tts/requirements-after.txt index ca083c40..702074de 100644 --- a/backend/python/parler-tts/requirements-after.txt +++ b/backend/python/parler-tts/requirements-after.txt @@ -1,3 +1,4 @@ git+https://github.com/huggingface/parler-tts.git@8e465f1b5fcd223478e07175cb40494d19ffbe17 llvmlite==0.43.0 -numba==0.60.0 \ No newline at end of file +numba==0.60.0 +grpcio-tools==1.42.0 \ No newline at end of file diff --git a/backend/python/parler-tts/requirements.txt b/backend/python/parler-tts/requirements.txt index 7fbf4cb3..3187f526 100644 --- a/backend/python/parler-tts/requirements.txt +++ b/backend/python/parler-tts/requirements.txt @@ -1,5 +1,3 @@ grpcio==1.67.0 -grpcio-tools==1.44.0 -protobuf certifi -llvmlite==0.43.0 \ No newline at end of file +llvmlite==0.43.0