From 3fbbebd74d1d750e56c170407fe5c3b3601a0636 Mon Sep 17 00:00:00 2001 From: Edresson Date: Sun, 15 Aug 2021 13:44:58 -0300 Subject: [PATCH] Fix pylint issues --- TTS/tts/configs/vits_config.py | 4 ++-- TTS/tts/models/vits.py | 4 +--- TTS/tts/utils/languages.py | 6 ++---- TTS/tts/utils/text/cleaners.py | 2 +- tests/data_tests/test_loader.py | 5 +++++ 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/TTS/tts/configs/vits_config.py b/TTS/tts/configs/vits_config.py index 3e031f02..cc3e4940 100644 --- a/TTS/tts/configs/vits_config.py +++ b/TTS/tts/configs/vits_config.py @@ -82,8 +82,8 @@ class VitsConfig(BaseTTSConfig): add_blank (bool): If true, a blank token is added in between every character. Defaults to `True`. - test_sentences (List[str]): - List of sentences to be used for testing. + test_sentences (List[List]): + List of sentences with speaker and language information to be used for testing. Note: Check :class:`TTS.tts.configs.shared_configs.BaseTTSConfig` for the inherited parameters. diff --git a/TTS/tts/models/vits.py b/TTS/tts/models/vits.py index 11f1fab0..6fe60fa0 100644 --- a/TTS/tts/models/vits.py +++ b/TTS/tts/models/vits.py @@ -740,7 +740,7 @@ class Vits(BaseTTS): test_audios["{}-audio".format(idx)] = wav test_figures["{}-alignment".format(idx)] = plot_alignment(alignment.T, output_fig=False) except: # pylint: disable=bare-except - print(" !! Error creating Test Sentence -", idx) + print(" !! Error creating Test Sentence -", idx) return test_figures, test_audios def get_optimizer(self) -> List: @@ -837,5 +837,3 @@ class Vits(BaseTTS): if eval: self.eval() assert not self.training - - diff --git a/TTS/tts/utils/languages.py b/TTS/tts/utils/languages.py index b87b9936..94be914c 100644 --- a/TTS/tts/utils/languages.py +++ b/TTS/tts/utils/languages.py @@ -20,7 +20,6 @@ class LanguageManager: >>> manager = LanguageManager(language_id_file_path=language_id_file_path) >>> language_id_mapper = manager.language_ids """ - num_languages: int = 0 language_id_mapping: Dict = {} def __init__( self, @@ -77,7 +76,6 @@ class LanguageManager: file_path (str): Path to the target json file. """ self.language_id_mapping = self._load_json(file_path) - self.num_languages = len(self.language_id_mapping) def save_language_ids_to_file(self, file_path: str) -> None: """Save language IDs to a json file. @@ -99,7 +97,7 @@ def _set_file_path(path): return path_continue return None -def get_language_manager(c: Coqpit, data: List = None, restore_path: str = None, out_path: str = None) -> LanguageManager: +def get_language_manager(c: Coqpit, data: List = None, restore_path: str = None) -> LanguageManager: """Initiate a `LanguageManager` instance by the provided config. Args: @@ -135,4 +133,4 @@ def get_language_weighted_sampler(items: list): language_count = np.array([len(np.where(language_names == l)[0]) for l in unique_language_names]) weight_language = 1. / language_count dataset_samples_weight = torch.from_numpy(np.array([weight_language[l] for l in language_ids])).double() - return WeightedRandomSampler(dataset_samples_weight, len(dataset_samples_weight)) \ No newline at end of file + return WeightedRandomSampler(dataset_samples_weight, len(dataset_samples_weight)) diff --git a/TTS/tts/utils/text/cleaners.py b/TTS/tts/utils/text/cleaners.py index 71155ebc..826919c2 100644 --- a/TTS/tts/utils/text/cleaners.py +++ b/TTS/tts/utils/text/cleaners.py @@ -142,4 +142,4 @@ def multilingual_cleaners(text): text = replace_symbols(text, lang=None) text = remove_aux_symbols(text) text = collapse_whitespace(text) - return text \ No newline at end of file + return text diff --git a/tests/data_tests/test_loader.py b/tests/data_tests/test_loader.py index 8a20c261..19c2e8f7 100644 --- a/tests/data_tests/test_loader.py +++ b/tests/data_tests/test_loader.py @@ -38,6 +38,11 @@ class TestTTSDataset(unittest.TestCase): def _create_dataloader(self, batch_size, r, bgs): items = ljspeech(c.data_path, "metadata.csv") + + # add a default language because now the TTSDataset expect a language + language = "" + items = [[*item, language] for item in items] + dataset = TTSDataset( r, c.text_cleaner,