Use wyoming-porcupine1 package

edurenye · Oct 23, 2023 · aea9c7f · aea9c7f
1 parent a292c22
commit aea9c7f
Show file tree

Hide file tree

Showing 71 changed files with 14 additions and 249 deletions.
diff --git a/porcupine1/CHANGELOG.md b/porcupine1/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Changelog
+
+## 1.0.1
+
+- Use wyoming-porcupine1 package
+- Try to fix memory leak by caching detectors
+
+## 1.0.0
+
+- Initial release
diff --git a/porcupine1/Dockerfile b/porcupine1/Dockerfile
@@ -4,10 +4,9 @@ ARG TARGETVARIANT
 
 # Install porcupine1
 WORKDIR /usr/src
+ENV WYOMING_PORCUPINE1_VERSION=1.0.1
 ENV PIP_BREAK_SYSTEM_PACKAGES=1
 
-COPY ./src/ ./
-
 RUN \
     apt-get update \
     && apt-get install -y --no-install-recommends \
@@ -19,8 +18,7 @@ RUN \
         wheel \
     && pip3 install --no-cache-dir \
         --extra-index-url https://www.piwheels.org/simple \
-        'numpy<1.26' \
-        -r requirements.txt \
+        "wyoming-porcupine1==${WYOMING_PORCUPINE1_VERSION}" \
     \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/porcupine1/Makefile b/porcupine1/Makefile
@@ -1,6 +1,6 @@
 .PHONY: local run update
 
-VERSION := 1.0.0
+VERSION := 1.0.1
 TAG := rhasspy/wyoming-porcupine1
 PLATFORMS := linux/amd64,linux/arm64,linux/arm/v7
 HOST := 0.0.0.0

diff --git a/porcupine1/run.sh b/porcupine1/run.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-python3 /usr/src/server.py \
+python3 -m wyoming_porcupine1 \
     --uri 'tcp://0.0.0.0:10400' "$@"
