From 8eb3c556f929b3c034b2db04f34a92612211d20a Mon Sep 17 00:00:00 2001
From: XTer <xxoy1234@outlook.com>
Date: Tue, 12 Mar 2024 02:03:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=A0=E9=99=A4=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E4=BC=9A=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GPT_SoVITS/TTS_infer_pack/TTS.py | 25 ++++++++++++++++---------
 Inference                        |  2 +-
 trained/character_info.json      |  8 ++++++--
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/GPT_SoVITS/TTS_infer_pack/TTS.py b/GPT_SoVITS/TTS_infer_pack/TTS.py
index 4f256e49..e583c9f9 100644
--- a/GPT_SoVITS/TTS_infer_pack/TTS.py
+++ b/GPT_SoVITS/TTS_infer_pack/TTS.py
@@ -51,15 +51,19 @@ custom:
 
 class TTS_Config:
     def __init__(self, configs: Union[dict, str]):
-        configs_base_path:str = "GPT_SoVITS/configs/"
-        os.makedirs(configs_base_path, exist_ok=True)
-        self.configs_path:str = os.path.join(configs_base_path, "tts_infer.yaml")
-        if isinstance(configs, str):
-            self.configs_path = configs
-            configs:dict = self._load_configs(configs)
+        if isinstance(configs, str) and configs=="":
+            self.default_configs:dict = None
+            self.configs_path = "GPT_SoVITS/configs/tts_infer.yaml"
+        else:
+            configs_base_path:str = "GPT_SoVITS/configs/"
+            os.makedirs(configs_base_path, exist_ok=True)
+            self.configs_path:str = os.path.join(configs_base_path, "tts_infer.yaml")
+            if isinstance(configs, str):
+                self.configs_path = configs
+                configs:dict = self._load_configs(configs)
             
-        # assert isinstance(configs, dict)
-        self.default_configs:dict = configs.get("default", None)
+                # assert isinstance(configs, dict)
+                self.default_configs:dict = configs.get("default", None)
         if self.default_configs is None:
             self.default_configs={
                 "device": "cpu",
@@ -70,7 +74,10 @@ class TTS_Config:
                 "bert_base_path": "GPT_SoVITS/pretrained_models/chinese-roberta-wwm-ext-large",
                 "flash_attn_enabled": True
             }
-        self.configs:dict = configs.get("custom", self.default_configs)
+        if isinstance(configs, dict):
+            self.configs:dict = configs.get("custom", self.default_configs)
+        else:
+            self.configs:dict = self.default_configs
         
         self.device = self.configs.get("device") 
         self.is_half = self.configs.get("is_half")
diff --git a/Inference b/Inference
index 6db34d72..03326be9 160000
--- a/Inference
+++ b/Inference
@@ -1 +1 @@
-Subproject commit 6db34d726ae2d84ab7982865343bf966246e00d4
+Subproject commit 03326be908f0288ab8d26f435eca2ca1ec950b90
diff --git a/trained/character_info.json b/trained/character_info.json
index 27546311..b3e748d1 100644
--- a/trained/character_info.json
+++ b/trained/character_info.json
@@ -1,4 +1,8 @@
 {
-    "deflaut_character": "胡桃(测试)"
-
+    "deflaut_character": "胡桃(测试)",
+    "characters_and_emotions": {
+        "胡桃(测试)": [
+            "default"
+        ]
+    }
 }
\ No newline at end of file