From d8ee4e29111380ea337afe5fd03f378f96da45d0 Mon Sep 17 00:00:00 2001
From: SapphireLab <saikasyo@163.com>
Date: Mon, 11 Mar 2024 03:04:43 +0800
Subject: [PATCH 1/3] fix output for mix language

---
 GPT_SoVITS/TTS_infer_pack/TextPreprocessor.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/GPT_SoVITS/TTS_infer_pack/TextPreprocessor.py b/GPT_SoVITS/TTS_infer_pack/TextPreprocessor.py
index 2669bf4..946b4c5 100644
--- a/GPT_SoVITS/TTS_infer_pack/TextPreprocessor.py
+++ b/GPT_SoVITS/TTS_infer_pack/TextPreprocessor.py
@@ -152,8 +152,7 @@ class TextPreprocessor:
         bert_feature = torch.cat(bert_feature_list, dim=1)
         # phones = sum(phones_list, [])
         norm_text = ''.join(norm_text_list)
-
-        return phones, bert_feature, norm_text
+        return phones_list, bert_feature, norm_text
 
 
     def get_bert_feature(self, text:str, word2ph:list)->torch.Tensor:

From aa020b059d2acd3986715996a48516b97a7fbe67 Mon Sep 17 00:00:00 2001
From: SapphireLab <saikasyo@163.com>
Date: Mon, 11 Mar 2024 03:25:57 +0800
Subject: [PATCH 2/3] align tts config

---
 GPT_SoVITS/TTS_infer_pack/TTS.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/GPT_SoVITS/TTS_infer_pack/TTS.py b/GPT_SoVITS/TTS_infer_pack/TTS.py
index c111034..62ab49a 100644
--- a/GPT_SoVITS/TTS_infer_pack/TTS.py
+++ b/GPT_SoVITS/TTS_infer_pack/TTS.py
@@ -125,17 +125,11 @@ class TTS_Config:
         with open(configs_path, 'w') as f:
             yaml.dump(configs, f)
             
-            
     def __str__(self):
-        string = "----------------TTS Config--------------\n"
-        string += "device: {}\n".format(self.device)
-        string += "is_half: {}\n".format(self.is_half)
-        string += "bert_base_path: {}\n".format(self.bert_base_path)
-        string += "t2s_weights_path: {}\n".format(self.t2s_weights_path)
-        string += "vits_weights_path: {}\n".format(self.vits_weights_path)
-        string += "cnhuhbert_base_path: {}\n".format(self.cnhuhbert_base_path)
-        string += "flash_attn_enabled: {}\n".format(self.flash_attn_enabled)
-        string += "----------------------------------------\n"
+        string = "TTS Config".center(100, '-') + '\n'
+        for k, v in self.configs.items():
+            string += f"{str(k).ljust(20)}: {str(v)}\n"
+        string += "-" * 100 + '\n'
         return string
 
 

From 778a43760a43bc9d10046c777e9ac723b5f95475 Mon Sep 17 00:00:00 2001
From: SapphireLab <saikasyo@163.com>
Date: Mon, 11 Mar 2024 13:53:56 +0800
Subject: [PATCH 3/3] change config

---
 GPT_SoVITS/TTS_infer_pack/TTS.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/GPT_SoVITS/TTS_infer_pack/TTS.py b/GPT_SoVITS/TTS_infer_pack/TTS.py
index 62ab49a..2e9de81 100644
--- a/GPT_SoVITS/TTS_infer_pack/TTS.py
+++ b/GPT_SoVITS/TTS_infer_pack/TTS.py
@@ -97,7 +97,6 @@ class TTS_Config:
             configs = yaml.load(f, Loader=yaml.FullLoader)
     
         return configs
-    
 
     def save_configs(self, configs_path:str=None)->None:
         configs={
@@ -110,22 +109,27 @@ class TTS_Config:
                 "bert_base_path": "GPT_SoVITS/pretrained_models/chinese-roberta-wwm-ext-large",
                 "flash_attn_enabled": True
             },
-            "custom": {
-                "device": str(self.device),
-                "is_half": self.is_half,
-                "t2s_weights_path": self.t2s_weights_path,
-                "vits_weights_path": self.vits_weights_path,
-                "bert_base_path": self.bert_base_path,
-                "cnhuhbert_base_path": self.cnhuhbert_base_path,
-                "flash_attn_enabled": self.flash_attn_enabled
-            }
+            "custom": self.update_configs()
         }
         if configs_path is None:
             configs_path = self.configs_path
         with open(configs_path, 'w') as f:
             yaml.dump(configs, f)
+
+    def update_configs(self):
+        config = {
+            "device"             : str(self.device),
+            "is_half"            : self.is_half,
+            "t2s_weights_path"   : self.t2s_weights_path,
+            "vits_weights_path"  : self.vits_weights_path,
+            "bert_base_path"     : self.bert_base_path,
+            "cnhuhbert_base_path": self.cnhuhbert_base_path,
+            "flash_attn_enabled" : self.flash_attn_enabled
+        }
+        return config
             
     def __str__(self):
+        self.configs = self.update_configs()
         string = "TTS Config".center(100, '-') + '\n'
         for k, v in self.configs.items():
             string += f"{str(k).ljust(20)}: {str(v)}\n"