diff --git a/porcupine1/src/data/lib/common/porcupine_params_de.pv b/porcupine1/src/data/lib/common/porcupine_params_de.pv
diff --git a/porcupine1/src/data/lib/common/porcupine_params_en.pv b/porcupine1/src/data/lib/common/porcupine_params_en.pv
diff --git a/porcupine1/src/data/lib/common/porcupine_params_es.pv b/porcupine1/src/data/lib/common/porcupine_params_es.pv
diff --git a/porcupine1/src/data/lib/common/porcupine_params_fr.pv b/porcupine1/src/data/lib/common/porcupine_params_fr.pv
diff --git a/porcupine1/src/data/resources/de/linux/ananas_linux.ppn b/porcupine1/src/data/resources/de/linux/ananas_linux.ppn
diff --git a/porcupine1/src/data/resources/de/linux/heuschrecke_linux.ppn b/porcupine1/src/data/resources/de/linux/heuschrecke_linux.ppn
diff --git a/porcupine1/src/data/resources/de/linux/himbeere_linux.ppn b/porcupine1/src/data/resources/de/linux/himbeere_linux.ppn
diff --git a/porcupine1/src/data/resources/de/linux/leguan_linux.ppn b/porcupine1/src/data/resources/de/linux/leguan_linux.ppn
diff --git a/porcupine1/src/data/resources/de/linux/stachelschwein_linux.ppn b/porcupine1/src/data/resources/de/linux/stachelschwein_linux.ppn
diff --git a/porcupine1/src/data/resources/de/raspberry-pi/ananas_raspberry-pi.ppn b/porcupine1/src/data/resources/de/raspberry-pi/ananas_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/de/raspberry-pi/heuschrecke_raspberry-pi.ppn b/porcupine1/src/data/resources/de/raspberry-pi/heuschrecke_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/de/raspberry-pi/himbeere_raspberry-pi.ppn b/porcupine1/src/data/resources/de/raspberry-pi/himbeere_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/de/raspberry-pi/leguan_raspberry-pi.ppn b/porcupine1/src/data/resources/de/raspberry-pi/leguan_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/de/raspberry-pi/stachelschwein_raspberry-pi.ppn b/porcupine1/src/data/resources/de/raspberry-pi/stachelschwein_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/linux/alexa_linux.ppn b/porcupine1/src/data/resources/en/linux/alexa_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/americano_linux.ppn b/porcupine1/src/data/resources/en/linux/americano_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/blueberry_linux.ppn b/porcupine1/src/data/resources/en/linux/blueberry_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/bumblebee_linux.ppn b/porcupine1/src/data/resources/en/linux/bumblebee_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/computer_linux.ppn b/porcupine1/src/data/resources/en/linux/computer_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/grapefruit_linux.ppn b/porcupine1/src/data/resources/en/linux/grapefruit_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/grasshopper_linux.ppn b/porcupine1/src/data/resources/en/linux/grasshopper_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/hey google_linux.ppn b/porcupine1/src/data/resources/en/linux/hey google_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/hey siri_linux.ppn b/porcupine1/src/data/resources/en/linux/hey siri_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/jarvis_linux.ppn b/porcupine1/src/data/resources/en/linux/jarvis_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/ok google_linux.ppn b/porcupine1/src/data/resources/en/linux/ok google_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/pico clock_linux.ppn b/porcupine1/src/data/resources/en/linux/pico clock_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/picovoice_linux.ppn b/porcupine1/src/data/resources/en/linux/picovoice_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/porcupine_linux.ppn b/porcupine1/src/data/resources/en/linux/porcupine_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/smart mirror_linux.ppn b/porcupine1/src/data/resources/en/linux/smart mirror_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/snowboy_linux.ppn b/porcupine1/src/data/resources/en/linux/snowboy_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/terminator_linux.ppn b/porcupine1/src/data/resources/en/linux/terminator_linux.ppn
diff --git a/porcupine1/src/data/resources/en/linux/view glass_linux.ppn b/porcupine1/src/data/resources/en/linux/view glass_linux.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/alexa_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/alexa_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/americano_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/americano_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/blueberry_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/blueberry_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/bumblebee_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/bumblebee_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/computer_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/computer_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/grapefruit_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/grapefruit_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/grasshopper_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/grasshopper_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/hey google_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/hey google_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/hey siri_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/hey siri_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/jarvis_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/jarvis_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/ok google_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/ok google_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/pico clock_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/pico clock_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/picovoice_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/picovoice_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/porcupine_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/porcupine_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/en/raspberry-pi/terminator_raspberry-pi.ppn b/porcupine1/src/data/resources/en/raspberry-pi/terminator_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/es/linux/emparedado_linux.ppn b/porcupine1/src/data/resources/es/linux/emparedado_linux.ppn
diff --git a/porcupine1/src/data/resources/es/linux/leopardo_linux.ppn b/porcupine1/src/data/resources/es/linux/leopardo_linux.ppn
diff --git a/porcupine1/src/data/resources/es/linux/manzana_linux.ppn b/porcupine1/src/data/resources/es/linux/manzana_linux.ppn
diff --git a/porcupine1/src/data/resources/es/linux/murciélago_linux.ppn b/porcupine1/src/data/resources/es/linux/murciélago_linux.ppn
diff --git a/porcupine1/src/data/resources/es/raspberry-pi/emparedado_raspberry-pi.ppn b/porcupine1/src/data/resources/es/raspberry-pi/emparedado_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/es/raspberry-pi/leopardo_raspberry-pi.ppn b/porcupine1/src/data/resources/es/raspberry-pi/leopardo_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/es/raspberry-pi/manzana_raspberry-pi.ppn b/porcupine1/src/data/resources/es/raspberry-pi/manzana_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/es/raspberry-pi/murciélago_raspberry-pi.ppn b/porcupine1/src/data/resources/es/raspberry-pi/murciélago_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/fr/linux/framboise_linux.ppn b/porcupine1/src/data/resources/fr/linux/framboise_linux.ppn
diff --git a/porcupine1/src/data/resources/fr/linux/mon chouchou_linux.ppn b/porcupine1/src/data/resources/fr/linux/mon chouchou_linux.ppn
diff --git a/porcupine1/src/data/resources/fr/linux/parapluie_linux.ppn b/porcupine1/src/data/resources/fr/linux/parapluie_linux.ppn
diff --git a/porcupine1/src/data/resources/fr/linux/perroquet_linux.ppn b/porcupine1/src/data/resources/fr/linux/perroquet_linux.ppn
diff --git a/porcupine1/src/data/resources/fr/linux/tournesol_linux.ppn b/porcupine1/src/data/resources/fr/linux/tournesol_linux.ppn
diff --git a/porcupine1/src/data/resources/fr/raspberry-pi/framboise_raspberry-pi.ppn b/porcupine1/src/data/resources/fr/raspberry-pi/framboise_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/fr/raspberry-pi/mon chouchou_raspberry-pi.ppn b/porcupine1/src/data/resources/fr/raspberry-pi/mon chouchou_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/fr/raspberry-pi/parapluie_raspberry-pi.ppn b/porcupine1/src/data/resources/fr/raspberry-pi/parapluie_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/fr/raspberry-pi/perroquet_raspberry-pi.ppn b/porcupine1/src/data/resources/fr/raspberry-pi/perroquet_raspberry-pi.ppn
diff --git a/porcupine1/src/data/resources/fr/raspberry-pi/tournesol_raspberry-pi.ppn b/porcupine1/src/data/resources/fr/raspberry-pi/tournesol_raspberry-pi.ppn
diff --git a/porcupine1/src/requirements.txt b/porcupine1/src/requirements.txt
diff --git a/porcupine1/src/server.py b/porcupine1/src/server.py