From 3454da0bcae8860ae9ed6bfaf55cbba4ea02e3b0 Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 22 Feb 2021 19:41:33 +0100 Subject: [PATCH] Bump ovos related packages and skills --- .../mycroft-embedded-shell.hash | 2 +- .../mycroft-embedded-shell.mk | 2 +- .../mycroft-service/mycroft-gui.service | 2 +- .../mycroft-skill-balena-wifi-setup.mk | 2 +- .../mycroft-skill-ovos-homescreen.mk | 2 +- .../mycroft-skill-ovos-mycroftgui.mk | 2 +- .../mycroft-skill-ovos-pairing.mk | 2 +- .../0004-OVOS-enclosure_assumptions.patch | 86 ++++++++++++++++++- 8 files changed, 91 insertions(+), 9 deletions(-) diff --git a/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.hash b/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.hash index dac6a0ca..4cfee71c 100644 --- a/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.hash +++ b/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 7c05d7eeaf3c6d03e6b3fd5731b17fa73fb6044b0a303f5a1044a01bfec836ad mycroft-embedded-shell-ac1d1b2d856ad8688b7617722df219d13d2984eb.tar.gz +sha256 50e9e5d2e859a329637e5d930d9d22c360a1308cb7449edae9bf9037465f180d mycroft-embedded-shell-2e64a737f4804be20ab3e835afb4142546387abc.tar.gz diff --git a/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.mk b/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.mk index fd5ea974..887acaba 100644 --- a/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.mk +++ b/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.mk @@ -4,7 +4,7 @@ # ################################################################################ -MYCROFT_EMBEDDED_SHELL_VERSION = ac1d1b2d856ad8688b7617722df219d13d2984eb +MYCROFT_EMBEDDED_SHELL_VERSION = 2e64a737f4804be20ab3e835afb4142546387abc MYCROFT_EMBEDDED_SHELL_SITE = $(call github,OpenVoiceOS,mycroft-embedded-shell,$(MYCROFT_EMBEDDED_SHELL_VERSION)) MYCROFT_EMBEDDED_SHELL_LICENSE = Apache License 2.0 diff --git a/buildroot-external/package/mycroft-service/mycroft-gui.service b/buildroot-external/package/mycroft-service/mycroft-gui.service index f2988cd4..e307c285 100644 --- a/buildroot-external/package/mycroft-service/mycroft-gui.service +++ b/buildroot-external/package/mycroft-service/mycroft-gui.service @@ -18,7 +18,7 @@ Environment=XDG_CURRENT_DESKTOP=kde Environment=LD_LIBRARY_PATH=/usr/lib Environment=LIBEXEC_PATH=/libexec:/usr/libexec:/usr/lib/libexec Environment=QML2_IMPORT_PATH=/usr/lib/qml -ExecStart=mycroft-gui-app --hideTextInput --maximize +ExecStart=mycroft-embedded-shell --maximize StandardOutput=null Restart=on-failure diff --git a/buildroot-external/package/mycroft-skill-balena-wifi-setup/mycroft-skill-balena-wifi-setup.mk b/buildroot-external/package/mycroft-skill-balena-wifi-setup/mycroft-skill-balena-wifi-setup.mk index 20199460..37b2590e 100644 --- a/buildroot-external/package/mycroft-skill-balena-wifi-setup/mycroft-skill-balena-wifi-setup.mk +++ b/buildroot-external/package/mycroft-skill-balena-wifi-setup/mycroft-skill-balena-wifi-setup.mk @@ -4,7 +4,7 @@ # ################################################################################ -MYCROFT_SKILL_BALENA_WIFI_SETUP_VERSION = ee7a2f985967c7bd8ed912fb37375c8046bb2230 +MYCROFT_SKILL_BALENA_WIFI_SETUP_VERSION = 7027f30fead898b86ad67c2348b3805af44adef3 MYCROFT_SKILL_BALENA_WIFI_SETUP_SITE = git://github.com/OpenVoiceOS/skill-balena-wifi-setup MYCROFT_SKILL_BALENA_WIFI_SETUP_SITE_METHOD = git MYCROFT_SKILL_BALENA_WIFI_SETUP_DIRLOCATION = opt/mycroft/skills diff --git a/buildroot-external/package/mycroft-skill-ovos-homescreen/mycroft-skill-ovos-homescreen.mk b/buildroot-external/package/mycroft-skill-ovos-homescreen/mycroft-skill-ovos-homescreen.mk index 98807df2..b33cf37d 100644 --- a/buildroot-external/package/mycroft-skill-ovos-homescreen/mycroft-skill-ovos-homescreen.mk +++ b/buildroot-external/package/mycroft-skill-ovos-homescreen/mycroft-skill-ovos-homescreen.mk @@ -4,7 +4,7 @@ # ################################################################################ -MYCROFT_SKILL_OVOS_HOMESCREEN_VERSION = 5f63ea713631d6e56e0aebf71c83f2226255b45a +MYCROFT_SKILL_OVOS_HOMESCREEN_VERSION = cc2e3fdd5411908d73de295f1092ab9e937ffd94 MYCROFT_SKILL_OVOS_HOMESCREEN_SITE = git://github.com/OpenVoiceOS/skill-ovos-homescreen MYCROFT_SKILL_OVOS_HOMESCREEN_SITE_METHOD = git MYCROFT_SKILL_OVOS_HOMESCREEN_DIRLOCATION = opt/mycroft/skills diff --git a/buildroot-external/package/mycroft-skill-ovos-mycroftgui/mycroft-skill-ovos-mycroftgui.mk b/buildroot-external/package/mycroft-skill-ovos-mycroftgui/mycroft-skill-ovos-mycroftgui.mk index abb91c88..33bb323d 100644 --- a/buildroot-external/package/mycroft-skill-ovos-mycroftgui/mycroft-skill-ovos-mycroftgui.mk +++ b/buildroot-external/package/mycroft-skill-ovos-mycroftgui/mycroft-skill-ovos-mycroftgui.mk @@ -4,7 +4,7 @@ # ################################################################################ -MYCROFT_SKILL_OVOS_MYCROFTGUI_VERSION = 832684fae9af2855568ca06e47e1f673c9c23843 +MYCROFT_SKILL_OVOS_MYCROFTGUI_VERSION = 3f545b6356091cf73759f5fc0d48ffc55715d4fa MYCROFT_SKILL_OVOS_MYCROFTGUI_SITE = git://github.com/OpenVoiceOS/skill-ovos-mycroftgui MYCROFT_SKILL_OVOS_MYCROFTGUI_SITE_METHOD = git MYCROFT_SKILL_OVOS_MYCROFTGUI_DIRLOCATION = opt/mycroft/skills diff --git a/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk b/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk index 19bd124f..6363be5f 100644 --- a/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk +++ b/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk @@ -4,7 +4,7 @@ # ################################################################################ -MYCROFT_SKILL_OVOS_PAIRING_VERSION = fb4688a1110e898fe6f2aae0d73c87d9c37d11c7 +MYCROFT_SKILL_OVOS_PAIRING_VERSION = 9f9b37f169edd7387f4a73909bf1d9360b9fa7e1 MYCROFT_SKILL_OVOS_PAIRING_SITE = git://github.com/OpenVoiceOS/skill-ovos-pairing MYCROFT_SKILL_OVOS_PAIRING_SITE_METHOD = git MYCROFT_SKILL_OVOS_PAIRING_DIRLOCATION = opt/mycroft/skills diff --git a/buildroot-external/package/python-mycroft/0004-OVOS-enclosure_assumptions.patch b/buildroot-external/package/python-mycroft/0004-OVOS-enclosure_assumptions.patch index 2ad202a1..e7fe0789 100644 --- a/buildroot-external/package/python-mycroft/0004-OVOS-enclosure_assumptions.patch +++ b/buildroot-external/package/python-mycroft/0004-OVOS-enclosure_assumptions.patch @@ -1,7 +1,7 @@ From ae33770b5b842b9ac51fa7eefcb9b3808590f2e8 Mon Sep 17 00:00:00 2001 From: jarbasal Date: Thu, 18 Feb 2021 18:28:31 +0000 -Subject: [PATCH 1/2] enclosure cleanup +Subject: [PATCH 1/4] enclosure cleanup --- mycroft/client/enclosure/base.py | 39 ++++++ @@ -229,7 +229,7 @@ index 3c47a545943..23c4fde794c 100644 From a5ab14ae5acc5c88fef2dbb23a6729d1eff5ca9e Mon Sep 17 00:00:00 2001 From: jarbasal Date: Thu, 18 Feb 2021 19:24:59 +0000 -Subject: [PATCH 2/2] only report ready after pairing +Subject: [PATCH 2/4] only report ready after pairing --- mycroft/client/enclosure/base.py | 22 +++++++++++++++------- @@ -291,3 +291,85 @@ index 7d55040d13b..aacefe46449 100644 def check_services_ready(self, services): """Report if all specified services are ready. + +From 4d67450e0e1b9d86a1d452f7e683500335224d3b Mon Sep 17 00:00:00 2001 +From: jarbasal +Date: Sun, 21 Feb 2021 15:01:30 +0000 +Subject: [PATCH 3/4] pairing non sense + +--- + mycroft/skills/__main__.py | 12 ++++-------- + mycroft/stt/__init__.py | 2 +- + 2 files changed, 5 insertions(+), 9 deletions(-) + +diff --git a/mycroft/skills/__main__.py b/mycroft/skills/__main__.py +index 0d0cc378edf..bca66ccdfc1 100644 +--- a/mycroft/skills/__main__.py ++++ b/mycroft/skills/__main__.py +@@ -39,10 +39,10 @@ + from mycroft.util.lang import set_active_lang + from mycroft.util.log import LOG + from mycroft.util.process_utils import ProcessStatus, StatusCallbackMap +-from .core import FallbackSkill +-from .event_scheduler import EventScheduler +-from .intent_service import IntentService +-from .skill_manager import SkillManager ++from mycroft.skills.core import FallbackSkill ++from mycroft.skills.event_scheduler import EventScheduler ++from mycroft.skills.intent_service import IntentService ++from mycroft.skills.skill_manager import SkillManager + + RASPBERRY_PI_PLATFORMS = ('mycroft_mark_1', 'picroft', 'mycroft_mark_2pi') + +@@ -127,10 +127,6 @@ def _ensure_device_is_paired(self): + Pairing cannot be performed if there is no connection to the back end. + So skip pairing if the backend is down. + """ +- if not self.is_paired and not self.backend_down: +- LOG.info('Device not paired, invoking the pairing skill') +- payload = dict(utterances=["pair my device"], lang="en-us") +- self.bus.emit(Message("recognizer_loop:utterance", payload)) + + def _update_device_attributes_on_backend(self): + """Communicate version information to the backend. +diff --git a/mycroft/stt/__init__.py b/mycroft/stt/__init__.py +index 5028f20ea1d..a0d49a6e510 100644 +--- a/mycroft/stt/__init__.py ++++ b/mycroft/stt/__init__.py +@@ -285,7 +285,7 @@ def wrapper(*args, **kwargs): + if e.response.status_code == 401: + LOG.warning('Access Denied at mycroft.ai') + # phrase to start the pairing process +- return 'pair my device' ++ return None + else: + raise + return wrapper + +From 87113e92f3909a13c1007d6f935398aa98d96be3 Mon Sep 17 00:00:00 2001 +From: jarbasal +Date: Sun, 21 Feb 2021 20:45:50 +0000 +Subject: [PATCH 4/4] pairing trigger + +--- + mycroft/skills/__main__.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mycroft/skills/__main__.py b/mycroft/skills/__main__.py +index bca66ccdfc1..609fb0ee932 100644 +--- a/mycroft/skills/__main__.py ++++ b/mycroft/skills/__main__.py +@@ -123,10 +123,10 @@ def _display_skill_loading_notification(self): + + def _ensure_device_is_paired(self): + """Determine if device is paired, if not automatically start pairing. +- +- Pairing cannot be performed if there is no connection to the back end. +- So skip pairing if the backend is down. + """ ++ if not self.is_paired: ++ LOG.info('Device not paired, invoking the pairing skill') ++ self.bus.emit(Message("mycroft.not.paired")) + + def _update_device_attributes_on_backend(self): + """Communicate version information to the backend.