diff --git a/TTS/api.py b/TTS/api.py index c207cb71..31145464 100644 --- a/TTS/api.py +++ b/TTS/api.py @@ -12,6 +12,7 @@ from TTS.utils.manage import ModelManager from TTS.utils.synthesizer import Synthesizer from TTS.config import load_config + class TTS(nn.Module): """TODO: Add voice conversion and Capacitron support.""" @@ -107,8 +108,12 @@ class TTS(nn.Module): @property def is_multi_lingual(self): # Not sure what sets this to None, but applied a fix to prevent crashing. - if (isinstance(self.model_name, str) and "xtts" in self.model_name or - self.config and ("xtts" in self.config.model or len(self.config.languages) > 1)): + if ( + isinstance(self.model_name, str) + and "xtts" in self.model_name + or self.config + and ("xtts" in self.config.model or len(self.config.languages) > 1) + ): return True if hasattr(self.synthesizer.tts_model, "language_manager") and self.synthesizer.tts_model.language_manager: return self.synthesizer.tts_model.language_manager.num_languages > 1 diff --git a/TTS/tts/layers/xtts/trainer/gpt_trainer.py b/TTS/tts/layers/xtts/trainer/gpt_trainer.py index 4789e1f4..61222dac 100644 --- a/TTS/tts/layers/xtts/trainer/gpt_trainer.py +++ b/TTS/tts/layers/xtts/trainer/gpt_trainer.py @@ -319,7 +319,7 @@ class GPTTrainer(BaseTTS): return self.train_step(batch, criterion) def on_train_epoch_start(self, trainer): - trainer.model.eval() # the whole model to eval + trainer.model.eval() # the whole model to eval # put gpt model in training mode trainer.model.xtts.gpt.train() diff --git a/TTS/utils/manage.py b/TTS/utils/manage.py index bdfc2d95..35323782 100644 --- a/TTS/utils/manage.py +++ b/TTS/utils/manage.py @@ -27,7 +27,6 @@ LICENSE_URLS = { } - class ModelManager(object): tqdm_progress = None """Manage TTS models defined in .models.json. @@ -315,7 +314,7 @@ class ModelManager(object): f"https://coqui.gateway.scarf.sh/hf-coqui/XTTS-v2/{model_version}/model.pth", f"https://coqui.gateway.scarf.sh/hf-coqui/XTTS-v2/{model_version}/config.json", f"https://coqui.gateway.scarf.sh/hf-coqui/XTTS-v2/{model_version}/vocab.json", - f"https://coqui.gateway.scarf.sh/hf-coqui/XTTS-v2/{model_version}/hash.md5" + f"https://coqui.gateway.scarf.sh/hf-coqui/XTTS-v2/{model_version}/hash.md5", ], } print(model_item)