From f04d96339bb9f28cc2403c94d1fdbc79332eb38f Mon Sep 17 00:00:00 2001 From: Alec Fenichel Date: Sun, 6 Aug 2023 04:27:15 -0400 Subject: [PATCH] fix(wyoming-piper) fix outdated voice list (#11156) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # The recent piper (upstream) update was breaking, the list of available voices changed. This PR fixes the list of voices and adds support for the other arg changes. Names and descriptions copied from: https://github.com/home-assistant/addons/blob/master/piper/DOCS.md Default values copied from: https://github.com/home-assistant/addons/blob/master/piper/config.yaml. **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [x] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [x] ⚖️ My code follows the style guidelines of this project - [x] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [x] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [x] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/stable/wyoming-piper/Chart.yaml | 2 +- charts/stable/wyoming-piper/questions.yaml | 244 ++++++++++++++++++++- charts/stable/wyoming-piper/values.yaml | 17 +- 3 files changed, 251 insertions(+), 12 deletions(-) diff --git a/charts/stable/wyoming-piper/Chart.yaml b/charts/stable/wyoming-piper/Chart.yaml index d5fe2414bb2..11c48ae1cbf 100644 --- a/charts/stable/wyoming-piper/Chart.yaml +++ b/charts/stable/wyoming-piper/Chart.yaml @@ -20,7 +20,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/wyoming-piper - https://github.com/home-assistant/addons/tree/master/piper type: application -version: 1.0.1 +version: 1.0.2 annotations: truecharts.org/catagories: | - home-automation diff --git a/charts/stable/wyoming-piper/questions.yaml b/charts/stable/wyoming-piper/questions.yaml index ebc9ad4e0fa..3c865eda766 100644 --- a/charts/stable/wyoming-piper/questions.yaml +++ b/charts/stable/wyoming-piper/questions.yaml @@ -19,22 +19,28 @@ questions: attrs: - variable: voice label: Voice - description: Piper voice that will be used for speach. + description: Name of the Piper voice to use. schema: type: string required: true - default: en-us-lessac-low + default: en_US-lessac-medium enum: - value: ca-upc_ona-x-low description: ca-upc_ona-x-low - value: ca-upc_pau-x-low description: ca-upc_pau-x-low + - value: ca_ES-upc_ona-medium + description: ca_ES-upc_ona-medium + - value: ca_ES-upc_ona-x_low + description: ca_ES-upc_ona-x_low + - value: ca_ES-upc_pau-x_low + description: ca_ES-upc_pau-x_low - value: da-nst_talesyntese-medium description: da-nst_talesyntese-medium + - value: da_DK-talesyntese-medium + description: da_DK-talesyntese-medium - value: de-eva_k-x-low description: de-eva_k-x-low - - value: de-thorsten-low - description: de-thorsten-low - value: de-karlsson-low description: de-karlsson-low - value: de-kerstin-low @@ -43,12 +49,36 @@ questions: description: de-pavoque-low - value: de-ramona-low description: de-ramona-low + - value: de-thorsten-low + description: de-thorsten-low + - value: de_DE-eva_k-x_low + description: de_DE-eva_k-x_low + - value: de_DE-karlsson-low + description: de_DE-karlsson-low + - value: de_DE-kerstin-low + description: de_DE-kerstin-low + - value: de_DE-pavoque-low + description: de_DE-pavoque-low + - value: de_DE-ramona-low + description: de_DE-ramona-low + - value: de_DE-thorsten-low + description: de_DE-thorsten-low + - value: de_DE-thorsten-medium + description: de_DE-thorsten-medium + - value: de_DE-thorsten_emotional-medium + description: de_DE-thorsten_emotional-medium + - value: el-gr-rapunzelina-low + description: el-gr-rapunzelina-low + - value: el_GR-rapunzelina-low + description: el_GR-rapunzelina-low - value: en-gb-alan-low description: en-gb-alan-low - value: en-gb-southern_english_female-low description: en-gb-southern_english_female-low - value: en-us-amy-low description: en-us-amy-low + - value: en-us-danny-low + description: en-us-danny-low - value: en-us-kathleen-low description: en-us-kathleen-low - value: en-us-lessac-low @@ -63,22 +93,96 @@ questions: description: en-us-ryan-low - value: en-us-ryan-medium description: en-us-ryan-medium + - value: en_GB-alan-low + description: en_GB-alan-low + - value: en_GB-alan-medium + description: en_GB-alan-medium + - value: en_GB-alba-medium + description: en_GB-alba-medium + - value: en_GB-aru-medium + description: en_GB-aru-medium + - value: en_GB-jenny_dioco-medium + description: en_GB-jenny_dioco-medium + - value: en_GB-northern_english_male-medium + description: en_GB-northern_english_male-medium + - value: en_GB-semaine-medium + description: en_GB-semaine-medium + - value: en_GB-southern_english_female-low + description: en_GB-southern_english_female-low + - value: en_GB-vctk-medium + description: en_GB-vctk-medium + - value: en_US-amy-low + description: en_US-amy-low + - value: en_US-amy-medium + description: en_US-amy-medium + - value: en_US-arctic-medium + description: en_US-arctic-medium + - value: en_US-danny-low + description: en_US-danny-low + - value: en_US-joe-medium + description: en_US-joe-medium + - value: en_US-kathleen-low + description: en_US-kathleen-low + - value: en_US-kusal-medium + description: en_US-kusal-medium + - value: en_US-l2arctic-medium + description: en_US-l2arctic-medium + - value: en_US-lessac-high + description: en_US-lessac-high + - value: en_US-lessac-low + description: en_US-lessac-low + - value: en_US-lessac-medium + description: en_US-lessac-medium + - value: en_US-libritts-high + description: en_US-libritts-high + - value: en_US-ryan-high + description: en_US-ryan-high + - value: en_US-ryan-low + description: en_US-ryan-low + - value: en_US-ryan-medium + description: en_US-ryan-medium - value: es-carlfm-x-low description: es-carlfm-x-low - value: es-mls_10246-low description: es-mls_10246-low - value: es-mls_9972-low description: es-mls_9972-low + - value: es_ES-carlfm-x_low + description: es_ES-carlfm-x_low + - value: es_ES-davefx-medium + description: es_ES-davefx-medium + - value: es_ES-mls_10246-low + description: es_ES-mls_10246-low + - value: es_ES-mls_9972-low + description: es_ES-mls_9972-low + - value: es_ES-sharvard-medium + description: es_ES-sharvard-medium + - value: es_MX-ald-medium + description: es_MX-ald-medium - value: fi-harri-low description: fi-harri-low - - value: fr-siwis-low - description: fr-siwis-low - - value: fr-siwis-medium - description: fr-siwis-medium + - value: fi_FI-harri-low + description: fi_FI-harri-low + - value: fi_FI-harri-medium + description: fi_FI-harri-medium - value: fr-gilles-low description: fr-gilles-low - value: fr-mls_1840-low description: fr-mls_1840-low + - value: fr-siwis-low + description: fr-siwis-low + - value: fr-siwis-medium + description: fr-siwis-medium + - value: fr_FR-gilles-low + description: fr_FR-gilles-low + - value: fr_FR-mls_1840-low + description: fr_FR-mls_1840-low + - value: fr_FR-siwis-low + description: fr_FR-siwis-low + - value: fr_FR-siwis-medium + description: fr_FR-siwis-medium + - value: fr_FR-upmc-medium + description: fr_FR-upmc-medium - value: is-bui-medium description: is-bui-medium - value: is-salka-medium @@ -87,18 +191,44 @@ questions: description: is-steinn-medium - value: is-ugla-medium description: is-ugla-medium + - value: is_IS-bui-medium + description: is_IS-bui-medium + - value: is_IS-salka-medium + description: is_IS-salka-medium + - value: is_IS-steinn-medium + description: is_IS-steinn-medium + - value: is_IS-ugla-medium + description: is_IS-ugla-medium - value: it-riccardo_fasol-x-low description: it-riccardo_fasol-x-low + - value: it_IT-riccardo-x_low + description: it_IT-riccardo-x_low + - value: ka_GE-natia-medium + description: ka_GE-natia-medium - value: kk-iseke-x-low description: kk-iseke-x-low - value: kk-issai-high description: kk-issai-high - value: kk-raya-x-low description: kk-raya-x-low + - value: kk_KZ-iseke-x_low + description: kk_KZ-iseke-x_low + - value: kk_KZ-issai-high + description: kk_KZ-issai-high + - value: kk_KZ-raya-x_low + description: kk_KZ-raya-x_low + - value: lb_LU-marylux-medium + description: lb_LU-marylux-medium - value: ne-google-medium description: ne-google-medium - value: ne-google-x-low description: ne-google-x-low + - value: ne_NP-google-medium + description: ne_NP-google-medium + - value: ne_NP-google-x_low + description: ne_NP-google-x_low + - value: nl-mls_5809-low + description: nl-mls_5809-low - value: nl-mls_7432-low description: nl-mls_7432-low - value: nl-nathalie-x-low @@ -107,24 +237,118 @@ questions: description: nl-rdh-medium - value: nl-rdh-x-low description: nl-rdh-x-low - - value: nl-mls_5809-low - description: nl-mls_5809-low + - value: nl_BE-nathalie-medium + description: nl_BE-nathalie-medium + - value: nl_BE-nathalie-x_low + description: nl_BE-nathalie-x_low + - value: nl_BE-rdh-medium + description: nl_BE-rdh-medium + - value: nl_BE-rdh-x_low + description: nl_BE-rdh-x_low + - value: nl_NL-mls_5809-low + description: nl_NL-mls_5809-low + - value: nl_NL-mls_7432-low + description: nl_NL-mls_7432-low - value: no-talesyntese-medium description: no-talesyntese-medium + - value: no_NO-talesyntese-medium + description: no_NO-talesyntese-medium - value: pl-mls_6892-low description: pl-mls_6892-low + - value: pl_PL-darkman-medium + description: pl_PL-darkman-medium + - value: pl_PL-gosia-medium + description: pl_PL-gosia-medium + - value: pl_PL-mls_6892-low + description: pl_PL-mls_6892-low - value: pt-br-edresson-low description: pt-br-edresson-low + - value: pt_BR-edresson-low + description: pt_BR-edresson-low + - value: pt_BR-faber-medium + description: pt_BR-faber-medium + - value: ro_RO-mihai-medium + description: ro_RO-mihai-medium - value: ru-irinia-medium description: ru-irinia-medium + - value: ru_RU-denis-medium + description: ru_RU-denis-medium + - value: ru_RU-dmitri-medium + description: ru_RU-dmitri-medium + - value: ru_RU-irina-medium + description: ru_RU-irina-medium + - value: ru_RU-ruslan-medium + description: ru_RU-ruslan-medium + - value: sr_RS-serbski_institut-medium + description: sr_RS-serbski_institut-medium + - value: sv_SE-nst-medium + description: sv_SE-nst-medium + - value: sw_CD-lanfrica-medium + description: sw_CD-lanfrica-medium + - value: tr_TR-dfki-medium + description: tr_TR-dfki-medium - value: uk-lada-x-low description: uk-lada-x-low + - value: uk_UA-lada-x_low + description: uk_UA-lada-x_low + - value: uk_UA-ukrainian_tts-medium + description: uk_UA-ukrainian_tts-medium - value: vi-25hours-single-low description: vi-25hours-single-low - value: vi-vivos-x-low description: vi-vivos-x-low + - value: vi_VN-25hours_single-low + description: vi_VN-25hours_single-low + - value: vi_VN-vais1000-medium + description: vi_VN-vais1000-medium + - value: vi_VN-vivos-x_low + description: vi_VN-vivos-x_low - value: zh-cn-huayan-x-low description: zh-cn-huayan-x-low + - value: zh_CN-huayan-medium + description: zh_CN-huayan-medium + - value: zh_CN-huayan-x_low + description: zh_CN-huayan-x_low + - variable: speaker + label: Speaker + description: Speaker number to use if the voice supports multiple speakers. + schema: + type: int + required: true + default: 0 + min: 0 + - variable: length_scale + label: Length Scale + description: Speeds up or slows down the voice. + schema: + type: string + required: true + default: "1.0" + valid_charts: ^\d+\.\d+$ + - variable: noise_scale + label: Noise Scale + description: Controls the variability of audio by adding noise during audio generation. + schema: + type: string + required: true + default: "0.667" + valid_charts: ^\d+\.\d+$ + - variable: noise_w + label: Noise Width + description: Controls the variability of speaking cadence (phoneme widths). + schema: + type: string + required: true + default: "0.333" + valid_charts: ^\d+\.\d+$ + - variable: max_piper_procs + label: Max Piper Processes + description: Number of Piper processes to run simultaneously. + schema: + type: int + required: true + default: 1 + min: 1 # Include{containerConfig} # Include{serviceRoot} diff --git a/charts/stable/wyoming-piper/values.yaml b/charts/stable/wyoming-piper/values.yaml index 65053c460c0..30cbb538a80 100644 --- a/charts/stable/wyoming-piper/values.yaml +++ b/charts/stable/wyoming-piper/values.yaml @@ -4,7 +4,12 @@ image: tag: v1.1.0@sha256:f07d688c833458b029237cc0e1e2fdfe249b2c8f8f555d3cd4e2148143c14200 wyoming_piper: - voice: en-us-lessac-low + voice: en_US-lessac-medium + speaker: 0 + length_scale: "1.0" + noise_scale: "0.667" + noise_w: "0.333" + max_piper_procs: 1 workload: main: @@ -24,6 +29,16 @@ workload: args: - --voice - "{{ .Values.wyoming_piper.voice }}" + - --speaker + - "{{ .Values.wyoming_piper.speaker }}" + - --length-scale + - "{{ .Values.wyoming_piper.length_scale }}" + - --noise-scale + - "{{ .Values.wyoming_piper.noise_scale }}" + - --noise-w + - "{{ .Values.wyoming_piper.noise_w }}" + - --max-piper-procs + - "{{ .Values.wyoming_piper.max_piper_procs }}" service: main: