feat/g2p_plugins (#21)

Author: JarbasAl

ovos_plugin_manager/g2p.py

@@ -1,5 +1,7 @@
 from ovos_plugin_manager.utils import load_plugin, find_plugins, PluginTypes
 from ovos_plugin_manager.templates.g2p import Grapheme2PhonemePlugin, PhonemeAlphabet
+from ovos_utils.log import LOG
+from ovos_utils.configuration import read_mycroft_config
 
 
 def find_g2p_plugins():
@@ -13,7 +15,7 @@ def load_g2p_plugin(module_name):
 class OVOSG2PFactory:
     """ replicates the base mycroft class, but uses only OPM enabled plugins"""
     MAPPINGS = {
-        "cmudict": "ovos-g2p-plugin-cmudict",
+        "dummy": "ovos-g2p-plugin-dummy",
         "phoneme_guesser": "neon-g2p-plugin-phoneme-guesser",
         "gruut": "neon-g2p-plugin-gruut"
     }
@@ -30,9 +32,9 @@ def get_class(config=None):
         }
         """
         config = config or get_g2p_config()
-        g2p_module = config.get("module") or 'cmudict'
-        if g2p_module == 'cmudict':
-            return G2P
+        g2p_module = config.get("module") or 'dummy'
+        if g2p_module == 'dummy':
+            return Grapheme2PhonemePlugin
         if g2p_module in OVOSG2PFactory.MAPPINGS:
             g2p_module = OVOSG2PFactory.MAPPINGS[g2p_module]
         return load_g2p_plugin(g2p_module)
@@ -49,12 +51,11 @@ def create(config=None):
         }
         """
         g2p_config = get_g2p_config(config)
-        g2p_module = g2p_config.get('module', 'cmudict')
+        g2p_module = g2p_config.get('module', 'dummy')
         try:
             clazz = OVOSG2PFactory.get_class(g2p_config)
             LOG.info(f'Found plugin {g2p_module}')
-            g2p = clazz(g2p_lang, g2p_config)
-            g2p.validator.validate()
+            g2p = clazz(g2p_config)
             LOG.info(f'Loaded plugin {g2p_module}')
         except Exception:
             LOG.exception('The selected G2P plugin could not be loaded.')
@@ -66,7 +67,7 @@ def get_g2p_config(config=None):
     config = config or read_mycroft_config()
     if "g2p" in config:
         config = config["g2p"]
-    g2p_module = config.get('module', 'cmudict')
+    g2p_module = config.get('module', 'dummy')
     g2p_config = config.get(g2p_module, {})
     g2p_config["module"] = g2p_module
     return g2p_config

ovos_plugin_manager/templates/tts.py

@@ -203,13 +203,14 @@ class TTS:
     def __init__(self, lang="en-us", config=None, validator=None,
                  audio_ext='wav', phonetic_spelling=True, ssml_tags=None):
         self.log_timestamps = False
-        if not config:
-            try:
-                config_core = read_mycroft_config() or {}
-            except FileNotFoundError:
-                config_core = {}
-            config = config_core.get("tts", {})
-            config["lang"] = config_core.get("lang")
+
+        try:
+            config_core = read_mycroft_config() or {}
+        except FileNotFoundError:
+            config_core = {}
+
+        config = config or config_core.get("tts", {})
+        config["lang"] = config.get("lang") or config_core.get("lang")
 
         self.stopwatch = Stopwatch()
         self.tts_name = self.__class__.__name__