rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

Add and apply PR2843 to mycroft-core.

This commit is contained in:
j1nx 2021-02-18 15:34:58 +01:00
parent 79d6473893
commit 9f1fed5844
1 changed files with 292 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

292
buildroot-external/package/python-mycroft/0003-OVOS-PR2843.patch Normal file
View File

@ -0,0 +1,292 @@
From b81587defdd84e1f5d72f9db57eee5c880a77a21 Mon Sep 17 00:00:00 2001
From: jarbasal <jarbasai@mailfence.com>
Date: Thu, 18 Feb 2021 13:24:34 +0000
Subject: [PATCH 1/2] fix/padatious_mess
---
.../intent_services/padatious_service.py | 25 +++
mycroft/skills/padatious_service.py | 199 +-----------------
2 files changed, 27 insertions(+), 197 deletions(-)
diff --git a/mycroft/skills/intent_services/padatious_service.py b/mycroft/skills/intent_services/padatious_service.py
index f58f86bc195..e1843f6c984 100644
--- a/mycroft/skills/intent_services/padatious_service.py
+++ b/mycroft/skills/intent_services/padatious_service.py
@@ -52,6 +52,11 @@ def __init__(self, bus, config):
self.bus.on('detach_intent', self.handle_detach_intent)
self.bus.on('detach_skill', self.handle_detach_skill)
self.bus.on('mycroft.skills.initialized', self.train)
+ self.bus.on('intent.service.padatious.get', self.handle_get_padatious)
+ self.bus.on('intent.service.padatious.manifest.get',
+ self.handle_manifest)
+ self.bus.on('intent.service.padatious.entities.manifest.get',
+ self.handle_entity_manifest)
self.finished_training_event = Event()
self.finished_initial_train = False
@@ -238,3 +243,23 @@ def calc_intent(self, utt):
utt (str): utterance to calculate best intent for
"""
return self.container.calc_intent(utt)
+
+ def handle_get_padatious(self, message):
+ utterance = message.data["utterance"]
+ norm = message.data.get('norm_utt', utterance)
+ intent = self.calc_intent(utterance)
+ if not intent and norm != utterance:
+ intent = self.calc_intent(norm)
+ if intent:
+ intent = intent.__dict__
+ self.bus.emit(message.reply("intent.service.padatious.reply",
+ {"intent": intent}))
+
+ def handle_manifest(self, message):
+ self.bus.emit(message.reply("intent.service.padatious.manifest",
+ {"intents": self.registered_intents}))
+
+ def handle_entity_manifest(self, message):
+ self.bus.emit(
+ message.reply("intent.service.padatious.entities.manifest",
+ {"entities": self.registered_entities}))
\ No newline at end of file
diff --git a/mycroft/skills/padatious_service.py b/mycroft/skills/padatious_service.py
index 1b6c248ab04..72f6425d6d7 100644
--- a/mycroft/skills/padatious_service.py
+++ b/mycroft/skills/padatious_service.py
@@ -12,201 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-from functools import lru_cache
-from subprocess import call
-from threading import Event
-from time import time as get_time, sleep
-from os.path import expanduser, isfile
-
-from mycroft.configuration import Configuration
-from mycroft.messagebus.message import Message
-from mycroft.skills.core import FallbackSkill
-from mycroft.util.log import LOG
-
-
-class PadatiousService(FallbackSkill):
- instance = None
-
- fallback_tight_match = 5 # Fallback priority for the conf > 0.8 match
- fallback_loose_match = 89 # Fallback priority for the conf > 0.5 match
-
- def __init__(self, bus, service):
- FallbackSkill.__init__(self, use_settings=False)
- if not PadatiousService.instance:
- PadatiousService.instance = self
-
- self.padatious_config = Configuration.get()['padatious']
- self.service = service
- intent_cache = expanduser(self.padatious_config['intent_cache'])
-
- try:
- from padatious import IntentContainer
- except ImportError:
- LOG.error('Padatious not installed. Please re-run dev_setup.sh')
- try:
- call(['notify-send', 'Padatious not installed',
- 'Please run build_host_setup and dev_setup again'])
- except OSError:
- pass
- return
-
- self.container = IntentContainer(intent_cache)
-
- self._bus = bus
- self.bus.on('padatious:register_intent', self.register_intent)
- self.bus.on('padatious:register_entity', self.register_entity)
- self.bus.on('detach_intent', self.handle_detach_intent)
- self.bus.on('detach_skill', self.handle_detach_skill)
- self.bus.on('mycroft.skills.initialized', self.train)
- self.bus.on('intent.service.padatious.get', self.handle_get_padatious)
- self.bus.on('intent.service.padatious.manifest.get',
- self.handle_manifest)
- self.bus.on('intent.service.padatious.entities.manifest.get',
- self.handle_entity_manifest)
-
- # Call Padatious an an early fallback, looking for a high match intent
- self.register_fallback(self.handle_fallback,
- PadatiousService.fallback_tight_match)
-
- # Try loose Padatious intent match before going to fallback-unknown
- self.register_fallback(self.handle_fallback_last_chance,
- PadatiousService.fallback_loose_match)
-
- self.finished_training_event = Event()
- self.finished_initial_train = False
-
- self.train_delay = self.padatious_config['train_delay']
- self.train_time = get_time() + self.train_delay
-
- self.registered_intents = []
- self.registered_entities = []
-
- def make_active(self):
- """Override the make active since this is not a real fallback skill."""
- pass
-
- def train(self, message=None):
- padatious_single_thread = Configuration.get()[
- 'padatious']['single_thread']
- if message is None:
- single_thread = padatious_single_thread
- else:
- single_thread = message.data.get('single_thread',
- padatious_single_thread)
-
- self.finished_training_event.clear()
-
- LOG.info('Training... (single_thread={})'.format(single_thread))
- self.container.train(single_thread=single_thread)
- LOG.info('Training complete.')
-
- self.finished_training_event.set()
- if not self.finished_initial_train:
- self.bus.emit(Message('mycroft.skills.trained'))
- self.finished_initial_train = True
-
- def wait_and_train(self):
- if not self.finished_initial_train:
- return
- sleep(self.train_delay)
- if self.train_time < 0.0:
- return
-
- if self.train_time <= get_time() + 0.01:
- self.train_time = -1.0
- self.train()
-
- def __detach_intent(self, intent_name):
- """ Remove an intent if it has been registered.
-
- Arguments:
- intent_name (str): intent identifier
- """
- if intent_name in self.registered_intents:
- self.registered_intents.remove(intent_name)
- self.container.remove_intent(intent_name)
-
- def handle_detach_intent(self, message):
- self.__detach_intent(message.data.get('intent_name'))
-
- def handle_detach_skill(self, message):
- skill_id = message.data['skill_id']
- remove_list = [i for i in self.registered_intents if skill_id in i]
- for i in remove_list:
- self.__detach_intent(i)
-
- def _register_object(self, message, object_name, register_func):
- file_name = message.data['file_name']
- name = message.data['name']
-
- LOG.debug('Registering Padatious ' + object_name + ': ' + name)
-
- if not isfile(file_name):
- LOG.warning('Could not find file ' + file_name)
- return
-
- register_func(name, file_name)
- self.train_time = get_time() + self.train_delay
- self.wait_and_train()
-
- def register_intent(self, message):
- self.registered_intents.append(message.data['name'])
- self._register_object(message, 'intent', self.container.load_intent)
-
- def register_entity(self, message):
- self.registered_entities.append(message.data)
- self._register_object(message, 'entity', self.container.load_entity)
-
- def handle_fallback(self, message, threshold=0.8):
- if not self.finished_training_event.is_set():
- LOG.debug('Waiting for Padatious training to finish...')
- return False
-
- utt = message.data.get('utterance', '')
- LOG.debug("Padatious fallback attempt: " + utt)
- intent = self.calc_intent(utt)
-
- if not intent or intent.conf < threshold:
- # Attempt to use normalized() version
- norm = message.data.get('norm_utt', utt)
- if norm != utt:
- LOG.debug(" alt attempt: " + norm)
- intent = self.calc_intent(norm)
- utt = norm
- if not intent or intent.conf < threshold:
- return False
-
- intent.matches['utterance'] = utt
- self.service.add_active_skill(intent.name.split(':')[0])
- self.bus.emit(message.forward(intent.name, data=intent.matches))
- return True
-
- def handle_fallback_last_chance(self, message):
- return self.handle_fallback(message, 0.5)
-
- def handle_get_padatious(self, message):
- utterance = message.data["utterance"]
- norm = message.data.get('norm_utt', utterance)
- intent = self.calc_intent(utterance)
- if not intent and norm != utterance:
- intent = PadatiousService.instance.calc_intent(norm)
- if intent:
- intent = intent.__dict__
- self.bus.emit(message.reply("intent.service.padatious.reply",
- {"intent": intent}))
-
- def handle_manifest(self, message):
- self.bus.emit(message.reply("intent.service.padatious.manifest",
- {"intents": self.registered_intents}))
-
- def handle_entity_manifest(self, message):
- self.bus.emit(
- message.reply("intent.service.padatious.entities.manifest",
- {"entities": self.registered_entities}))
-
- # NOTE: This cache will keep a reference to this calss (PadatiousService),
- # but we can live with that since it is used as a singleton.
- @lru_cache(maxsize=2) # 2 catches both raw and normalized utts in cache
- def calc_intent(self, utt):
- return self.container.calc_intent(utt)
+## BACKWARDS COMPATIBILITY
+from mycroft.skills.intent_services.padatious_service import PadatiousService
From bd5bd6fac9258a733b099f66679b8b762ae87a77 Mon Sep 17 00:00:00 2001
From: jarbasal <jarbasai@mailfence.com>
Date: Thu, 18 Feb 2021 13:32:08 +0000
Subject: [PATCH 2/2] pep8
---
mycroft/skills/intent_services/padatious_service.py | 2 +-
mycroft/skills/padatious_service.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mycroft/skills/intent_services/padatious_service.py b/mycroft/skills/intent_services/padatious_service.py
index e1843f6c984..d3fcc18de47 100644
--- a/mycroft/skills/intent_services/padatious_service.py
+++ b/mycroft/skills/intent_services/padatious_service.py
@@ -262,4 +262,4 @@ def handle_manifest(self, message):
def handle_entity_manifest(self, message):
self.bus.emit(
message.reply("intent.service.padatious.entities.manifest",
- {"entities": self.registered_entities}))
\ No newline at end of file
+ {"entities": self.registered_entities}))
diff --git a/mycroft/skills/padatious_service.py b/mycroft/skills/padatious_service.py
index 72f6425d6d7..6dffa13d872 100644
--- a/mycroft/skills/padatious_service.py
+++ b/mycroft/skills/padatious_service.py
@@ -13,5 +13,5 @@
# limitations under the License.
#
-## BACKWARDS COMPATIBILITY
+# BACKWARDS COMPATIBILITY
from mycroft.skills.intent_services.padatious_service import PadatiousService