refactor

tts/text/normalization/english_normalization.py

@@ -1,17 +0,0 @@
-from tts.text.normalization.base_normalization import BaseNormalization
-from tts.text.normalization.common_cleaners import collapse_whitespace
-from tts.text.normalization.common_cleaners import convert_to_ascii
-from tts.text.normalization.common_cleaners import lowercase
-
-class EnglishNormalization(BaseNormalization):
-
-    def normalize(self, raw_input_text: str) -> str:
-        text = convert_to_ascii(raw_input_text)
-        text = lowercase(text)
-
-        # TODO: Expand abbreviations
-        # TODO: Expand numbers
-
-        text = collapse_whitespace(text)
-
-        return text

tts/text/pipeline/english_pipeline_v1.py

@@ -1,10 +1,10 @@
 from typing import List
-from tts.text.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence, parse_grapheme_and_arpabet_sequence
-from tts.text.normalization.english_normalization import EnglishNormalization
-from tts.text.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict
-from tts.text.phonetization.english_phonetization import EnglishPhonetization
 from tts.text.pipeline.base_pipeline import BasePipeline
-from tts.text.sequencing.english_symbols_v1 import SPACE_INTEGER_ENCODING, arpabet_to_sequence, symbols_to_sequence
+from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence, parse_grapheme_and_arpabet_sequence
+from tts.text.pipeline_components.normalization.english_normalization import EnglishNormalization
+from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict
+from tts.text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization
+from tts.text.pipeline_components.sequencing.english_symbols_v1 import SPACE_INTEGER_ENCODING, arpabet_to_sequence, symbols_to_sequence
 
 _ENGLISH_NORMALIZER = EnglishNormalization()
 

tts/text/pipeline_components/input_parsing/test_parser.py

@@ -1,4 +1,4 @@
-from tts.text.input_parsing.parser import ArpabetSequence, GraphemeSequence, parse_grapheme_and_arpabet_sequence
+from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, parse_grapheme_and_arpabet_sequence
 
 class TestParser:
 

tts/text/pipeline_components/normalization/english_normalization.py

@@ -0,0 +1,17 @@
+from tts.text.pipeline_components.normalization.base_normalization import BaseNormalization
+from tts.text.pipeline_components.normalization.common_cleaners import collapse_whitespace
+from tts.text.pipeline_components.normalization.common_cleaners import convert_to_ascii
+from tts.text.pipeline_components.normalization.common_cleaners import lowercase
+
+class EnglishNormalization(BaseNormalization):
+
+    def normalize(self, raw_input_text: str) -> str:
+        text = convert_to_ascii(raw_input_text)
+        text = lowercase(text)
+
+        # TODO: Expand abbreviations
+        # TODO: Expand numbers
+
+        text = collapse_whitespace(text)
+
+        return text

tts/text/pipeline_components/normalization/spanish_normalization.py

@@ -1,4 +1,4 @@
-from tts.text.normalization.base_normalization import BaseNormalization
+from tts.text.pipeline_components.normalization.base_normalization import BaseNormalization
 
 class SpanishNormalization(BaseNormalization):
 

tts/text/pipeline_components/normalization/test_english_normalization.py

@@ -1,4 +1,4 @@
-from tts.text.normalization.english_normalization import EnglishNormalization
+from tts.text.pipeline_components.normalization.english_normalization import EnglishNormalization
 
 class TestEnglishNormalization:
 

tts/text/pipeline_components/phonetization/base_phonetization.py

@@ -1,7 +1,7 @@
 
 import re
 from typing import List
-from tts.text.phonetization.cmudict import CMUDict
+from tts.text.pipeline_components.phonetization.cmudict import CMUDict
 
 # Regex taken from open source tacotron2 extensions
 _arpabet_split_re = re.compile(r'[^\s]*{.*?}[^\s]*|[\w]+|[^\w\s]+')

tts/text/pipeline_components/phonetization/english_phonetization.py

@@ -1,7 +1,7 @@
 from typing import List
-from tts.text.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence
+from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence
-from tts.text.phonetization.base_phonetization import BasePhonetization
+from tts.text.pipeline_components.phonetization.base_phonetization import BasePhonetization
-from tts.text.phonetization.cmudict import CMUDict
+from tts.text.pipeline_components.phonetization.cmudict import CMUDict
 
 class EnglishPhonetization(BasePhonetization):
 

tts/text/pipeline_components/phonetization/test_cmudict.py

@@ -1,5 +1,5 @@
-from tts.text.phonetization.cmudict import CMUDict
+from tts.text.pipeline_components.phonetization.cmudict import CMUDict
-from tts.text.phonetization.cmudict import DEFAULT_CMUDICT_PATH
+from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH
 
 
 class TestCmuDict:

tts/text/pipeline_components/phonetization/test_english_phonetization.py

@@ -1,7 +1,7 @@
-from tts.text.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict
+from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict
-from tts.text.phonetization.english_phonetization import EnglishPhonetization
+from tts.text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization
-from tts.text.input_parsing.parser import ArpabetSequence
+from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence
-from tts.text.input_parsing.parser import GraphemeSequence
+from tts.text.pipeline_components.input_parsing.parser import GraphemeSequence
 
 class TestEnglishPhonetization:
 

tts/text/pipeline_components/sequencing/english_symbols_v1.py

@@ -13,7 +13,7 @@ Original documentation:
     _characters. See TRAINING_DATA.md for details.
 """
 
-from tts.text.phonetization import cmudict
+from tts.text.pipeline_components.phonetization import cmudict
 from typing import List
 
 # NB: DO NOT CHANGE THE ORDER OF SYMBOLS! 

tts/text/pipeline_components/sequencing/test_english_symbols_v1.py

@@ -1,4 +1,4 @@
-from tts.text.sequencing.english_symbols_v1 import arpabet_to_sequence, symbols_to_sequence
+from tts.text.pipeline_components.sequencing.english_symbols_v1 import arpabet_to_sequence, symbols_to_sequence
 
 class TestEnglishSymbols: