From 6e7ff0aae4570e1c746313aa6836da434aa2bd1c Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:33:01 +0100 Subject: [PATCH 01/36] stable dependencies closes https://github.com/OpenVoiceOS/ovos-core/issues/488 --- requirements/requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 887af0caeac..966cb4b1e9d 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -7,12 +7,12 @@ padacioso~=0.2, >=0.2.1 adapt-parser>=1.0.0, <2.0.0 ovos-utils>=0.0.38 -ovos_bus_client<0.1.0, >=0.0.9a28 -ovos-plugin-manager<0.1.0, >=0.0.26a33 -ovos-config~=0.0,>=0.0.13a8 +ovos_bus_client~=0.1.0 +ovos-plugin-manager~=0.1.0 +ovos-config~=0.1.0 ovos-lingua-franca>=0.4.7 ovos-backend-client~=0.1.0 -ovos-workshop>=0.0.16a45 +ovos-workshop~=0.1.0 ovos-utterance-normalizer>=0.0.0a5 From 61611da1daeadf5c78b4332c6f88c6af7407126e Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:39:13 +0100 Subject: [PATCH 02/36] Update requirements.txt --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 966cb4b1e9d..83ffce31529 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -14,7 +14,7 @@ ovos-lingua-franca>=0.4.7 ovos-backend-client~=0.1.0 ovos-workshop~=0.1.0 -ovos-utterance-normalizer>=0.0.0a5 +ovos-utterance-normalizer~=0.1.0 # ensure default plugin available for any solver plugins ovos-translate-server-plugin From c8953576d18f0167fa80ec730c112ab31a474ff3 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:45:26 +0100 Subject: [PATCH 03/36] Update mycroft.txt --- requirements/mycroft.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/mycroft.txt b/requirements/mycroft.txt index 79032544319..18e28b5bcd4 100644 --- a/requirements/mycroft.txt +++ b/requirements/mycroft.txt @@ -1,8 +1,8 @@ # ovos modules for compat with mycroft namespace -ovos_PHAL<0.1.0, >=0.0.5a14 -ovos-audio~=0.0, >=0.0.2a32 -ovos-listener~=0.0, >=0.0.3a2 -ovos-gui~=0.0, >=0.0.4a5 +ovos_PHAL~=0.0.5 +ovos-audio~=0.0.2 +ovos-listener~=0.0.3 +ovos-gui~=0.1.0 ovos-messagebus~=0.0 # default plugins @@ -14,7 +14,7 @@ ovos-ww-plugin-pocketsphinx~=0.1 ovos-ww-plugin-precise~=0.1 ovos-vad-plugin-webrtcvad>=0.0.1, <0.1.0 -ovos_plugin_common_play>=0.0.6a11, <0.1.0 +ovos_plugin_common_play~=0.0.7 # ovos-ocp-youtube-plugin~=0.0, >=0.0.1 ovos-ocp-m3u-plugin>=0.0.1,<0.1.0 ovos-ocp-rss-plugin>=0.0.2,<0.1.0 From 84030bf7d5fbe89bb7103262511154efcef3d733 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 2 Sep 2024 19:41:29 +0100 Subject: [PATCH 04/36] Update skills-essential.txt --- requirements/skills-essential.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index 34a1b74dcc7..08d9f2960da 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -1,11 +1,14 @@ -ovos-skill-volume~=0.0, >=0.0.2a3 -ovos-skill-fallback-unknown~=0.0, >=0.0.4a1 -ovos-skill-alerts>=0.0.1a6 -ovos-skill-personal~=0.0, >=0.0.4a1 -ovos-skill-naptime~=0.2, >=0.2.2 -ovos-skill-date-time>=0.2.3a4 -ovos-skill-hello-world~=0.0, >=0.0.4a2 -ovos-skill-parrot +ovos-skill-volume~=0.0.2 +ovos-skill-fallback-unknown~=0.0.4 +ovos-skill-alerts~=0.0.1 +ovos-skill-personal~=0.0.4 +ovos-skill-naptime~=0.2.3 +ovos-skill-date-time~=0.2.3 +ovos-skill-hello-world~=0.0.4 +ovos-skill-parrot~=0.0.1 +ovos-skill-randomness~=0.0.1 +ovos-skill-spelling~=0.1.0 # TODO - publish # https://github.com/OpenVoiceOS/skill-ovos-boot-finished # https://github.com/OpenVoiceOS/skill-ovos-audio-recording +# https://github.com/OpenVoiceOS/ovos-skill-cmd From ce8c56bb70aa9295629621c1d4aa8c85201a9301 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 2 Sep 2024 19:42:57 +0100 Subject: [PATCH 05/36] Update skills-internet.txt --- requirements/skills-internet.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/requirements/skills-internet.txt b/requirements/skills-internet.txt index de90dd2c953..e0904098922 100644 --- a/requirements/skills-internet.txt +++ b/requirements/skills-internet.txt @@ -1,5 +1,9 @@ -ovos-skill-weather~=0.0, >=0.0.1a14 -ovos-skill-ddg +ovos-skill-weather~=0.0.1 +ovos-skill-ddg~=0.0.2 ovos-skill-wolfie ovos-skill-wikipedia -skill-ovos-fallback-chatgpt +skill-ovos-fallback-chatgpt~=0.0.2 +# TODO - publish +# https://github.com/OpenVoiceOS/ovos-skill-wikihow +# https://github.com/OpenVoiceOS/ovos-skill-speedtest +# https://github.com/OpenVoiceOS/ovos-skill-icanhazdadjokes From dcf5ebd573c475b1b07df944d17d321d475d172b Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 2 Sep 2024 19:44:35 +0100 Subject: [PATCH 06/36] Update skills-media.txt --- requirements/skills-media.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/requirements/skills-media.txt b/requirements/skills-media.txt index d04476683ed..619ca0bfd30 100644 --- a/requirements/skills-media.txt +++ b/requirements/skills-media.txt @@ -1,4 +1,5 @@ -ovos-skill-somafm -skill-youtube-music -ovos-skill-tunein -ovos-skill-news +ovos-skill-somafm~=0.0.2 +ovos-skill-news~=0.0.4 +# TODO publish +# git+https://github.com/OpenVoiceOS/ovos-skill-pyradios +# git+https://github.com/OpenVoiceOS/skill-ovos-local-media From 6cab2ab4bbbd026f0194577e9d430bcd6a59cd4e Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 2 Sep 2024 19:45:14 +0100 Subject: [PATCH 07/36] Update skills-essential.txt --- requirements/skills-essential.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index 08d9f2960da..95c7cc2ad7b 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -6,6 +6,7 @@ ovos-skill-naptime~=0.2.3 ovos-skill-date-time~=0.2.3 ovos-skill-hello-world~=0.0.4 ovos-skill-parrot~=0.0.1 +ovos-skill-wordnet~=0.0.1 ovos-skill-randomness~=0.0.1 ovos-skill-spelling~=0.1.0 # TODO - publish From c445771b77cf610446ece8ba28bfae9fff661594 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 02:26:00 +0100 Subject: [PATCH 08/36] Update skills-essential.txt --- requirements/skills-essential.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index 95c7cc2ad7b..89ba28827e0 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -9,7 +9,5 @@ ovos-skill-parrot~=0.0.1 ovos-skill-wordnet~=0.0.1 ovos-skill-randomness~=0.0.1 ovos-skill-spelling~=0.1.0 -# TODO - publish -# https://github.com/OpenVoiceOS/skill-ovos-boot-finished -# https://github.com/OpenVoiceOS/skill-ovos-audio-recording -# https://github.com/OpenVoiceOS/ovos-skill-cmd +ovos-skill-boot-finished~=0.1.0 +ovos-skill-audio-recording~=0.1.0 From b15060e3daaa3214420fb362a758221d0f285e0f Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 02:28:50 +0100 Subject: [PATCH 09/36] Update skills-internet.txt --- requirements/skills-internet.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/requirements/skills-internet.txt b/requirements/skills-internet.txt index e0904098922..1b8f284de00 100644 --- a/requirements/skills-internet.txt +++ b/requirements/skills-internet.txt @@ -3,7 +3,5 @@ ovos-skill-ddg~=0.0.2 ovos-skill-wolfie ovos-skill-wikipedia skill-ovos-fallback-chatgpt~=0.0.2 -# TODO - publish -# https://github.com/OpenVoiceOS/ovos-skill-wikihow -# https://github.com/OpenVoiceOS/ovos-skill-speedtest -# https://github.com/OpenVoiceOS/ovos-skill-icanhazdadjokes +ovos-skill-wikihow~=0.1.0 +ovos-skill-speedtest~=0.1.0 From 79bffd5314c64a877fab485477598bd2ecd8b4b0 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 02:30:20 +0100 Subject: [PATCH 10/36] Update requirements.txt --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 83ffce31529..d8f1b5219aa 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -7,7 +7,7 @@ padacioso~=0.2, >=0.2.1 adapt-parser>=1.0.0, <2.0.0 ovos-utils>=0.0.38 -ovos_bus_client~=0.1.0 +ovos_bus_client~=0.0.9 ovos-plugin-manager~=0.1.0 ovos-config~=0.1.0 ovos-lingua-franca>=0.4.7 From c88923e087bde3e28eceeed3ccc62e624ba3f3f4 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 02:32:27 +0100 Subject: [PATCH 11/36] Update skills-media.txt --- requirements/skills-media.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/skills-media.txt b/requirements/skills-media.txt index 619ca0bfd30..d41b2b7125f 100644 --- a/requirements/skills-media.txt +++ b/requirements/skills-media.txt @@ -1,5 +1,5 @@ ovos-skill-somafm~=0.0.2 ovos-skill-news~=0.0.4 -# TODO publish -# git+https://github.com/OpenVoiceOS/ovos-skill-pyradios -# git+https://github.com/OpenVoiceOS/skill-ovos-local-media +ovos-skill-pyradios~=0.1.0 +ovos-skill-local-media~=0.2.0 +ovos-skill-youtube-music~=0.1.1 From 583f3239064163439c507292bbaac40405f1fe70 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 02:33:30 +0100 Subject: [PATCH 12/36] Update skills-internet.txt --- requirements/skills-internet.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/skills-internet.txt b/requirements/skills-internet.txt index 1b8f284de00..66af0f6ab01 100644 --- a/requirements/skills-internet.txt +++ b/requirements/skills-internet.txt @@ -5,3 +5,4 @@ ovos-skill-wikipedia skill-ovos-fallback-chatgpt~=0.0.2 ovos-skill-wikihow~=0.1.0 ovos-skill-speedtest~=0.1.0 +ovos-skill-ip~=0.1.0 From f39896bb8361733800cdb82cbca5c28deb225b6a Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 02:35:49 +0100 Subject: [PATCH 13/36] Update skills-internet.txt --- requirements/skills-internet.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/skills-internet.txt b/requirements/skills-internet.txt index 66af0f6ab01..a09b09969be 100644 --- a/requirements/skills-internet.txt +++ b/requirements/skills-internet.txt @@ -1,6 +1,6 @@ ovos-skill-weather~=0.0.1 ovos-skill-ddg~=0.0.2 -ovos-skill-wolfie +skill-wolfie~=0.1.0 ovos-skill-wikipedia skill-ovos-fallback-chatgpt~=0.0.2 ovos-skill-wikihow~=0.1.0 From da5d1bc2c33bbf0a1549215a2414bb15f9562c7e Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 02:53:36 +0100 Subject: [PATCH 14/36] Update skills-internet.txt --- requirements/skills-internet.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/skills-internet.txt b/requirements/skills-internet.txt index a09b09969be..fda40655d08 100644 --- a/requirements/skills-internet.txt +++ b/requirements/skills-internet.txt @@ -1,7 +1,7 @@ ovos-skill-weather~=0.0.1 ovos-skill-ddg~=0.0.2 skill-wolfie~=0.1.0 -ovos-skill-wikipedia +ovos-skill-wikipedia~=0.5.0 skill-ovos-fallback-chatgpt~=0.0.2 ovos-skill-wikihow~=0.1.0 ovos-skill-speedtest~=0.1.0 From 7fda9c09cef387791709a098a78a2e21bbf233a6 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:13:56 +0100 Subject: [PATCH 15/36] Update skills-internet.txt --- requirements/skills-internet.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/skills-internet.txt b/requirements/skills-internet.txt index fda40655d08..4e58520afcc 100644 --- a/requirements/skills-internet.txt +++ b/requirements/skills-internet.txt @@ -1,8 +1,8 @@ ovos-skill-weather~=0.0.1 -ovos-skill-ddg~=0.0.2 -skill-wolfie~=0.1.0 +skill-ddg~=0.0.2 +skill-wolfie~=0.2.0 ovos-skill-wikipedia~=0.5.0 skill-ovos-fallback-chatgpt~=0.0.2 -ovos-skill-wikihow~=0.1.0 +ovos-skill-wikihow~=0.2.0 ovos-skill-speedtest~=0.1.0 ovos-skill-ip~=0.1.0 From 9a6379c0d76c27ce64d93cca27836046c589fe83 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:18:04 +0100 Subject: [PATCH 16/36] Update skills-media.txt --- requirements/skills-media.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/skills-media.txt b/requirements/skills-media.txt index d41b2b7125f..9f0f6313f09 100644 --- a/requirements/skills-media.txt +++ b/requirements/skills-media.txt @@ -1,5 +1,5 @@ ovos-skill-somafm~=0.0.2 -ovos-skill-news~=0.0.4 +skill-news~=0.0.4 ovos-skill-pyradios~=0.1.0 ovos-skill-local-media~=0.2.0 ovos-skill-youtube-music~=0.1.1 From 95f032473f9eca93f2c6e1d5563136dc1f274485 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:18:53 +0100 Subject: [PATCH 17/36] Update skills-essential.txt --- requirements/skills-essential.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index 89ba28827e0..56ff24561dd 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -7,7 +7,7 @@ ovos-skill-date-time~=0.2.3 ovos-skill-hello-world~=0.0.4 ovos-skill-parrot~=0.0.1 ovos-skill-wordnet~=0.0.1 -ovos-skill-randomness~=0.0.1 +skill-randomness~=0.0.1 ovos-skill-spelling~=0.1.0 ovos-skill-boot-finished~=0.1.0 ovos-skill-audio-recording~=0.1.0 From 5766bc0d146930ad98f3664763d5a28eabd6aaa8 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:19:39 +0100 Subject: [PATCH 18/36] Update skills-essential.txt --- requirements/skills-essential.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index 56ff24561dd..b2d340db6d4 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -6,7 +6,7 @@ ovos-skill-naptime~=0.2.3 ovos-skill-date-time~=0.2.3 ovos-skill-hello-world~=0.0.4 ovos-skill-parrot~=0.0.1 -ovos-skill-wordnet~=0.0.1 +skill-wordnet~=0.0.1 skill-randomness~=0.0.1 ovos-skill-spelling~=0.1.0 ovos-skill-boot-finished~=0.1.0 From 653a198637302f4242e67af368b7c614903c8011 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:21:25 +0100 Subject: [PATCH 19/36] Update skills-essential.txt --- requirements/skills-essential.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index b2d340db6d4..fac5e62899f 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -1,13 +1,9 @@ -ovos-skill-volume~=0.0.2 ovos-skill-fallback-unknown~=0.0.4 ovos-skill-alerts~=0.0.1 ovos-skill-personal~=0.0.4 ovos-skill-naptime~=0.2.3 ovos-skill-date-time~=0.2.3 ovos-skill-hello-world~=0.0.4 -ovos-skill-parrot~=0.0.1 skill-wordnet~=0.0.1 skill-randomness~=0.0.1 ovos-skill-spelling~=0.1.0 -ovos-skill-boot-finished~=0.1.0 -ovos-skill-audio-recording~=0.1.0 From b0e557fb329239064e91bca270eb486ccbd080dd Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:22:21 +0100 Subject: [PATCH 20/36] Create skills-audio.txt --- requirements/skills-audio.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 requirements/skills-audio.txt diff --git a/requirements/skills-audio.txt b/requirements/skills-audio.txt new file mode 100644 index 00000000000..d6738af6dfd --- /dev/null +++ b/requirements/skills-audio.txt @@ -0,0 +1,6 @@ +# skills that run in audio enabled devices (require mic/speaker) +ovos-skill-boot-finished~=0.1.0 +ovos-skill-audio-recording~=0.1.0 +ovos-skill-dictation~=0.1.0 +ovos-skill-parrot~=0.0.1 +ovos-skill-volume~=0.0.2 From 706e673cab40858cb0cf8d8324a7e777db17aa5e Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:23:19 +0100 Subject: [PATCH 21/36] Update skills-desktop.txt --- requirements/skills-desktop.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements/skills-desktop.txt b/requirements/skills-desktop.txt index dd825328658..4803d15613b 100644 --- a/requirements/skills-desktop.txt +++ b/requirements/skills-desktop.txt @@ -1,3 +1,2 @@ -# TODO - publish -# https://github.com/OpenVoiceOS/skill-ovos-dictation -# https://github.com/OpenVoiceOS/skill-ovos-application-launcher +# skills that require a linux desktop environment +ovos-skill-application-launcher~=0.1.0 From 898c9ed17b0e078a999c2b228620aaf7098f0f37 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:23:52 +0100 Subject: [PATCH 22/36] Update skills-internet.txt --- requirements/skills-internet.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/skills-internet.txt b/requirements/skills-internet.txt index 4e58520afcc..1f9c884d803 100644 --- a/requirements/skills-internet.txt +++ b/requirements/skills-internet.txt @@ -1,3 +1,4 @@ +# skills that require internet connectivity, should not be installed in offline devices ovos-skill-weather~=0.0.1 skill-ddg~=0.0.2 skill-wolfie~=0.2.0 From 9b58525983eac13d76449be28e0350adaa69256c Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:24:43 +0100 Subject: [PATCH 23/36] Update skills-essential.txt --- requirements/skills-essential.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index fac5e62899f..d6dc97f9130 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -1,7 +1,7 @@ +# skills providing core functionality (offline) ovos-skill-fallback-unknown~=0.0.4 ovos-skill-alerts~=0.0.1 ovos-skill-personal~=0.0.4 -ovos-skill-naptime~=0.2.3 ovos-skill-date-time~=0.2.3 ovos-skill-hello-world~=0.0.4 skill-wordnet~=0.0.1 From 16cc75b88c7125b9737793323de510d7a96e635a Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:24:54 +0100 Subject: [PATCH 24/36] Update skills-audio.txt --- requirements/skills-audio.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/skills-audio.txt b/requirements/skills-audio.txt index d6738af6dfd..fc326392652 100644 --- a/requirements/skills-audio.txt +++ b/requirements/skills-audio.txt @@ -4,3 +4,4 @@ ovos-skill-audio-recording~=0.1.0 ovos-skill-dictation~=0.1.0 ovos-skill-parrot~=0.0.1 ovos-skill-volume~=0.0.2 +ovos-skill-naptime~=0.2.3 From f371b249c5897b920daf734e0c5cd6daa616adfa Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:25:38 +0100 Subject: [PATCH 25/36] Update skills-media.txt --- requirements/skills-media.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/skills-media.txt b/requirements/skills-media.txt index 9f0f6313f09..acf2af5bfe8 100644 --- a/requirements/skills-media.txt +++ b/requirements/skills-media.txt @@ -1,3 +1,4 @@ +# skills for OCP, require audio playback plugins (usually mpv) ovos-skill-somafm~=0.0.2 skill-news~=0.0.4 ovos-skill-pyradios~=0.1.0 From 35e1c26623580473ab87be79bf1f070a759ba352 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:27:41 +0100 Subject: [PATCH 26/36] Update setup.py --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cecb0a70642..4c34324333a 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,8 @@ def required(requirements_file): 'mycroft': required('requirements/mycroft.txt'), 'lgpl': required('requirements/lgpl.txt'), 'deprecated': required('requirements/extra-deprecated.txt'), - 'skills-essential': required('requirements/skills-essential.txt'), + 'skills-essential': required('requirements/skills-essential.txt'),, + 'skills-audio': required('requirements/skills-audio.txt'), 'skills-desktop': required('requirements/skills-desktop.txt'), 'skills-internet': required('requirements/skills-internet.txt'), 'skills-gui': required('requirements/skills-gui.txt'), From d05019fa3428c41a6158117963a501c1a3c13f3b Mon Sep 17 00:00:00 2001 From: miro Date: Tue, 10 Sep 2024 19:36:10 +0100 Subject: [PATCH 27/36] chore:semver_automations --- requirements/mycroft.txt | 30 +++++++++++++++--------------- requirements/requirements.txt | 16 ++++++++-------- requirements/skills-audio.txt | 12 ++++++------ requirements/skills-desktop.txt | 2 +- requirements/skills-essential.txt | 16 ++++++++-------- requirements/skills-gui.txt | 2 +- requirements/skills-internet.txt | 16 ++++++++-------- requirements/skills-media.txt | 10 +++++----- 8 files changed, 52 insertions(+), 52 deletions(-) diff --git a/requirements/mycroft.txt b/requirements/mycroft.txt index 18e28b5bcd4..c85511ccdb1 100644 --- a/requirements/mycroft.txt +++ b/requirements/mycroft.txt @@ -1,22 +1,22 @@ # ovos modules for compat with mycroft namespace -ovos_PHAL~=0.0.5 -ovos-audio~=0.0.2 -ovos-listener~=0.0.3 -ovos-gui~=0.1.0 -ovos-messagebus~=0.0 +ovos_PHAL>=0.0.5,<1.0.0 +ovos-audio>=0.0.2,<1.0.0 +ovos-listener>=0.0.3,<1.0.0 +ovos-gui>=0.1.0,<1.0.0 +ovos-messagebus>=0.0.1,<1.0.0 # default plugins -ovos-stt-plugin-server>=0.0.3, <0.1.0 -ovos-tts-plugin-mimic>=0.2.8, <0.3.0 -ovos-tts-plugin-server>=0.0.2a6 +ovos-stt-plugin-server>=0.0.3, <1.0.0 +ovos-tts-plugin-mimic>=0.2.8, <1.0.0 +ovos-tts-plugin-server>=0.0.2a6, <1.0.0 -ovos-ww-plugin-pocketsphinx~=0.1 -ovos-ww-plugin-precise~=0.1 -ovos-vad-plugin-webrtcvad>=0.0.1, <0.1.0 +ovos-ww-plugin-pocketsphinx>=0.1, <1.0.0 +ovos-ww-plugin-precise>=0.1, <1.0.0 +ovos-vad-plugin-webrtcvad>=0.0.1, <1.0.0 -ovos_plugin_common_play~=0.0.7 +ovos_plugin_common_play>=0.0.7, <1.0.0 # ovos-ocp-youtube-plugin~=0.0, >=0.0.1 -ovos-ocp-m3u-plugin>=0.0.1,<0.1.0 -ovos-ocp-rss-plugin>=0.0.2,<0.1.0 +ovos-ocp-m3u-plugin>=0.0.1,<1.0.0 +ovos-ocp-rss-plugin>=0.0.2,<1.0.0 ovos-ocp-files-plugin~=0.13 -ovos-ocp-news-plugin>=0.0.3,<0.1.0 +ovos-ocp-news-plugin>=0.0.3,<1.0.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index d8f1b5219aa..b3e3c218565 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -6,15 +6,15 @@ combo-lock>=0.2.2, <0.3 padacioso~=0.2, >=0.2.1 adapt-parser>=1.0.0, <2.0.0 -ovos-utils>=0.0.38 -ovos_bus_client~=0.0.9 -ovos-plugin-manager~=0.1.0 -ovos-config~=0.1.0 -ovos-lingua-franca>=0.4.7 -ovos-backend-client~=0.1.0 -ovos-workshop~=0.1.0 +ovos-utils>=0.0.38,<1.0.0 +ovos_bus_client>=0.0.9,<1.0.0 +ovos-plugin-manager>=0.1.0,<1.0.0 +ovos-config>=0.1.0,<1.0.0 +ovos-lingua-franca>=0.4.7,<1.0.0 +ovos-backend-client>=0.1.0,<1.0.0 +ovos-workshop>=0.1.0,<1.0.0 -ovos-utterance-normalizer~=0.1.0 +ovos-utterance-normalizer>=0.1.0,<1.0.0 # ensure default plugin available for any solver plugins ovos-translate-server-plugin diff --git a/requirements/skills-audio.txt b/requirements/skills-audio.txt index fc326392652..7e326349a4c 100644 --- a/requirements/skills-audio.txt +++ b/requirements/skills-audio.txt @@ -1,7 +1,7 @@ # skills that run in audio enabled devices (require mic/speaker) -ovos-skill-boot-finished~=0.1.0 -ovos-skill-audio-recording~=0.1.0 -ovos-skill-dictation~=0.1.0 -ovos-skill-parrot~=0.0.1 -ovos-skill-volume~=0.0.2 -ovos-skill-naptime~=0.2.3 +ovos-skill-boot-finished>=0.1.0,<1.0.0 +ovos-skill-audio-recording>=0.1.0,<1.0.0 +ovos-skill-dictation>=0.1.0,<1.0.0 +ovos-skill-parrot>=0.0.1,<1.0.0 +ovos-skill-volume>=0.0.2,<1.0.0 +ovos-skill-naptime>=0.2.3,<1.0.0 diff --git a/requirements/skills-desktop.txt b/requirements/skills-desktop.txt index 4803d15613b..d4023d4d430 100644 --- a/requirements/skills-desktop.txt +++ b/requirements/skills-desktop.txt @@ -1,2 +1,2 @@ # skills that require a linux desktop environment -ovos-skill-application-launcher~=0.1.0 +ovos-skill-application-launcher>=0.1.0,<1.0.0 diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index d6dc97f9130..78df859cc6f 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -1,9 +1,9 @@ # skills providing core functionality (offline) -ovos-skill-fallback-unknown~=0.0.4 -ovos-skill-alerts~=0.0.1 -ovos-skill-personal~=0.0.4 -ovos-skill-date-time~=0.2.3 -ovos-skill-hello-world~=0.0.4 -skill-wordnet~=0.0.1 -skill-randomness~=0.0.1 -ovos-skill-spelling~=0.1.0 +ovos-skill-fallback-unknown>=0.0.4,<1.0.0 +ovos-skill-alerts>=0.0.1,<1.0.0 +ovos-skill-personal>=0.0.4,<1.0.0 +ovos-skill-date-time>=0.2.3,<1.0.0 +ovos-skill-hello-world>=0.0.4,<1.0.0 +skill-wordnet>=0.0.1,<1.0.0 +skill-randomness>=0.0.1,<1.0.0 +ovos-skill-spelling>=0.1.0,<1.0.0 diff --git a/requirements/skills-gui.txt b/requirements/skills-gui.txt index 4d657d952d1..ae894f4c1f9 100644 --- a/requirements/skills-gui.txt +++ b/requirements/skills-gui.txt @@ -1 +1 @@ -ovos-skill-homescreen +ovos-skill-homescreen>=0.0.3,<1.0.0 \ No newline at end of file diff --git a/requirements/skills-internet.txt b/requirements/skills-internet.txt index 1f9c884d803..5d545d0b6cd 100644 --- a/requirements/skills-internet.txt +++ b/requirements/skills-internet.txt @@ -1,9 +1,9 @@ # skills that require internet connectivity, should not be installed in offline devices -ovos-skill-weather~=0.0.1 -skill-ddg~=0.0.2 -skill-wolfie~=0.2.0 -ovos-skill-wikipedia~=0.5.0 -skill-ovos-fallback-chatgpt~=0.0.2 -ovos-skill-wikihow~=0.2.0 -ovos-skill-speedtest~=0.1.0 -ovos-skill-ip~=0.1.0 +ovos-skill-weather>=0.0.1,<1.0.0 +skill-ddg>=0.0.2,<1.0.0 +skill-wolfie>=0.2.0,<1.0.0 +ovos-skill-wikipedia>=0.5.0,<1.0.0 +skill-ovos-fallback-chatgpt>=0.0.2,<1.0.0 +ovos-skill-wikihow>=0.2.0,<1.0.0 +ovos-skill-speedtest>=0.1.0,<1.0.0 +ovos-skill-ip>=0.1.0,<1.0.0 diff --git a/requirements/skills-media.txt b/requirements/skills-media.txt index acf2af5bfe8..4bc45f639d8 100644 --- a/requirements/skills-media.txt +++ b/requirements/skills-media.txt @@ -1,6 +1,6 @@ # skills for OCP, require audio playback plugins (usually mpv) -ovos-skill-somafm~=0.0.2 -skill-news~=0.0.4 -ovos-skill-pyradios~=0.1.0 -ovos-skill-local-media~=0.2.0 -ovos-skill-youtube-music~=0.1.1 +ovos-skill-somafm>=0.0.2,<1.0.0 +skill-news>=0.0.4,<1.0.0 +ovos-skill-pyradios>=0.1.0,<1.0.0 +ovos-skill-local-media>=0.2.0,<1.0.0 +ovos-skill-youtube-music>=0.1.1,<1.0.0 From 1f96c82a98e541ed5ee95eb8a31163e1ecbca995 Mon Sep 17 00:00:00 2001 From: miro Date: Tue, 10 Sep 2024 19:41:25 +0100 Subject: [PATCH 28/36] typo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4c34324333a..24f0c636de1 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ def required(requirements_file): 'mycroft': required('requirements/mycroft.txt'), 'lgpl': required('requirements/lgpl.txt'), 'deprecated': required('requirements/extra-deprecated.txt'), - 'skills-essential': required('requirements/skills-essential.txt'),, + 'skills-essential': required('requirements/skills-essential.txt'), 'skills-audio': required('requirements/skills-audio.txt'), 'skills-desktop': required('requirements/skills-desktop.txt'), 'skills-internet': required('requirements/skills-internet.txt'), From c898b02cb43bf10d246ae06319bd359b13c48276 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 19:48:02 +0100 Subject: [PATCH 29/36] Update skills-essential.txt --- requirements/skills-essential.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index 78df859cc6f..2bd437bcf1c 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -5,5 +5,5 @@ ovos-skill-personal>=0.0.4,<1.0.0 ovos-skill-date-time>=0.2.3,<1.0.0 ovos-skill-hello-world>=0.0.4,<1.0.0 skill-wordnet>=0.0.1,<1.0.0 -skill-randomness>=0.0.1,<1.0.0 +#skill-randomness>=0.0.1,<1.0.0 ovos-skill-spelling>=0.1.0,<1.0.0 From bba3529303aef75c760a83ef95d1a06d45c2dda9 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:57:54 +0100 Subject: [PATCH 30/36] Update requirements.txt --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index b3e3c218565..c8e2da1210d 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -9,7 +9,7 @@ adapt-parser>=1.0.0, <2.0.0 ovos-utils>=0.0.38,<1.0.0 ovos_bus_client>=0.0.9,<1.0.0 ovos-plugin-manager>=0.1.0,<1.0.0 -ovos-config>=0.1.0,<1.0.0 +ovos-config>=0.0.13a8,<1.0.0 ovos-lingua-franca>=0.4.7,<1.0.0 ovos-backend-client>=0.1.0,<1.0.0 ovos-workshop>=0.1.0,<1.0.0 From 26970291f9c8a56c5b53634d386dd2b8a854f44e Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:58:25 +0100 Subject: [PATCH 31/36] Update requirements.txt --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c8e2da1210d..f8d7040fe29 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -9,7 +9,7 @@ adapt-parser>=1.0.0, <2.0.0 ovos-utils>=0.0.38,<1.0.0 ovos_bus_client>=0.0.9,<1.0.0 ovos-plugin-manager>=0.1.0,<1.0.0 -ovos-config>=0.0.13a8,<1.0.0 +ovos-config>=0.0.13,<1.0.0 ovos-lingua-franca>=0.4.7,<1.0.0 ovos-backend-client>=0.1.0,<1.0.0 ovos-workshop>=0.1.0,<1.0.0 From 72a98532b5af3d5657eeff7368fd7e4e0d694d17 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:58:45 +0100 Subject: [PATCH 32/36] Update requirements.txt --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index f8d7040fe29..2f253713192 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -12,7 +12,7 @@ ovos-plugin-manager>=0.1.0,<1.0.0 ovos-config>=0.0.13,<1.0.0 ovos-lingua-franca>=0.4.7,<1.0.0 ovos-backend-client>=0.1.0,<1.0.0 -ovos-workshop>=0.1.0,<1.0.0 +ovos-workshop>=0.0.16,<1.0.0 ovos-utterance-normalizer>=0.1.0,<1.0.0 From 182dfc3618302c1ea978de84cf1af4232e733ad0 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:59:08 +0100 Subject: [PATCH 33/36] Update requirements.txt --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 2f253713192..1395149c0d2 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -8,7 +8,7 @@ adapt-parser>=1.0.0, <2.0.0 ovos-utils>=0.0.38,<1.0.0 ovos_bus_client>=0.0.9,<1.0.0 -ovos-plugin-manager>=0.1.0,<1.0.0 +ovos-plugin-manager>=0.0.26,<1.0.0 ovos-config>=0.0.13,<1.0.0 ovos-lingua-franca>=0.4.7,<1.0.0 ovos-backend-client>=0.1.0,<1.0.0 From c4a5adbf580dc5a49b9a784475cef931bf2bbc33 Mon Sep 17 00:00:00 2001 From: miro Date: Wed, 11 Sep 2024 00:37:12 +0100 Subject: [PATCH 34/36] fix:handle old padacioso versions --- ovos_core/intent_services/padacioso_service.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ovos_core/intent_services/padacioso_service.py b/ovos_core/intent_services/padacioso_service.py index f051423739f..0c888c48bab 100644 --- a/ovos_core/intent_services/padacioso_service.py +++ b/ovos_core/intent_services/padacioso_service.py @@ -61,9 +61,15 @@ def __init__(self, bus, config): self.conf_low = self.padacioso_config.get("conf_low") or 0.5 self.workers = self.padacioso_config.get("workers") or 4 - self.containers = {lang: FallbackIntentContainer( - self.padacioso_config.get("fuzz"), n_workers=self.workers) - for lang in langs} + try: + self.containers = { + lang: FallbackIntentContainer(self.padacioso_config.get("fuzz"), + n_workers=self.workers) + for lang in langs} + except TypeError: # old padacioso version without n_workers kwarg + self.containers = { + lang: FallbackIntentContainer(self.padacioso_config.get("fuzz")) + for lang in langs} self.bus.on('padatious:register_intent', self.register_intent) self.bus.on('padatious:register_entity', self.register_entity) From 5b878b24d14b65f30f61636fa3923f271f09e484 Mon Sep 17 00:00:00 2001 From: miro Date: Wed, 11 Sep 2024 00:52:57 +0100 Subject: [PATCH 35/36] unittests --- requirements/requirements.txt | 2 +- test/unittests/skills/test_intent_service.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 1395149c0d2..71f50158529 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -3,7 +3,7 @@ python-dateutil>=2.6, <3.0 watchdog>=2.1, <3.0 combo-lock>=0.2.2, <0.3 -padacioso~=0.2, >=0.2.1 +padacioso>=0.1.0,<1.0.0 adapt-parser>=1.0.0, <2.0.0 ovos-utils>=0.0.38,<1.0.0 diff --git a/test/unittests/skills/test_intent_service.py b/test/unittests/skills/test_intent_service.py index 79b64f2f538..986c0550b50 100644 --- a/test/unittests/skills/test_intent_service.py +++ b/test/unittests/skills/test_intent_service.py @@ -337,11 +337,8 @@ def test_shutdown(self): 'register_intent', 'register_vocab', 'remove_context', - 'skill.converse.get_response', 'skill.converse.get_response.disable', - 'skill.converse.get_response.enable', - 'skill.converse.ping', - 'skill.converse.request'}) + 'skill.converse.get_response.enable'}) class TestAdaptIntent(TestCase): From fb3cd04708527f24da65991436df1d97531b6c10 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Wed, 11 Sep 2024 00:56:42 +0100 Subject: [PATCH 36/36] Update mycroft.txt --- requirements/mycroft.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/mycroft.txt b/requirements/mycroft.txt index c85511ccdb1..45af4f21e6d 100644 --- a/requirements/mycroft.txt +++ b/requirements/mycroft.txt @@ -1,8 +1,8 @@ # ovos modules for compat with mycroft namespace ovos_PHAL>=0.0.5,<1.0.0 -ovos-audio>=0.0.2,<1.0.0 +ovos-audio>=0.0.0,<1.0.0 ovos-listener>=0.0.3,<1.0.0 -ovos-gui>=0.1.0,<1.0.0 +ovos-gui>=0.0.4,<1.0.0 ovos-messagebus>=0.0.1,<1.0.0 # default plugins