From f13685575be090e0d05d1725bed85e052dce7df7 Mon Sep 17 00:00:00 2001
From: XXXXRT666 <runtongzhong@gmail.com>
Date: Mon, 5 Aug 2024 23:12:17 +0800
Subject: [PATCH] fix bugs

---
 GPT_SoVITS/AR/data/dataset.py   | 4 +++-
 GPT_SoVITS/module/data_utils.py | 4 ++--
 GPT_SoVITS/text/cleaner.py      | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/GPT_SoVITS/AR/data/dataset.py b/GPT_SoVITS/AR/data/dataset.py
index 54b92789..9d2dfe8a 100644
--- a/GPT_SoVITS/AR/data/dataset.py
+++ b/GPT_SoVITS/AR/data/dataset.py
@@ -15,6 +15,8 @@ from torch.utils.data import DataLoader
 from torch.utils.data import Dataset
 from transformers import AutoTokenizer
 
+version = os.environ.get('version',None)
+
 from text import cleaned_text_to_sequence
 
 # from config import exp_dir
@@ -149,7 +151,7 @@ class Text2SemanticDataset(Dataset):
             phoneme = phoneme.split(" ")
 
             try:
-                phoneme_ids = cleaned_text_to_sequence(phoneme)
+                phoneme_ids = cleaned_text_to_sequence(phoneme, version)
             except:
                 traceback.print_exc()
                 # print(f"{item_name} not in self.phoneme_data !")
diff --git a/GPT_SoVITS/module/data_utils.py b/GPT_SoVITS/module/data_utils.py
index 72c80555..bfa29e87 100644
--- a/GPT_SoVITS/module/data_utils.py
+++ b/GPT_SoVITS/module/data_utils.py
@@ -18,7 +18,7 @@ import requests
 from scipy.io import wavfile
 from io import BytesIO
 from tools.my_utils import load_audio
-
+version = os.environ.get('version',None)
 # ZeroDivisionError fixed by Tybost (https://github.com/RVC-Boss/GPT-SoVITS/issues/79)
 class TextAudioSpeakerLoader(torch.utils.data.Dataset):
     """
@@ -77,7 +77,7 @@ class TextAudioSpeakerLoader(torch.utils.data.Dataset):
             try:
                 phoneme = self.phoneme_data[audiopath][0]
                 phoneme = phoneme.split(' ')
-                phoneme_ids = cleaned_text_to_sequence(phoneme)
+                phoneme_ids = cleaned_text_to_sequence(phoneme, version)
             except Exception:
                 print(f"{audiopath} not in self.phoneme_data !")
                 skipped_phone += 1
diff --git a/GPT_SoVITS/text/cleaner.py b/GPT_SoVITS/text/cleaner.py
index 3f6d4fdd..4ea5473d 100644
--- a/GPT_SoVITS/text/cleaner.py
+++ b/GPT_SoVITS/text/cleaner.py
@@ -84,9 +84,11 @@ def clean_special(text, language, special_s, target_symbol, version=None):
     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__":