Fix GPT-SoVITS v2 version and model loading problem (#191)

* Fix: move version to vits_config.model to prevent multiple keyword error

* Fix: gsv2 model loading and unloading

Author: Artrajz

gpt_sovits/gpt_sovits.py

@@ -81,11 +81,12 @@ def load_vits_weights(self, weight_path):
         else:
             self.version = "v2"
 
+        self.vits_config.model.version = self.version
+
         self.vits_model = SynthesizerTrn(
             self.vits_config.data.filter_length // 2 + 1,
             self.vits_config.train.segment_size // self.vits_config.data.hop_length,
             n_speakers=self.vits_config.data.n_speakers,
-            version=self.version,
             **self.vits_config.model
         ).to(self.device)
 

manager/ModelManager.py

@@ -390,9 +390,9 @@ def unload_model(self, model_type: str, model_id: str):
                 del self.sid2model[model_type][start:start + n_speakers]
                 del self.voice_speakers[model_type][start:start + n_speakers]
                 del self.tts_models[model_type][model_id]
-                for speaker in speakers:
-                    if speaker in self.spk2model[model_type]:
-                        del self.spk2model[model_type][speaker["name"]]
+
+                for item in speakers:
+                    self.spk2model[model_type].pop(item["name"], None)
 
                 for new_id, speaker in enumerate(self.voice_speakers[model_type]):
                     speaker["id"] = new_id

tts_app/admin/views.py

@@ -55,11 +55,11 @@ def get_models_info():
             if model.get("config_path") is not None:
                 model["config_path"] = extract_model_dir(model["config_path"])
 
-            if model.get("sovits_path") is not None:
-                model["sovits_path"] = extract_model_dir(model["sovits_path"])
+            if model.get("vits_path") is not None:
+                model["vits_path"] = extract_model_dir(model["vits_path"])
 
-            if model.get("gpt_path") is not None:
-                model["gpt_path"] = extract_model_dir(model["gpt_path"])
+            if model.get("t2s_path") is not None:
+                model["t2s_path"] = extract_model_dir(model["t2s_path"])
 
     return loaded_models_info
 
@@ -82,19 +82,19 @@ def load_model():
 
     }
     if model_type == ModelType.GPT_SOVITS:
-        sovits_path = request_data.get("sovits_path")
-        gpt_path = request_data.get("gpt_path")
+        vits_path = request_data.get("vits_path")
+        t2s_path = request_data.get("t2s_path")
 
-        sovits_path = redirect_model_dir(sovits_path)
-        gpt_path = redirect_model_dir(gpt_path)
+        vits_path = redirect_model_dir(vits_path)
+        t2s_path = redirect_model_dir(t2s_path)
 
         tts_model.update(
             {
-                "sovits_path": sovits_path,
-                "gpt_path": gpt_path,
+                "vits_path": vits_path,
+                "t2s_path": t2s_path,
             }
         )
-        logging.info(f"Loading model sovits_path: {sovits_path} gpt_path: {gpt_path}")
+        logging.info(f"Loading model vits_path: {vits_path} t2s_path: {t2s_path}")
     else:
         vits_path = request_data.get("vits_path")
         config_path = request_data.get("config_path")

tts_app/static/js/admincode.js

@@ -56,8 +56,7 @@ function renderModelCard(model_data, model_type) {
     var id = String(model_data["model_id"]);
     var vits_path = String(model_data["vits_path"]);
     var n_speakers = String(model_data["n_speakers"]);
-    var sovits_path = String(model_data["sovits_path"]);
-    var gpt_path = String(model_data["gpt_path"]);
+    var t2s_path = String(model_data["t2s_path"]);
 
     var card = $('<div></div>').addClass("card model-card " + model_type).attr({
         "data-model-type": model_type,
@@ -68,8 +67,8 @@ function renderModelCard(model_data, model_type) {
 
     // $('<div></div>').text("id: " + id).appendTo(wrap);
     if (model_type == "GPT-SOVITS") {
-        $('<div></div>').text(sovits_path).addClass("model-card-info1").appendTo(wrap);
-        $('<div></div>').text(gpt_path).addClass("model-card-info3").appendTo(wrap);
+        $('<div></div>').text(vits_path).addClass("model-card-info1").appendTo(wrap);
+        $('<div></div>').text(t2s_path).addClass("model-card-info3").appendTo(wrap);
         $('<div></div>').text("x").addClass("unload-model").appendTo(wrap);
     } else {
         $('<div></div>').text(vits_path).addClass("model-card-info1").appendTo(wrap);
@@ -106,52 +105,43 @@ function renderModelLoadCards(data) {
         var model_type = model.model_type;
         var vits_path = model.vits_path;
         var config_path = model.config_path;
-        var sovits_path = model.sovits_path;
-        var gpt_path = model.gpt_path;
+        var t2s_path = model.t2s_path;
 
         var folder = null;
-        var model_name = null;
+        var vits_name = null;
         var config_name = null;
-        var sovits_name = null;
-        var gpt_name = null;
+        var t2s_name = null;
 
         $('<div></div>').text(model_id.toString()).addClass("unload-model-id").appendTo(card);
         $('<div></div>').text(model_type).addClass("unload-model-type").appendTo(card);
 
         if (vits_path != null && config_path != null) {
             folder = vits_path.split("/")[0];
-            model_name = vits_path.split("/")[1];
+            vits_name = vits_path.split("/")[1];
             config_name = config_path.split("/")[1];
 
             $('<div></div>').text(folder).addClass("unload-model-folder").appendTo(card);
-            $('<div></div>').text(model_name).addClass("unload-model-path model1").appendTo(card);
-            $('<div></div>').text(config_name).addClass("unload-model-config model2").appendTo(card);
+            $('<div></div>').text(vits_name).addClass("unload-vits-path model1").appendTo(card);
+            $('<div></div>').text(config_name).addClass("unload-vits-config model2").appendTo(card);
         } else {
-            folder = sovits_path.split("/")[0];
-            sovits_name = sovits_path.split("/")[1];
-            gpt_name = gpt_path.split("/")[1];
+            folder = vits_path.split("/")[0];
+            vits_name = vits_path.split("/")[1];
+            t2s_name = t2s_path.split("/")[1];
 
             $('<div></div>').text(folder).addClass("unload-model-folder").appendTo(card);
-            $('<div></div>').text(sovits_name).addClass("unload-sovits-path model1").appendTo(card);
-            $('<div></div>').text(gpt_name).addClass("unload-gpt-config model2").appendTo(card);
+            $('<div></div>').text(vits_name).addClass("unload-vits-path model1").appendTo(card);
+            $('<div></div>').text(t2s_name).addClass("unload-t2s-config model2").appendTo(card);
         }
 
-
-        // $('<div></div>').text(model_type).addClass("model-type").appendTo(card);
-
-
-        // var formattedString = folder + " | " + filename + " | " + config_path;
-        // $('<div></div>').text(formattedString).addClass("unload-model-path").appendTo(card);
-        // card.text(formattedString);
         card.on('click', function () {
             if (!isRequestInProgress) {
                 isRequestInProgress = true;
                 let tts_model = {};
                 if (model_type == "GPT-SOVITS") {
                     tts_model = {
                         model_type: model_type,
-                        gpt_path: gpt_path,
-                        sovits_path: sovits_path
+                        t2s_path: t2s_path,
+                        vits_path: vits_path
                     }
                 } else {
                     tts_model = {