Fixes from the last rebase, and add speech-to-phrase

Author: edurenye

README.md

@@ -121,4 +121,3 @@ docker compose down
 
 You can extend those files adding your own languages.
 More on docker compose extend in the [official documentation](https://docs.docker.com/compose/multiple-compose-files/extends/).
-

docker-compose.base.yml

@@ -50,6 +50,13 @@ services:
 #      - "10400:10400"
 #    <<: [ *common ]
 
+#  speech-to-phrase:
+#    build:
+#      context: ./speech-to-phrase/
+#    ports:
+#      - "10300:10300"
+#    <<: [ *common ]
+
 #  wyoming-vosk:
 #    build:
 #      context: ./vosk/

docker-compose.gpu.yml

@@ -45,8 +45,6 @@ services:
     extends:
       file: docker-compose.base.yml
       service: wyoming-openwakeword
-    build:
-      dockerfile: GPU.Dockerfile
     <<: [ *gpu ]
 
 #  wyoming-porcupine:
@@ -61,6 +59,12 @@ services:
 #      service: wyoming-snowboy
 #    <<: [ *gpu ]
 
+#  speech-to-phrase:
+#    extends:
+#      file: docker-compose.base.yml
+#      service: speech-to-phrase
+#    <<: [ *gpu ]
+
 #  wyoming-vosk:
 #    extends:
 #      file: docker-compose.base.yml

openwakeword/GPU.Dockerfile

@@ -1,5 +1,6 @@
 ARG BASE=debian:bookworm-slim
 FROM $BASE
+
 ARG TARGETARCH
 ARG TARGETVARIANT
 

piper/Dockerfile

@@ -1,59 +1,51 @@
 ARG BASE=debian:bookworm-slim
 FROM $BASE
 
-ARG EXTRA_DEPENDENCIES
 ARG RUN_SCRIPT='run.sh'
+
 ARG TARGETARCH
 ARG TARGETVARIANT
 
 # Install Piper
 WORKDIR /usr/src
-ARG WYOMING_PIPER_VERSION='1.5.0'
+ARG WYOMING_PIPER_VERSION='1.6.3'
+ARG WYOMING_VERSION='1.7.2'
 ARG BINARY_PIPER_VERSION='1.2.0'
-
-# Create and activate virtual environment
-ENV VIRTUAL_ENV=/opt/venv
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+ENV PIP_BREAK_SYSTEM_PACKAGES=1
 
 RUN \
     apt-get update \
     && apt-get install -y --no-install-recommends \
-        wget \
         curl \
         python3 \
         python3-pip \
-        python3-venv \
+        python3-dev \
+        build-essential \
     \
-    && rm -rf /var/lib/apt/lists/* \
-    \
-    # Create virtual environment
-    && python3 -m venv $VIRTUAL_ENV
-
-RUN \
-    pip3 install --no-cache-dir -U \
+    && pip3 install --no-cache-dir -U \
         setuptools \
         wheel \
-        $EXTRA_DEPENDENCIES \
-    \
-    && wget https://github.com/rhasspy/piper-phonemize/releases/download/v1.1.0/piper_phonemize-1.1.0-cp311-cp311-manylinux_2_28_x86_64.whl \
-    \
-    && mv piper_phonemize-1.1.0-cp311-cp311-manylinux_2_28_x86_64.whl piper_phonemize-1.1.0-py3-none-any.whl \
-    \
-    && pip3 install --no-cache-dir --force-reinstall --no-deps \
-        "piper-tts==${BINARY_PIPER_VERSION}" \
-    \
-    && pip3 install --no-cache-dir --force-reinstall --no-deps \
-        piper_phonemize-1.1.0-py3-none-any.whl \
-    \
     && pip3 install --no-cache-dir \
         "wyoming-piper @ https://github.com/rhasspy/wyoming-piper/archive/refs/tags/v${WYOMING_PIPER_VERSION}.tar.gz" \
     \
-    && rm -r piper_phonemize-1.1.0-py3-none-any.whl
+    && pip3 install --no-cache-dir \
+        "wyoming[http] @ https://github.com/OHF-voice/wyoming/archive/refs/tags/${WYOMING_VERSION}.tar.gz" \
+    \
+    && curl -L -s \
+        "https://github.com/rhasspy/piper/releases/download/v${BINARY_PIPER_VERSION}/piper_${TARGETARCH}${TARGETVARIANT}.tar.gz" \
+        | tar -zxvf - -C /usr/share \
+    \
+    && apt-get remove -y --purge \
+        python3-dev \
+        build-essential \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /
 COPY $RUN_SCRIPT ./
 ENV RUN_SCRIPT_ENV="/${RUN_SCRIPT}"
 
 EXPOSE 10200
+EXPOSE 5000
 
 ENTRYPOINT ["bash", "-c", "exec $RUN_SCRIPT_ENV \"${@}\"", "--"]

piper/GPU.Dockerfile

@@ -8,7 +8,7 @@ python3 -m wyoming.http.tts_server \
 HTTP_SERVER_PID=$!
 
 python3 -m wyoming_piper \
-    --piper 'piper' \
+    --piper '/usr/share/piper/piper' \
     --use-cuda \
     --uri 'tcp://0.0.0.0:10200' \
     --data-dir /data \

piper/run-gpu.sh

@@ -1,6 +1,28 @@
 #!/usr/bin/env bash
+set -e
+
+python3 -m wyoming.http.tts_server \
+    --uri 'tcp://127.0.0.1:10200' \
+    --host '0.0.0.0' \
+    --port 5000 &
+HTTP_SERVER_PID=$!
+
 python3 -m wyoming_piper \
     --piper '/usr/share/piper/piper' \
     --uri 'tcp://0.0.0.0:10200' \
     --data-dir /data \
-    --download-dir /data "$@"
+    --download-dir /data \
+    --streaming "$@" &
+MAIN_APP_PID=$!
+
+# Forward termination signals to child processes
+terminate() {
+    echo "Terminating..."
+    kill -TERM "${HTTP_SERVER_PID}" "${MAIN_APP_PID}"
+    wait
+}
+
+trap terminate SIGTERM SIGINT
+
+wait "${MAIN_APP_PID}"
+terminate

piper/run.sh

@@ -42,4 +42,3 @@ COPY run.sh ./
 EXPOSE 10400
 
 ENTRYPOINT ["bash", "/run.sh"]
-

snowboy/Dockerfile

@@ -1,4 +1,6 @@
-FROM debian:bookworm-slim
+ARG BASE=debian:bookworm-slim
+FROM $BASE
+
 ARG TARGETARCH
 ARG TARGETVARIANT