From 80f7f17843912191336a75ceceb6b24c6ade2543 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sat, 31 May 2025 12:46:32 +0200 Subject: [PATCH 1/4] chore(deps): bump llama.cpp to 'e562eece7cb476276bfc4cbb18deb7c0369b2233' (#5552) Signed-off-by: Ettore Di Giacinto --- Makefile | 2 +- backend/cpp/llama/prepare.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3ed117a3..98aedde8 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ BINARY_NAME=local-ai DETECT_LIBS?=true # llama.cpp versions -CPPLLAMA_VERSION?=e83ba3e460651b20a594e9f2f0f0bffb998d3ce1 +CPPLLAMA_VERSION?=e562eece7cb476276bfc4cbb18deb7c0369b2233 # whisper.cpp version WHISPER_REPO?=https://github.com/ggml-org/whisper.cpp diff --git a/backend/cpp/llama/prepare.sh b/backend/cpp/llama/prepare.sh index 32cac278..c0d3de30 100644 --- a/backend/cpp/llama/prepare.sh +++ b/backend/cpp/llama/prepare.sh @@ -11,9 +11,9 @@ set -e cp -r CMakeLists.txt llama.cpp/tools/grpc-server/ cp -r grpc-server.cpp llama.cpp/tools/grpc-server/ -cp -rfv llama.cpp/common/json.hpp llama.cpp/tools/grpc-server/ +cp -rfv llama.cpp/vendor/nlohmann/json.hpp llama.cpp/tools/grpc-server/ cp -rfv llama.cpp/tools/server/utils.hpp llama.cpp/tools/grpc-server/ -cp -rfv llama.cpp/tools/server/httplib.h llama.cpp/tools/grpc-server/ +cp -rfv llama.cpp/vendor/cpp-httplib/httplib.h llama.cpp/tools/grpc-server/ set +e if grep -q "grpc-server" llama.cpp/tools/CMakeLists.txt; then From 7c9f011d91c1932bfba71e56f60e4e8b9a0f3a95 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sun, 1 Jun 2025 08:48:53 +0200 Subject: [PATCH 2/4] fix(ci): try to add different mirrors to avoid 403 issues (#5554) Signed-off-by: Ettore Di Giacinto --- .github/workflows/release.yaml | 14 ++++++++++++++ Dockerfile | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7422031c..355e0108 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -150,6 +150,20 @@ jobs: cache: false - name: Dependencies run: | + ## XXX: This is a workaround to fix the build failure due to the network issues + # Configure apt to use French mirrors and add retry logic + echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries + echo 'Acquire::http::Timeout "120";' | sudo tee -a /etc/apt/apt.conf.d/80-retries + echo 'Acquire::https::Timeout "120";' | sudo tee -a /etc/apt/apt.conf.d/80-retries + echo 'Acquire::ftp::Timeout "120";' | sudo tee -a /etc/apt/apt.conf.d/80-retries + + # Add French mirrors + echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' | sudo tee /etc/apt/sources.list + echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list + echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list + echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list + ## END of workaround + sudo apt-get update sudo apt-get install -y wget curl build-essential ffmpeg protobuf-compiler ccache upx-ucl gawk cmake libgmock-dev make install-go-tools diff --git a/Dockerfile b/Dockerfile index 5dadfe4c..ce63b07c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,20 @@ ARG TARGETVARIANT ENV DEBIAN_FRONTEND=noninteractive ENV EXTERNAL_GRPC_BACKENDS="coqui:/build/backend/python/coqui/run.sh,transformers:/build/backend/python/transformers/run.sh,rerankers:/build/backend/python/rerankers/run.sh,bark:/build/backend/python/bark/run.sh,diffusers:/build/backend/python/diffusers/run.sh,faster-whisper:/build/backend/python/faster-whisper/run.sh,kokoro:/build/backend/python/kokoro/run.sh,vllm:/build/backend/python/vllm/run.sh,exllama2:/build/backend/python/exllama2/run.sh,chatterbox:/build/backend/python/chatterbox/run.sh" +## XXX: This is a workaround to fix the build failure due to the network issues +# Add retry logic for apt-get +RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \ + echo 'Acquire::http::Timeout "120";' >> /etc/apt/apt.conf.d/80-retries && \ + echo 'Acquire::https::Timeout "120";' >> /etc/apt/apt.conf.d/80-retries && \ + echo 'Acquire::ftp::Timeout "120";' >> /etc/apt/apt.conf.d/80-retries + +# Add multiple mirrors to distribute load +RUN echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' >> /etc/apt/sources.list && \ + echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse' >> /etc/apt/sources.list && \ + echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse' >> /etc/apt/sources.list && \ + echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse' >> /etc/apt/sources.list +## END of workaround + RUN apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ From ac5fb50bccb73833bf823aeb50bb2f39f49351b5 Mon Sep 17 00:00:00 2001 From: "LocalAI [bot]" <139863280+localai-bot@users.noreply.github.com> Date: Mon, 2 Jun 2025 08:45:47 +0200 Subject: [PATCH 3/4] chore: :arrow_up: Update ggml-org/whisper.cpp to `7fd6fa809749078aa00edf945e959c898f2bd1af` (#5556) :arrow_up: Update ggml-org/whisper.cpp Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: mudler <2420543+mudler@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 98aedde8..a40ebc14 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ CPPLLAMA_VERSION?=e562eece7cb476276bfc4cbb18deb7c0369b2233 # whisper.cpp version WHISPER_REPO?=https://github.com/ggml-org/whisper.cpp -WHISPER_CPP_VERSION?=98dfe8dc264b7d0d1daccfff9a9c043bcc2ece4b +WHISPER_CPP_VERSION?=7fd6fa809749078aa00edf945e959c898f2bd1af # go-piper version PIPER_REPO?=https://github.com/mudler/go-piper From 489c28991609d6a3aac84733727d054afdfd0f84 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Mon, 2 Jun 2025 08:46:29 +0200 Subject: [PATCH 4/4] Revert "fix(ci): try to add different mirrors to avoid 403 issues" (#5555) Revert "fix(ci): try to add different mirrors to avoid 403 issues (#5554)" This reverts commit 7c9f011d91c1932bfba71e56f60e4e8b9a0f3a95. --- .github/workflows/release.yaml | 14 -------------- Dockerfile | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 355e0108..7422031c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -150,20 +150,6 @@ jobs: cache: false - name: Dependencies run: | - ## XXX: This is a workaround to fix the build failure due to the network issues - # Configure apt to use French mirrors and add retry logic - echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries - echo 'Acquire::http::Timeout "120";' | sudo tee -a /etc/apt/apt.conf.d/80-retries - echo 'Acquire::https::Timeout "120";' | sudo tee -a /etc/apt/apt.conf.d/80-retries - echo 'Acquire::ftp::Timeout "120";' | sudo tee -a /etc/apt/apt.conf.d/80-retries - - # Add French mirrors - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' | sudo tee /etc/apt/sources.list - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list - ## END of workaround - sudo apt-get update sudo apt-get install -y wget curl build-essential ffmpeg protobuf-compiler ccache upx-ucl gawk cmake libgmock-dev make install-go-tools diff --git a/Dockerfile b/Dockerfile index ce63b07c..5dadfe4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,20 +17,6 @@ ARG TARGETVARIANT ENV DEBIAN_FRONTEND=noninteractive ENV EXTERNAL_GRPC_BACKENDS="coqui:/build/backend/python/coqui/run.sh,transformers:/build/backend/python/transformers/run.sh,rerankers:/build/backend/python/rerankers/run.sh,bark:/build/backend/python/bark/run.sh,diffusers:/build/backend/python/diffusers/run.sh,faster-whisper:/build/backend/python/faster-whisper/run.sh,kokoro:/build/backend/python/kokoro/run.sh,vllm:/build/backend/python/vllm/run.sh,exllama2:/build/backend/python/exllama2/run.sh,chatterbox:/build/backend/python/chatterbox/run.sh" -## XXX: This is a workaround to fix the build failure due to the network issues -# Add retry logic for apt-get -RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \ - echo 'Acquire::http::Timeout "120";' >> /etc/apt/apt.conf.d/80-retries && \ - echo 'Acquire::https::Timeout "120";' >> /etc/apt/apt.conf.d/80-retries && \ - echo 'Acquire::ftp::Timeout "120";' >> /etc/apt/apt.conf.d/80-retries - -# Add multiple mirrors to distribute load -RUN echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' >> /etc/apt/sources.list && \ - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse' >> /etc/apt/sources.list && \ - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse' >> /etc/apt/sources.list && \ - echo 'deb http://fr.archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse' >> /etc/apt/sources.list -## END of workaround - RUN apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \