From a2e455ab6cbc2c406a069f1bda7fee110d287309 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Sat, 13 Jan 2024 23:16:53 +0000 Subject: [PATCH 01/35] Create LICENSE --- LICENSE | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..617e3cd --- /dev/null +++ b/LICENSE @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2024 Casimiro Ferreira + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + From 2dc4b5247f196ed6e95c08b6e329e09b4e04c2b4 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Fri, 19 Jan 2024 20:24:42 +0000 Subject: [PATCH 02/35] update/stop_pipeline (#94) * update/stop_pipeline add stop to the pipeline by default companion to https://github.com/OpenVoiceOS/ovos-core/pull/391 * Update mycroft.conf * Update mycroft.conf --- ovos_config/mycroft.conf | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ovos_config/mycroft.conf b/ovos_config/mycroft.conf index 79ece76..788e25b 100644 --- a/ovos_config/mycroft.conf +++ b/ovos_config/mycroft.conf @@ -138,11 +138,13 @@ // NOTE: if padatious is not installed, it will be replaced with padacioso (much slower) // in the future these will become plugins, and new pipeline stages can be added by end users "pipeline": [ + "stop_high", "converse", "padatious_high", "adapt", "common_qa", "fallback_high", + "stop_medium", "padatious_medium", "fallback_medium", "padatious_low", @@ -176,10 +178,11 @@ "autogen_meta": false, // blacklisted skills to not load - // NB: This is the basename() of the directory where the skill lives, so if - // the skill you want to blacklist is in /usr/share/mycroft/skills/mycroft-alarm.mycroftai/ - // then you should write `["mycroft-alarm.mycroftai"]` below. - "blacklisted_skills": [], + // NB: This is skill_id of the skill, usually defined in the skills setup.py + "blacklisted_skills": [ + // stop skill has been replaced with native core functionality + "skill-ovos-stop.openvoiceos" + ], // priority skills to be loaded first // DEPRECATED: specify skill loading requirements in individual skills instead From c965e46fd455f250b3ef5d507ee3590cd8e7dafe Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Fri, 19 Jan 2024 20:24:59 +0000 Subject: [PATCH 03/35] Increment Version to 0.0.13a2 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index be1e927..4d8d57a 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 1 +VERSION_ALPHA = 2 # END_VERSION_BLOCK From a5e8e454928e7ab53dbef1e6b69260c03bcef951 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Fri, 19 Jan 2024 20:25:30 +0000 Subject: [PATCH 04/35] Update Changelog --- CHANGELOG.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c02263d..624e5fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,20 @@ # Changelog -## [0.0.13a1](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a1) (2023-12-29) +## [0.0.13a2](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a2) (2024-01-19) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.12...0.0.13a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a1...0.0.13a2) + +**Implemented enhancements:** + +- update/stop\_pipeline [\#94](https://github.com/OpenVoiceOS/ovos-config/pull/94) ([JarbasAl](https://github.com/JarbasAl)) + +**Closed issues:** + +- Services don't start with malformed configuration [\#97](https://github.com/OpenVoiceOS/ovos-config/issues/97) + +## [V0.0.13a1](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a1) (2023-12-29) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.12...V0.0.13a1) **Merged pull requests:** From 43069b5909b10af7c2eacf673496206411b91f9e Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:18:36 +0000 Subject: [PATCH 05/35] default utterance plugins (#99) enable https://github.com/OpenVoiceOS/ovos-utterance-corrections-plugin and https://github.com/OpenVoiceOS/ovos-utterance-plugin-cancel by default if installed --- ovos_config/mycroft.conf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ovos_config/mycroft.conf b/ovos_config/mycroft.conf index 788e25b..846d5d0 100644 --- a/ovos_config/mycroft.conf +++ b/ovos_config/mycroft.conf @@ -123,8 +123,17 @@ // To enable a utterance transformer plugin just add it's name with any relevant config // these plugins can mutate the utterance between STT and the Intent stage // they may also modify message.context with metadata + // plugins only load if they are installed and enabled in this section "utterance_transformers": { - "ovos-utterance-normalizer": {} + + "ovos-utterance-normalizer": {}, + + // cancel utterances mid command + "ovos-utterance-plugin-cancel": {}, + + // define utterance fixes via fuzzy match ~/.local/share/mycroft/corrections.json + // define unconditional replacements at word level ~/.local/share/mycroft/word_corrections.json + "ovos-utterance-corrections-plugin": {} }, // To enable a metadata transformer plugin just add it's name with any relevant config From 7bd1f3b818a81fbf9bc0788458bed0d6e5dddd25 Mon Sep 17 00:00:00 2001 From: Swen Gross <25036977+emphasize@users.noreply.github.com> Date: Tue, 23 Jan 2024 18:18:47 +0100 Subject: [PATCH 06/35] adjust adapt matcher pipeline defaults (#100) --- ovos_config/mycroft.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ovos_config/mycroft.conf b/ovos_config/mycroft.conf index 846d5d0..3cbaea5 100644 --- a/ovos_config/mycroft.conf +++ b/ovos_config/mycroft.conf @@ -150,13 +150,15 @@ "stop_high", "converse", "padatious_high", - "adapt", + "adapt_high", "common_qa", "fallback_high", "stop_medium", "padatious_medium", + "adapt_medium", "fallback_medium", "padatious_low", + "adapt_low", "fallback_low" ] }, From 6e29fec96f57fdadece05b48fcb05b79860a8237 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 23 Jan 2024 17:18:57 +0000 Subject: [PATCH 07/35] Increment Version to 0.0.13a3 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index 4d8d57a..8a3a395 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 2 +VERSION_ALPHA = 3 # END_VERSION_BLOCK From eac27232b5defcb370e5e7d9013dafe410c7c587 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 23 Jan 2024 17:19:06 +0000 Subject: [PATCH 08/35] Increment Version to 0.0.13a4 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index 8a3a395..186d0c0 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 3 +VERSION_ALPHA = 4 # END_VERSION_BLOCK From 35acd6352c866d2a564e980d14a329030c2b0b4c Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 23 Jan 2024 17:19:26 +0000 Subject: [PATCH 09/35] Update Changelog --- CHANGELOG.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 624e5fe..2fdda95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,20 @@ # Changelog -## [0.0.13a2](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a2) (2024-01-19) +## [0.0.13a3](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a3) (2024-01-23) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a1...0.0.13a2) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a2...0.0.13a3) + +**Implemented enhancements:** + +- default utterance plugins [\#99](https://github.com/OpenVoiceOS/ovos-config/pull/99) ([JarbasAl](https://github.com/JarbasAl)) + +**Merged pull requests:** + +- adjust adapt matcher pipeline defaults [\#100](https://github.com/OpenVoiceOS/ovos-config/pull/100) ([emphasize](https://github.com/emphasize)) + +## [V0.0.13a2](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a2) (2024-01-19) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a1...V0.0.13a2) **Implemented enhancements:** From def9b4cae1d5d3878d3f981821b6f4c6a60e412a Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 23 Jan 2024 17:22:00 +0000 Subject: [PATCH 10/35] Update Changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fdda95..b4b3899 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Changelog -## [0.0.13a3](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a3) (2024-01-23) +## [V0.0.13a3](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a3) (2024-01-23) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a2...0.0.13a3) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a2...V0.0.13a3) **Implemented enhancements:** From 1ba2c0ef74ef033326443fa13d7cd444b18460d8 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:32:01 +0000 Subject: [PATCH 11/35] Update mycroft.conf (#95) --- ovos_config/mycroft.conf | 48 ++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/ovos_config/mycroft.conf b/ovos_config/mycroft.conf index 3cbaea5..488e1ae 100644 --- a/ovos_config/mycroft.conf +++ b/ovos_config/mycroft.conf @@ -157,8 +157,6 @@ "padatious_medium", "adapt_medium", "fallback_medium", - "padatious_low", - "adapt_low", "fallback_low" ] }, @@ -195,11 +193,6 @@ "skill-ovos-stop.openvoiceos" ], - // priority skills to be loaded first - // DEPRECATED: specify skill loading requirements in individual skills instead - // This setting does not affect skills installed via setup.py - "priority_skills": [], - // fallback skill configuration "fallbacks": { // you can add skill_id: priority to override the developer defined @@ -405,12 +398,6 @@ // sound chunks sent to ww callback (eg, saving recordings) "wakeword_chunks_to_save": 15, - // if enabled the noise level is saved to a ipc file, useful for - // debuging if microphone is working but writes a lot to disk, - // recommended that you set "ipc_path" to a tmpfs - // DEPRECATED: used by old ovos-listener only - "mic_meter_ipc": false, - // Set 'save_path' to configure the location of files stored if // 'record_wake_words' and/or 'save_utterances' are set to 'true'. // WARNING: Make sure that user 'mycroft' has write-access on the @@ -466,7 +453,7 @@ "initial_energy_threshold": 1000.0, // vad module can be any plugin, by default it is not used // recommended plugin: "ovos-vad-plugin-silero" - "module": "ovos-vad-plugin-webrtcvad", + "module": "ovos-vad-plugin-silero", "ovos-vad-plugin-silero": {"threshold": 0.2}, "ovos-vad-plugin-webrtcvad": {"vad_mode": 3} }, @@ -537,6 +524,7 @@ "listen": true, "fallback_ww": "hey_mycroft_precise" }, + // in case precise-lite is not installed, attempt to use classic precise "hey_mycroft_precise": { "module": "ovos-ww-plugin-precise", "version": "0.3", @@ -547,6 +535,7 @@ "listen": true, "fallback_ww": "hey_mycroft_vosk" }, + // in case classic precise is not installed, attempt to use vosk "hey_mycroft_vosk": { "module": "ovos-ww-plugin-vosk", "samples": ["hey mycroft", "hey microsoft", "hey mike roft", "hey minecraft"], @@ -554,6 +543,7 @@ "listen": true, "fallback_ww": "hey_mycroft_pocketsphinx" }, + // in case vosk is not installed, attempt to use pocketsphinx "hey_mycroft_pocketsphinx": { "module": "ovos-ww-plugin-pocketsphinx", "phonemes": "HH EY . M AY K R AO F T", @@ -561,27 +551,26 @@ "lang": "en-us", "listen": true }, + // default wakeup word to take ovos out of SLEEPING mode, "wake_up": { "module": "ovos-ww-plugin-pocketsphinx", "phonemes": "W EY K . AH P", "threshold": 1e-20, "lang": "en-us", - // wakeupwords are only used in SLEEPING mode + "wakeup": true, + "fallback_ww": "wake_up_vosk" + }, + // in case pocketsphinx plugin is not installed, attempt to use vosk + "wake_up_vosk": { + "module": "ovos-ww-plugin-vosk", + "rule": "fuzzy", + "samples": ["wake up"], + "lang": "en-us", + // makes this a wakeup word for usage in SLEEPING mode "wakeup": true } }, - // DEPRECATED: the concept of enclosure will no longer exist in ovos-core - // this has been replaced with PHAL, provides backwards compat for mycroft.client.enclosure module - "enclosure": { - // Platform name - // Override: SYSTEM (set by specific enclosures) - "platform": "PHAL", - - // The NTP sync should only forced on Raspberry Pi based devices. - "ntp_sync_on_boot": false - }, - "gui": { // Override: SYSTEM (set by specific enclosures) // Uncomment or add "idle_display_skill" to set initial homescreen @@ -720,12 +709,7 @@ "type": "ovos_vlc", "active": true } - }, - // DEPRECATED - this value is only used as a fallback when OCP is not installed - // OCP is a full fledged media player that handles everything from video to playlists - // it plugs into the audio service api to capture playback and provide backwards compat - // OCP will delegate to the audio backends when needed - "default-backend": "OCP" + } }, "debug": false From 44eea6317717f85cc6b3c5a9121a7ef6c9168f2c Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 23 Jan 2024 17:32:19 +0000 Subject: [PATCH 12/35] Increment Version to 0.0.13a5 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index 186d0c0..129ec48 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 4 +VERSION_ALPHA = 5 # END_VERSION_BLOCK From fafa5b6e70eb9e7c4094b4d216f3bf74b499cc20 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 23 Jan 2024 17:32:44 +0000 Subject: [PATCH 13/35] Update Changelog --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4b3899..3ac5bf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.0.13a5](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a5) (2024-01-23) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a4...0.0.13a5) + +**Implemented enhancements:** + +- Update mycroft.conf [\#95](https://github.com/OpenVoiceOS/ovos-config/pull/95) ([JarbasAl](https://github.com/JarbasAl)) + +## [V0.0.13a4](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a4) (2024-01-23) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a3...V0.0.13a4) + ## [V0.0.13a3](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a3) (2024-01-23) [Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a2...V0.0.13a3) From 2a4cd80c61cf8cff1ce580abdcedad78845d321d Mon Sep 17 00:00:00 2001 From: Swen Gross <25036977+emphasize@users.noreply.github.com> Date: Tue, 23 Jan 2024 23:16:04 +0100 Subject: [PATCH 14/35] readd low adapt matches (intent pipeline) (#101) * readd low adapt matches * adjust common_qa * adjust pipeline --- ovos_config/mycroft.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ovos_config/mycroft.conf b/ovos_config/mycroft.conf index 488e1ae..1ec7aef 100644 --- a/ovos_config/mycroft.conf +++ b/ovos_config/mycroft.conf @@ -151,11 +151,12 @@ "converse", "padatious_high", "adapt_high", - "common_qa", "fallback_high", "stop_medium", "padatious_medium", "adapt_medium", + "adapt_low", + "common_qa", "fallback_medium", "fallback_low" ] From 7e5b5f1b1949444b4c1dc3e74f57d51af53a03e2 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 23 Jan 2024 22:16:21 +0000 Subject: [PATCH 15/35] Increment Version to 0.0.13a6 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index 129ec48..33f1a83 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 5 +VERSION_ALPHA = 6 # END_VERSION_BLOCK From 2bdc9b094879f5f8d4174bbdf3a21b2067d44278 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 23 Jan 2024 22:16:46 +0000 Subject: [PATCH 16/35] Update Changelog --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ac5bf5..ff1c6d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ # Changelog -## [0.0.13a5](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a5) (2024-01-23) +## [0.0.13a6](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a6) (2024-01-23) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a4...0.0.13a5) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a5...0.0.13a6) + +**Merged pull requests:** + +- readd low adapt matches \(intent pipeline\) [\#101](https://github.com/OpenVoiceOS/ovos-config/pull/101) ([emphasize](https://github.com/emphasize)) + +## [V0.0.13a5](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a5) (2024-01-23) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a4...V0.0.13a5) **Implemented enhancements:** From 35e83db07b38d933e459e5944f34f146a0b7d170 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Sun, 28 Jan 2024 13:46:37 +0000 Subject: [PATCH 17/35] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..26e59a2 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "pip" # See documentation for possible values + directory: "/requirements" # Location of package manifests + schedule: + interval: "weekly" From f21d0744c607916e8a87fac922aa7b894c4be775 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:53:40 +0000 Subject: [PATCH 18/35] fix/remove_broken_patch (#107) * fix/remove_broken_patch patch for mycroft-era `Configuration.get` (now `Configuration()`) is broken and causes .get to behave weirdly ``` self.config = dict(Configuration()) # below is False, like in mycroft.conf self.config = Configuration() # below is None ???? self.audio_enabled = self.config.get("enable_old_audioservice") ``` * bad test * signal breaking change ripping out a broken patch that we dont use anywhere, but technically a breaking change. who knows how many places are not actually reading config... bumping to 0.1.0 in case anything depends on the broken behaviour * Update version.py --- ovos_config/config.py | 15 --------------- test/unittests/test_configuration.py | 9 --------- 2 files changed, 24 deletions(-) diff --git a/ovos_config/config.py b/ovos_config/config.py index 4a82d8b..b8f5bc7 100644 --- a/ovos_config/config.py +++ b/ovos_config/config.py @@ -54,10 +54,6 @@ class Configuration(dict): _callbacks = [] def __init__(self): - # python does not support proper overloading - # when instantiation a Configuration object (new style) - # the get method is replaced for proper dict behaviour - self.get = self._real_get super().__init__(**self.load_all_configs()) # dict methods @@ -378,17 +374,6 @@ def patch_clear(message): Configuration.__patch = {} # Backwards compat methods - @staticmethod - def get(configs=None, cache=True, remote=True): - """DEPRECATED - use Configuration class instead""" - LOG.warning("Configuration.get() has been deprecated, use Configuration() instead") - # NOTE: this is only called if using the class directly - # if using an instance (dict object) self._real_get is called instead - return Configuration.load_config_stack(configs, cache, remote) - - def _real_get(self, key, default=None): - return self.__getitem__(key) or default - @staticmethod def clear_cache(message=None): """DEPRECATED - there is no cache anymore """ diff --git a/test/unittests/test_configuration.py b/test/unittests/test_configuration.py index 59c3910..2927fa1 100644 --- a/test/unittests/test_configuration.py +++ b/test/unittests/test_configuration.py @@ -39,15 +39,6 @@ def tearDown(self): Configuration.load_config_stack([{}], True) Configuration._callbacks = [] - def test_get(self): - from ovos_config.config import Configuration - d1 = {'a': 1, 'b': {'c': 1, 'd': 2}} - d2 = {'b': {'d': 'changed'}} - d = Configuration.get([d1, d2]) - self.assertEqual(d['a'], d1['a']) - self.assertEqual(d['b']['d'], d2['b']['d']) - self.assertEqual(d['b']['c'], d1['b']['c']) - @patch('mycroft.api.DeviceApi') @skip("requires backend to be enabled, TODO refactor test!") def test_remote(self, mock_api): From 324d4035903b5d4e65da23fac78d1776fd90460c Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 7 Feb 2024 18:53:58 +0000 Subject: [PATCH 19/35] Increment Version to 0.0.13a7 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index 33f1a83..fd6946c 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 6 +VERSION_ALPHA = 7 # END_VERSION_BLOCK From e622d44a5e3fc259e54b50f85e7001e70e7eb8f6 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 7 Feb 2024 18:54:23 +0000 Subject: [PATCH 20/35] Update Changelog --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff1c6d7..a421149 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ # Changelog -## [0.0.13a6](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a6) (2024-01-23) +## [0.0.13a7](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a7) (2024-02-07) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a5...0.0.13a6) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a6...0.0.13a7) + +**Fixed bugs:** + +- fix/remove\_broken\_patch [\#107](https://github.com/OpenVoiceOS/ovos-config/pull/107) ([JarbasAl](https://github.com/JarbasAl)) + +## [V0.0.13a6](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a6) (2024-01-23) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a5...V0.0.13a6) **Merged pull requests:** From 39cc38ce5fdab4b5c59e2893f341d6acd6fd07c3 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Sat, 24 Feb 2024 19:22:19 +0000 Subject: [PATCH 21/35] fix: "adapt_medium" before padatious (#110) reprioritize pipeline components --- ovos_config/mycroft.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/mycroft.conf b/ovos_config/mycroft.conf index 1ec7aef..1b7e54b 100644 --- a/ovos_config/mycroft.conf +++ b/ovos_config/mycroft.conf @@ -153,8 +153,8 @@ "adapt_high", "fallback_high", "stop_medium", - "padatious_medium", "adapt_medium", + "padatious_medium", "adapt_low", "common_qa", "fallback_medium", From 918e4f0ed00bb08f6f3701059826700b3a634936 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Sat, 24 Feb 2024 19:22:35 +0000 Subject: [PATCH 22/35] Increment Version to 0.0.13a8 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index fd6946c..1bb4866 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 7 +VERSION_ALPHA = 8 # END_VERSION_BLOCK From 4d7afd9a0abdd822b9025604b9b062869b2a1353 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Sat, 24 Feb 2024 19:22:58 +0000 Subject: [PATCH 23/35] Update Changelog --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a421149..f529272 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ # Changelog -## [0.0.13a7](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a7) (2024-02-07) +## [0.0.13a8](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a8) (2024-02-24) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a6...0.0.13a7) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a7...0.0.13a8) + +**Merged pull requests:** + +- fix: "adapt\_medium" before padatious [\#110](https://github.com/OpenVoiceOS/ovos-config/pull/110) ([JarbasAl](https://github.com/JarbasAl)) + +## [V0.0.13a7](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a7) (2024-02-07) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a6...V0.0.13a7) **Fixed bugs:** From 6ba27bc590b256c8f3e7d149bafa8a6fdfd50595 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 26 Feb 2024 03:09:25 +0000 Subject: [PATCH 24/35] improve env vars handling (#54) * Update meta.py improve env vars handling * typo * os.env priority * Update meta.py --- ovos_config/meta.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/ovos_config/meta.py b/ovos_config/meta.py index 98be842..c13eb11 100644 --- a/ovos_config/meta.py +++ b/ovos_config/meta.py @@ -56,9 +56,9 @@ def get_ovos_config(): """ - Goes through all possible ovos.conf paths and loads them in order. Default - `base_folder` and `config_filename` are overridden by envvars - `OVOS_CONFIG_BASE_FOLDER` and `OVOS_CONFIG_FILENAME`, respectively. + Goes through all possible ovos.conf paths and loads them in order. + `base_folder`, `config_filename` and "default_config_path" are overridden by envvars + `OVOS_CONFIG_BASE_FOLDER`,`OVOS_CONFIG_FILENAME` and `OVOS_DEFAULT_CONFIG`, respectively. Submodule overrides are applied to the final config if defined for the calling module. eg, if neon is calling this method then neon config overrides are loaded @@ -67,15 +67,9 @@ def get_ovos_config(): from ovos_utils.system import is_running_from_module # populate default values - config = {"xdg": True, - "base_folder": os.environ.get("OVOS_CONFIG_BASE_FOLDER") or - "mycroft", - "config_filename": os.environ.get("OVOS_CONFIG_FILENAME") or - "mycroft.conf"} - try: - config["default_config_path"] = _oloc.find_default_config() - except FileNotFoundError: # not a mycroft device - config["default_config_path"] = join(dirname(__file__), "mycroft.conf") + config = {"base_folder": "mycroft", + "config_filename": "mycroft.conf", + "default_config_path": f"{dirname(__file__)}/mycroft.conf"} # load ovos.conf for path in get_ovos_default_config_paths(): @@ -85,6 +79,11 @@ def get_ovos_config(): # tolerate bad json TODO proper exception (?) pass + # let's check for os.env overrides, those take precedence over ovos.conf default values + config["base_folder"] = os.environ.get("OVOS_CONFIG_BASE_FOLDER") or config["base_folder"] + config["config_filename"] = os.environ.get("OVOS_CONFIG_FILENAME") or config["config_filename"] + config["default_config_path"] = os.environ.get("OVOS_DEFAULT_CONFIG") or config["default_config_path"] + # let's check for derivatives specific configs # the assumption is that these cores are exclusive to each other, # this will never find more than one override @@ -100,7 +99,7 @@ def get_ovos_config(): if is_running_from_module(k): config = merge_dict(config, cores[subcores[k]]) break - + return config @@ -169,6 +168,7 @@ def set_xdg_base(folder_name): from ovos_utils.log import LOG LOG.info(f"XDG base folder set to: '{folder_name}'") + os.environ["OVOS_CONFIG_BASE_FOLDER"] = folder_name save_ovos_config({"base_folder": folder_name}) @@ -185,6 +185,7 @@ def set_config_filename(file_name, core_folder=None): if core_folder: set_xdg_base(core_folder) LOG.info(f"config filename set to: '{file_name}'") + os.environ["OVOS_CONFIG_FILENAME"] = file_name save_ovos_config({"config_filename": file_name}) @@ -197,7 +198,7 @@ def get_config_filename(): return get_ovos_config().get("config_filename") or "mycroft.conf" -def set_default_config(file_path=None): +def set_default_config(file_path=f"{dirname(__file__)}/mycroft.conf"): """ full path to default config file to be used NOTE: this is a full path, not a directory! "config_filename" parameter is not used here @@ -207,6 +208,6 @@ def set_default_config(file_path=None): """ from ovos_utils.log import LOG - file_path = file_path or _oloc.find_default_config() LOG.info(f"default config file changed to: {file_path}") + os.environ["OVOS_DEFAULT_CONFIG"] = file_path save_ovos_config({"default_config_path": file_path}) From 372372ecfb4836f77e1e343f32c13556718bd79e Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 26 Feb 2024 03:09:39 +0000 Subject: [PATCH 25/35] Increment Version to 0.0.13a9 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index 1bb4866..e6915bf 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 8 +VERSION_ALPHA = 9 # END_VERSION_BLOCK From 7e2a8e2da4d8391b4f8113355b7abbd02d23d9d1 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 26 Feb 2024 03:10:07 +0000 Subject: [PATCH 26/35] Update Changelog --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f529272..7d1c473 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ # Changelog -## [0.0.13a8](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a8) (2024-02-24) +## [0.0.13a9](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a9) (2024-02-26) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a7...0.0.13a8) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a8...0.0.13a9) + +**Implemented enhancements:** + +- improve env vars handling [\#54](https://github.com/OpenVoiceOS/ovos-config/pull/54) ([JarbasAl](https://github.com/JarbasAl)) + +## [V0.0.13a8](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a8) (2024-02-24) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a7...V0.0.13a8) **Merged pull requests:** From 315953d30ff4498a244b9cdb4aefaa0a9a4fcc92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 03:10:18 +0000 Subject: [PATCH 27/35] Update ovos-bus-client requirement from ~=0.0.3 to ~=0.0.8 in /requirements (#106) Updates the requirements on [ovos-bus-client](https://github.com/OpenVoiceOS/ovos-bus-client) to permit the latest version. - [Release notes](https://github.com/OpenVoiceOS/ovos-bus-client/releases) - [Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/blob/dev/CHANGELOG.md) - [Commits](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.3...V0.0.8) --- updated-dependencies: - dependency-name: ovos-bus-client dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/tests.txt b/requirements/tests.txt index 206465c..a6b8459 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -8,4 +8,4 @@ sphinx-rtd-theme==0.4.3 mock_msm~=0.9.2 ovos-stt-plugin-vosk>=0.1.3 python-vlc==1.1.2 -ovos-bus-client~=0.0.3 \ No newline at end of file +ovos-bus-client~=0.0.8 \ No newline at end of file From e08e7dafbbb76fd6c5a0d42126f02496f7dc1acf Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 26 Feb 2024 03:10:33 +0000 Subject: [PATCH 28/35] Increment Version to 0.0.13a10 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index e6915bf..ed3bbaf 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 9 +VERSION_ALPHA = 10 # END_VERSION_BLOCK From 036e5503e06cff440cd81f18d7c274af63f6ad86 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 26 Feb 2024 03:11:00 +0000 Subject: [PATCH 29/35] Update Changelog --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d1c473..561062a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,17 @@ # Changelog -## [0.0.13a9](https://github.com/OpenVoiceOS/ovos-config/tree/0.0.13a9) (2024-02-26) +## [V0.0.13a9](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a9) (2024-02-26) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a8...0.0.13a9) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a8...V0.0.13a9) **Implemented enhancements:** - improve env vars handling [\#54](https://github.com/OpenVoiceOS/ovos-config/pull/54) ([JarbasAl](https://github.com/JarbasAl)) +**Merged pull requests:** + +- Update ovos-bus-client requirement from ~=0.0.3 to ~=0.0.8 in /requirements [\#106](https://github.com/OpenVoiceOS/ovos-config/pull/106) ([dependabot[bot]](https://github.com/apps/dependabot)) + ## [V0.0.13a8](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a8) (2024-02-24) [Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a7...V0.0.13a8) From a3f02b14be79c45384520e35e4e69cc1c1d291df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 03:11:14 +0000 Subject: [PATCH 30/35] Update ovos-backend-client requirement from <0.1.0 to <0.2.0 in /requirements (#104) Updates the requirements on [ovos-backend-client](https://github.com/OpenVoiceOS/ovos-backend-client) to permit the latest version. - [Release notes](https://github.com/OpenVoiceOS/ovos-backend-client/releases) - [Changelog](https://github.com/OpenVoiceOS/ovos-backend-client/blob/dev/CHANGELOG.md) - [Commits](https://github.com/OpenVoiceOS/ovos-backend-client/compare/V0.0.1a4...V0.1.0) --- updated-dependencies: - dependency-name: ovos-backend-client dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/extras.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/extras.txt b/requirements/extras.txt index 0cee470..009ac69 100644 --- a/requirements/extras.txt +++ b/requirements/extras.txt @@ -1 +1 @@ -ovos_backend_client < 0.1.0 +ovos_backend_client < 0.2.0 From 355284d7b485ff05563b2646a36f45bf23ba2c72 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 26 Feb 2024 03:11:27 +0000 Subject: [PATCH 31/35] Increment Version to 0.0.13a11 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index ed3bbaf..53c4e92 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 10 +VERSION_ALPHA = 11 # END_VERSION_BLOCK From 9b516a6feb709dfb8e4cc4c592b4d7950b066916 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 26 Feb 2024 03:11:48 +0000 Subject: [PATCH 32/35] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 561062a..af4126e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [V0.0.13a10](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a10) (2024-02-26) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a9...V0.0.13a10) + +**Merged pull requests:** + +- Update ovos-backend-client requirement from \<0.1.0 to \<0.2.0 in /requirements [\#104](https://github.com/OpenVoiceOS/ovos-config/pull/104) ([dependabot[bot]](https://github.com/apps/dependabot)) + ## [V0.0.13a9](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a9) (2024-02-26) [Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a8...V0.0.13a9) From bff2d7219124b991dc0d0b2970f891aed9c52d21 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 26 Feb 2024 03:12:04 +0000 Subject: [PATCH 33/35] Update mycroft.conf (#112) remove unimplemented duck_while_listening, docs for non existing features are misleading change default lang detect plugin to use public servers (no extra deps) disable mpris by default in OCP, as that seems to be the cause of many issues in core 0.0.7 --- ovos_config/mycroft.conf | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/ovos_config/mycroft.conf b/ovos_config/mycroft.conf index 1b7e54b..1950ebe 100644 --- a/ovos_config/mycroft.conf +++ b/ovos_config/mycroft.conf @@ -473,12 +473,6 @@ // can disable this to listen all the time, allowing 'barge in' functionality. "mute_during_output" : false, - // How much (if at all) to 'duck' the speaker output during listening. A - // setting of 0.0 will not duck at all. A 1.0 will completely mute output - // while in a listening state. Values in between will lower the volume - // partially (this is optional behavior, depending on the enclosure). - "duck_while_listening" : 0.3, - // In milliseconds "phoneme_duration": 120, "multiplier": 1.0, @@ -574,16 +568,15 @@ "gui": { // Override: SYSTEM (set by specific enclosures) - // Uncomment or add "idle_display_skill" to set initial homescreen + // set skill_id of initial homescreen "idle_display_skill": "skill-ovos-homescreen.openvoiceos", - // Extensions provide additional GUI platform support for specific devices - // Currently supported devices: smartspeaker, bigscreen or generic + // GUI plugins / Extensions provide additional GUI platform support for specific devices "extension": "generic", // Generic extension can additionaly provide homescreen functionality - // homescreen support is disabled by default for generic extension "generic": { + // enable/disable homescreen "homescreen_supported": true } }, @@ -682,11 +675,9 @@ // Translation plugins "language": { - // default plugin comes bundled with ovos-classifiers - "detection_module": "ovos-lang-detect-ngram-lm", - // default uses public servers for nllb + //by default uses public servers for translation // https://github.com/OpenVoiceOS/ovos-translate-server - // https://github.com/OpenVoiceOS/ovos-translate-plugin-nllb + "detection_module": "ovos-lang-detector-plugin-server", "translation_module": "ovos-translate-plugin-server" }, @@ -700,6 +691,8 @@ "backends": { "OCP": { "type": "ovos_common_play", + "disable_mpris": true, + "manage_external_players": false, "active": true }, "simple": { From f97644903db8c8f9048bad6fa2f778cb333f56d5 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 26 Feb 2024 03:12:21 +0000 Subject: [PATCH 34/35] Increment Version to 0.0.13a12 --- ovos_config/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index 53c4e92..ae6845f 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -2,5 +2,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 13 -VERSION_ALPHA = 11 +VERSION_ALPHA = 12 # END_VERSION_BLOCK From f8959bc18ab13b0ec9cdf5567ba41585bfb1e7ea Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 26 Feb 2024 03:12:49 +0000 Subject: [PATCH 35/35] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index af4126e..98b2b96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [V0.0.13a11](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a11) (2024-02-26) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a10...V0.0.13a11) + +**Merged pull requests:** + +- Update mycroft.conf [\#112](https://github.com/OpenVoiceOS/ovos-config/pull/112) ([JarbasAl](https://github.com/JarbasAl)) + ## [V0.0.13a10](https://github.com/OpenVoiceOS/ovos-config/tree/V0.0.13a10) (2024-02-26) [Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.0.13a9...V0.0.13a10)