Update app.py

app.py

@@ -13,18 +13,20 @@ import commons
 import utils
 from data_utils import TextAudioLoader, TextAudioCollate, TextAudioSpeakerLoader, TextAudioSpeakerCollate
 from models import SynthesizerTrn
-from text import cleaners
+from text.symbols import symbols as symbols_default
+from text.symbols_pho import symbols_pho
 from scipy.io.wavfile import write
+from text import cleaners
 
-# Define a dictionary to store the model paths and symbols for each tab
+# Define a dictionary to store the model paths and corresponding symbols
 model_configs = {
     "Phonemes_finetuned": {
         "path": "fr_wa_finetuned_pho/G_125000.pth",
-        "symbols_module": "text.symbols"
+        "symbols": symbols_default
     },
     "Phonemes": {
         "path": "wallon_pho/G_277000.pth",
-        "symbols_module": "text.symbols_pho"
+        "symbols": symbols_pho
     }
 }
 
@@ -34,12 +36,6 @@ symbols = []
 _symbol_to_id = {}
 _id_to_symbol = {}
 
-def load_symbols(module_name):
-    global symbols, _symbol_to_id, _id_to_symbol
-    symbols = __import__(module_name, fromlist=['symbols']).symbols
-    _symbol_to_id = {s: i for i, s in enumerate(symbols)}
-    _id_to_symbol = {i: s for i, s in enumerate(symbols)}
-
 def text_to_sequence(text, cleaner_names):
     sequence = []
     clean_text = _clean_text(text, cleaner_names)
@@ -63,7 +59,13 @@ def get_text(text, hps):
     text_norm = torch.LongTensor(text_norm)
     return text_norm
 
-def load_model(model_path, hps):
+def load_model_and_symbols(tab_name):
+    global net_g, symbols, _symbol_to_id, _id_to_symbol
+    model_config = model_configs[tab_name]
+    symbols = model_config["symbols"]
+    _symbol_to_id = {s: i for i, s in enumerate(symbols)}
+    _id_to_symbol = {i: s for i, s in enumerate(symbols)}
+
     net_g = SynthesizerTrn(
         len(symbols),
         hps.data.filter_length // 2 + 1,
@@ -71,17 +73,10 @@ def load_model(model_path, hps):
         n_speakers=hps.data.n_speakers,
         **hps.model)
     _ = net_g.eval()
-    _ = utils.load_checkpoint(model_path, net_g, None)
-    return net_g
-
-def update_model_and_symbols(tab_name):
-    global net_g, hps
-    model_config = model_configs[tab_name]
-    load_symbols(model_config["symbols_module"])
-    net_g = load_model(model_config["path"], hps)
+    _ = utils.load_checkpoint(model_config["path"], net_g, None)
 
 def tts(text, speaker_id, tab_name):
-    update_model_and_symbols(tab_name)
+    load_model_and_symbols(tab_name)
     sid = torch.LongTensor([speaker_id])  # speaker identity
     stn_tst = get_text(text, hps)
 
@@ -141,3 +136,4 @@ with app:
 
 app.launch()
 
+