v1v2 Version Switching (#1391)

v1v2 Version Switching

GPT_SoVITS/text/.gitignore

@@ -1,2 +1,3 @@
 G2PWModel
-__pycache__
+__pycache__
+*.zip

GPT_SoVITS/text/__init__.py

@@ -10,13 +10,14 @@ from text import symbols2 as symbols_v2
 _symbol_to_id_v1 = {s: i for i, s in enumerate(symbols_v1.symbols)}
 _symbol_to_id_v2 = {s: i for i, s in enumerate(symbols_v2.symbols)}
 
-def cleaned_text_to_sequence(cleaned_text, version):
+def cleaned_text_to_sequence(cleaned_text, version=None):
   '''Converts a string of text to a sequence of IDs corresponding to the symbols in the text.
     Args:
       text: string to convert to a sequence
     Returns:
       List of integers corresponding to the symbols in the text
   '''
+  if version is None:version=os.environ.get('version', 'v2')
   if version == "v1":
     phones = [_symbol_to_id_v1[symbol] for symbol in cleaned_text]
   else:

GPT_SoVITS/text/cleaner.py

@@ -20,7 +20,8 @@ special = [
 ]
 
 
-def clean_text(text, language, version):
+def clean_text(text, language, version=None):
+    if version is None:version=os.environ.get('version', 'v2')
     if version == "v1":
         symbols = symbols_v1.symbols
         language_module_map = {"zh": chinese_v1, "ja": japanese, "en": english}
@@ -57,7 +58,8 @@ def clean_text(text, language, version):
     return phones, word2ph, norm_text
 
 
-def clean_special(text, language, special_s, target_symbol, version):
+def clean_special(text, language, special_s, target_symbol, version=None):
+    if version is None:version=os.environ.get('version', 'v2')
     if version == "v1":
         symbols = symbols_v1.symbols
         language_module_map = {"zh": chinese_v1, "ja": japanese, "en": english}
@@ -82,9 +84,11 @@ def clean_special(text, language, special_s, target_symbol, version):
     return new_ph, phones[1], norm_text
 
 
-def text_to_sequence(text, language):
+def text_to_sequence(text, language, version=None):
+    version = os.environ.get('version',version)
+    if version is None:version='v2'
     phones = clean_text(text)
-    return cleaned_text_to_sequence(phones)
+    return cleaned_text_to_sequence(phones, version)
 
 
 if __name__ == "__main__":