From 8f4d47fb96e88531277a8367956e77b0770a33e7 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:13:08 -0800 Subject: [PATCH 1/7] Feat sj201 r10 support (#301) * Update enclosure and mk2 plugin versions for SJ201R10 support * Loosen dependencies for updated enclosure compat. * Add 'make' dependency to Pi setup tests * Update PHAL plugins from Mk2 to neon component plugins * Update dependencies to validate compatibility * Update Coqui dependency spec * Update phal plugin dependency specs * Update phal plugin dependency specs * Update enclosure dependency to stable version Testing gui module updates to version information * Update gui dependency to stable version * Update led plugin dependency to stable version * Update dependency specs * Update core module dependencies for compat. * Troubleshoot neon_enclosure dependency resolution * Troubleshoot neon_speech dependency resolution * Fix typo in dependency branch spec * Update dependency specs * Fix audio module dependency spec * Add mozilla_remote default TTS plugin * Bump mozilla TTS dependency spec * Update default pi TTS plugin dependency Co-authored-by: Daniel McKnight --- requirements/core_modules.txt | 8 ++++---- requirements/local_speech_processing.txt | 3 ++- requirements/pi.txt | 8 ++++++-- requirements/requirements.txt | 10 +++------- test/pi_setup.sh | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index ae16e90dd..412b8b2ba 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -1,6 +1,6 @@ # neon core modules neon_messagebus~=0.3 -neon_gui~=1.1 -neon_enclosure~=1.1 -neon_speech~=3.0 -neon_audio~=1.2 +neon_gui~=1.1,>=1.1.1a0 +neon_enclosure~=1.1,>=1.1.1a1 +neon_speech~=3.0,>=3.0.1a0 +neon_audio~=1.2,>=1.2.1a0 \ No newline at end of file diff --git a/requirements/local_speech_processing.txt b/requirements/local_speech_processing.txt index e28926df4..ce18ba3dc 100644 --- a/requirements/local_speech_processing.txt +++ b/requirements/local_speech_processing.txt @@ -1,5 +1,6 @@ neon-stt-plugin-deepspeech-stream-local~=2.0 -neon-tts-plugin-coqui~=0.7 +neon-tts-plugin-coqui~=0.7,>=0.7.1a0 + # TODO: Local language plugin # Fallback TTS diff --git a/requirements/pi.txt b/requirements/pi.txt index bdf3cffde..45db50c61 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -11,18 +11,22 @@ neon-cli-client~=0.2 # Default plugins ovos-ww-plugin-vosk~=0.0,>=0.0.4 neon-stt-plugin-google-cloud-streaming~=1.0 +neon-tts-plugin-larynx_server~=0.2 # PHAL Plugins +neon-phal-plugin-fan +neon-phal-plugin-switches +neon-phal-plugin-linear_led + ovos-phal-plugin-brightness-control-rpi>=1.0.0a4 ovos-phal-plugin-notification-widgets>=1.0.0a4 -ovos-phal-plugin-color-scheme-manager>=1.0.0a3 +ovos-phal-plugin-color-scheme-manager>=1.0.0a5 ovos-phal-plugin-configuration-provider>=1.0.0a3 ovos-phal-plugin-balena-wifi>=1.0.0a5 ovos-phal-plugin-gui-network-client>=0.0.2a6 ovos-phal-plugin-network-manager>=1.0.0a7 ovos-phal-plugin-wifi-setup>=1.0.0a6 ovos-phal-plugin-dashboard>=0.0.1 -ovos-phal-plugin-mk2>=0.0.1a2 ovos-phal-plugin-alsa~=0.0.2 ovos-phal-plugin-system>=0.0.2a6 ovos-phal-plugin-ipgeo @ git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-ipgeo diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 6725e61fc..90fc5834c 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,13 +1,12 @@ # mycroft -ovos-core[skills_lgpl]==0.0.5a35 +ovos-core[skills_lgpl]~=0.0.5a36 # utils -neon-utils[network,configuration]~=1.1 +neon-utils[network,configuration]~=1.1,>=1.1.2a0 neon-transformers~=0.2 ovos_utils~=0.0,>=0.0.25 ovos-config~=0.0,>=0.0.4 ovos-skills-manager~=0.0.11 -ovos-plugin-manager==0.0.20a1 - +ovos-plugin-manager~=0.0.19,>=0.0.20a3 psutil~=5.6 # default plugins @@ -16,6 +15,3 @@ neon-utterance-translator-plugin~=0.1 neon-utterance-normalizer-plugin~=0.0.2 # text parser modules RAKEkeywords~=0.2 - -# Patching min version -ovos-plugin-manager==0.0.20a1 diff --git a/test/pi_setup.sh b/test/pi_setup.sh index 20ba7cad4..c166a6220 100644 --- a/test/pi_setup.sh +++ b/test/pi_setup.sh @@ -38,7 +38,7 @@ apt install -y curl curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update -apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev python3.7-dev python3.7-venv mimic espeak-ng g++ libjpeg-dev || exit 1 +apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev python3.7-dev python3.7-venv mimic espeak-ng g++ libjpeg-dev make || exit 1 # Configure venv for deepspeech compat. cd /core || exit 10 From 19d5a0c20017b6c657fbd8c234e9b60e182380d4 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 11 Nov 2022 01:13:40 +0000 Subject: [PATCH 2/7] Increment Version --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 455f64fa5..ea685c434 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "22.10" +__version__ = "22.11a0" From dd6962c6be4e758f129ccb0d61c4536988f0ca82 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:38:34 -0800 Subject: [PATCH 3/7] Default Demo Config (#304) * Add default audiofiles TTS config Add default audiofiles TTS audio path * Update demo skill dependency spec --- docker/config/neon.yaml | 5 ++++- docker/xdg/data/neon/AudioFileTTS/.keep | 0 requirements/skills_essential.txt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 docker/xdg/data/neon/AudioFileTTS/.keep diff --git a/docker/config/neon.yaml b/docker/config/neon.yaml index 9a0af4f25..7021e22b4 100644 --- a/docker/config/neon.yaml +++ b/docker/config/neon.yaml @@ -15,4 +15,7 @@ skills: - https://github.com/JarbasSkills/skill-icanhazdadjokes/tree/dev MQ: server: mq.2021.us - port: 25672 \ No newline at end of file + port: 25672 +TTS: + neon-tts-plugin-audiofiles: + audio_file_path: /xdg/data/neon/AudioFileTTS \ No newline at end of file diff --git a/docker/xdg/data/neon/AudioFileTTS/.keep b/docker/xdg/data/neon/AudioFileTTS/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/requirements/skills_essential.txt b/requirements/skills_essential.txt index 7f9955f10..d36428848 100644 --- a/requirements/skills_essential.txt +++ b/requirements/skills_essential.txt @@ -1,5 +1,5 @@ neon-skill-about~=0.0.2 neon-skill-date_time~=0.0.2 -neon-skill-demo~=0.1 +neon-skill-demo~=0.1,>=0.1.1a1 neon-skill-device_controls~=0.0.2 neon-skill-ip_address~=0.0.3 From f1c64e96320d7fafdad31da8893f1e73a45e1f97 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Wed, 16 Nov 2022 23:39:05 +0000 Subject: [PATCH 4/7] Increment Version --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index ea685c434..dcd2f47a4 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "22.11a0" +__version__ = "22.11a1" From 4b672610a3cf7809c01a0ef922a3c07320d441bd Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Fri, 18 Nov 2022 10:36:25 -0800 Subject: [PATCH 5/7] Bugfixes and Features from Mark2 Image Feedback (#303) * Update wifi setup dependency to fix missing 'Skip Setup' text Update alerts skill dependency to include a GUI Update default remote TTS plugin to Coqui * Update core dependencies to stable versions * Update dependencies to stable versions * Update PHAL plugin dependencies to stable versions * Update skills to stable versions * Update coqui dependency to stable spec --- requirements/core_modules.txt | 8 +++---- requirements/local_speech_processing.txt | 2 +- requirements/pi.txt | 27 ++++++++++++------------ requirements/requirements.txt | 8 +++---- requirements/skills_default.txt | 2 +- requirements/skills_extended.txt | 4 ++-- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 412b8b2ba..c7137d82f 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -1,6 +1,6 @@ # neon core modules neon_messagebus~=0.3 -neon_gui~=1.1,>=1.1.1a0 -neon_enclosure~=1.1,>=1.1.1a1 -neon_speech~=3.0,>=3.0.1a0 -neon_audio~=1.2,>=1.2.1a0 \ No newline at end of file +neon_gui~=1.1,>=1.1.1 +neon_enclosure~=1.2 +neon_speech~=3.0,>=3.0.1 +neon_audio~=1.2,>=1.2.1 \ No newline at end of file diff --git a/requirements/local_speech_processing.txt b/requirements/local_speech_processing.txt index ce18ba3dc..06e63bdcc 100644 --- a/requirements/local_speech_processing.txt +++ b/requirements/local_speech_processing.txt @@ -1,5 +1,5 @@ neon-stt-plugin-deepspeech-stream-local~=2.0 -neon-tts-plugin-coqui~=0.7,>=0.7.1a0 +neon-tts-plugin-coqui~=0.7,>=0.7.1 # TODO: Local language plugin diff --git a/requirements/pi.txt b/requirements/pi.txt index 45db50c61..0b1357b12 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -12,23 +12,24 @@ neon-cli-client~=0.2 ovos-ww-plugin-vosk~=0.0,>=0.0.4 neon-stt-plugin-google-cloud-streaming~=1.0 neon-tts-plugin-larynx_server~=0.2 +neon-tts-plugin-coqui-remote # PHAL Plugins -neon-phal-plugin-fan -neon-phal-plugin-switches -neon-phal-plugin-linear_led +neon-phal-plugin-fan~=0.0.3 +neon-phal-plugin-switches~=0.0.3 +neon-phal-plugin-linear_led~=0.0.3 -ovos-phal-plugin-brightness-control-rpi>=1.0.0a4 -ovos-phal-plugin-notification-widgets>=1.0.0a4 -ovos-phal-plugin-color-scheme-manager>=1.0.0a5 -ovos-phal-plugin-configuration-provider>=1.0.0a3 -ovos-phal-plugin-balena-wifi>=1.0.0a5 -ovos-phal-plugin-gui-network-client>=0.0.2a6 -ovos-phal-plugin-network-manager>=1.0.0a7 -ovos-phal-plugin-wifi-setup>=1.0.0a6 -ovos-phal-plugin-dashboard>=0.0.1 +ovos-phal-plugin-brightness-control-rpi~=1.0.0 +ovos-phal-plugin-notification-widgets~=1.0.0 +ovos-phal-plugin-color-scheme-manager~=1.0.0 +ovos-phal-plugin-configuration-provider~=1.0.0 +ovos-phal-plugin-balena-wifi~=1.0.0 +ovos-phal-plugin-gui-network-client~=0.0.2 +ovos-phal-plugin-network-manager~=1.0.0 +ovos-phal-plugin-wifi-setup~=1.0.0 +ovos-phal-plugin-dashboard~=0.0.1 ovos-phal-plugin-alsa~=0.0.2 -ovos-phal-plugin-system>=0.0.2a6 +ovos-phal-plugin-system~=0.0.2 ovos-phal-plugin-ipgeo @ git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-ipgeo ovos-phal-plugin-gpsd @ git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-gpsd # Pi-specific skills diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 90fc5834c..189c34be6 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,17 +1,15 @@ # mycroft -ovos-core[skills_lgpl]~=0.0.5a36 +ovos-core[skills_lgpl]~=0.0.5 # utils -neon-utils[network,configuration]~=1.1,>=1.1.2a0 +neon-utils[network,configuration]~=1.1,>=1.1.2 neon-transformers~=0.2 ovos_utils~=0.0,>=0.0.25 ovos-config~=0.0,>=0.0.4 ovos-skills-manager~=0.0.11 -ovos-plugin-manager~=0.0.19,>=0.0.20a3 +ovos-plugin-manager~=0.0.20 psutil~=5.6 # default plugins neon-lang-plugin-libretranslate~=0.2 neon-utterance-translator-plugin~=0.1 neon-utterance-normalizer-plugin~=0.0.2 -# text parser modules -RAKEkeywords~=0.2 diff --git a/requirements/skills_default.txt b/requirements/skills_default.txt index 1ed0cedfb..c63aa93fa 100644 --- a/requirements/skills_default.txt +++ b/requirements/skills_default.txt @@ -1,5 +1,5 @@ skill-ddg @ git+https://github.com/openvoiceos/skill-ddg -neon-skill-alerts~=1.0,>=1.0.1 +neon-skill-alerts~=1.0,>=1.0.2a1 neon-skill-caffeinewiz~=0.2,>=0.2.1 neon-skill-data_controls~=0.1,>=0.1.1 neon-skill-fallback_wolfram_alpha~=0.0.1,>=0.0.2 diff --git a/requirements/skills_extended.txt b/requirements/skills_extended.txt index b53f0c899..f34cea030 100644 --- a/requirements/skills_extended.txt +++ b/requirements/skills_extended.txt @@ -1,4 +1,4 @@ -neon-skill-audio_record>=0.0.2a0 +neon-skill-audio_record~=0.0.2 neon-skill-custom_conversation neon-skill-instructions neon-skill-launcher @@ -6,5 +6,5 @@ neon-skill-messaging skill-news @ git+https://github.com/openvoiceos/skill-ovos-news # neon-skill-recipes neon-skill-synonyms -neon-skill-translation>=0.1.1a0 +neon-skill-translation~=0.2 neon-skill-camera From 79e917a44ff2b3998f67b0e6139d7df6b027828f Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 18 Nov 2022 18:37:00 +0000 Subject: [PATCH 6/7] Increment Version --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index dcd2f47a4..65713e059 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "22.11a1" +__version__ = "22.11a2" From 0cfc9bb9c64040055be2244dcd4289933bbf3aec Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Fri, 18 Nov 2022 12:53:13 -0800 Subject: [PATCH 7/7] Increment version to 22.10.1 (#305) --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 65713e059..a8d1e42a4 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "22.11a2" +__version__ = "22.10.1"