mathieu/jarvis-server
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

New required configs field for skills

Browse Source
This commit is contained in:
Mathieu 2021-09-13 22:10:11 +02:00
parent af81c42f4e
commit 66b2c411aa
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jarvis/skills/__init__.py
View File

@ -6,11 +6,14 @@ import types
from .. import get_path_file from .. import get_path_file
from ..skills import intent_manager from ..skills import intent_manager
from ..utils import languages_utils, client_utils from ..utils import languages_utils, client_utils, config_utils
class Skill: class Skill:
def __init__(self, name, data): def __init__(self, name, data, required_config: list = None):
if required_config is not None:
self.required_config = required_config
self.name = name self.name = name
self.client_ip = data['client_ip'] self.client_ip = data['client_ip']
@ -22,6 +25,12 @@ class Skill:
self.path = os.path.dirname(get_path_file.__file__) + "/skills/" + self.category + "/" + self.skill_folder self.path = os.path.dirname(get_path_file.__file__) + "/skills/" + self.category + "/" + self.skill_folder
if self.has_required_config():
self.on_load()
def on_load(self):
pass
def speak(self, sentence): def speak(self, sentence):
client_utils.speak(sentence, self.client_ip, self.client_port) client_utils.speak(sentence, self.client_ip, self.client_port)
@ -51,10 +60,13 @@ class Skill:
thread.start() thread.start()
def register(self): def register(self):
self.register_entities_adapt() if self.has_required_config():
self.register_entities_padatious() self.register_entities_adapt()
self.register_regex() self.register_entities_padatious()
print("[" + self.name + "] Registered entity/entities and regex(s)") self.register_regex()
print("[" + self.name + "] Registered entity/entities and regex(s)")
else:
print("[WARN] Skipped skill " + self.name + " : please check your config.")
def register_entities_adapt(self): def register_entities_adapt(self):
path = self.path + "/vocab/" + languages_utils.get_language() + "/*.voc" path = self.path + "/vocab/" + languages_utils.get_language() + "/*.voc"
@ -80,6 +92,13 @@ class Skill:
for line in result: for line in result:
intent_manager.register_regex_adapt(line, self.name) intent_manager.register_regex_adapt(line, self.name)
def has_required_config(self):
if hasattr(self, "required_config") and self.required_config is not None:
for field in self.required_config:
if config_utils.get_in_config(field) is None:
return False
return True
def get_random_line_from_file(filepath): def get_random_line_from_file(filepath):
if os.path.exists(filepath): if os.path.exists(filepath):