From 375eb7f3a977ecf5d26a57c3532e508de61d6408 Mon Sep 17 00:00:00 2001
From: tsukumi <tsukumijima@users.noreply.github.com>
Date: Fri, 25 Oct 2024 22:18:57 +0900
Subject: [PATCH] Refactor: run "hatch run style:fmt"

---
 gradio_tabs/merge.py          | 16 ++++++++--------
 style_bert_vits2/tts_model.py | 12 +++++++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/gradio_tabs/merge.py b/gradio_tabs/merge.py
index 1bd3d13..49117a3 100644
--- a/gradio_tabs/merge.py
+++ b/gradio_tabs/merge.py
@@ -106,7 +106,7 @@ def merge_style_usual(
     new_config["data"]["num_styles"] = len(new_style2id)
     new_config["data"]["style2id"] = new_style2id
     if new_config["data"]["n_speakers"] == 1:
-        new_config["data"]["spk2id"] = { output_name : 0}
+        new_config["data"]["spk2id"] = {output_name: 0}
     new_config["model_name"] = output_name
     save_config(new_config, output_name)
 
@@ -163,7 +163,7 @@ def merge_style_add_diff(
     new_config["data"]["num_styles"] = len(new_style2id)
     new_config["data"]["style2id"] = new_style2id
     if new_config["data"]["n_speakers"] == 1:
-        new_config["data"]["spk2id"] = { output_name : 0}
+        new_config["data"]["spk2id"] = {output_name: 0}
     new_config["model_name"] = output_name
     save_config(new_config, output_name)
 
@@ -224,7 +224,7 @@ def merge_style_weighted_sum(
     new_config["data"]["num_styles"] = len(new_style2id)
     new_config["data"]["style2id"] = new_style2id
     if new_config["data"]["n_speakers"] == 1:
-        new_config["data"]["spk2id"] = { output_name : 0}
+        new_config["data"]["spk2id"] = {output_name: 0}
     new_config["model_name"] = output_name
     save_config(new_config, output_name)
 
@@ -275,7 +275,7 @@ def merge_style_add_null(
     new_config["data"]["num_styles"] = len(new_style2id)
     new_config["data"]["style2id"] = new_style2id
     if new_config["data"]["n_speakers"] == 1:
-        new_config["data"]["spk2id"] = { output_name : 0}
+        new_config["data"]["spk2id"] = {output_name: 0}
     new_config["model_name"] = output_name
     save_config(new_config, output_name)
 
@@ -371,7 +371,7 @@ def merge_models_usual(
     new_config["data"]["num_styles"] = 1
     new_config["data"]["style2id"] = {DEFAULT_STYLE: 0}
     if new_config["data"]["n_speakers"] == 1:
-        new_config["data"]["spk2id"] = { output_name : 0}
+        new_config["data"]["spk2id"] = {output_name: 0}
     save_config(new_config, output_name)
 
     neutral_vector_a = style_vectors_a[0]
@@ -455,7 +455,7 @@ def merge_models_add_diff(
     new_config["data"]["num_styles"] = 1
     new_config["data"]["style2id"] = {DEFAULT_STYLE: 0}
     if new_config["data"]["n_speakers"] == 1:
-        new_config["data"]["spk2id"] = { output_name : 0}
+        new_config["data"]["spk2id"] = {output_name: 0}
     with open(assets_root / output_name / "config.json", "w", encoding="utf-8") as f:
         json.dump(new_config, f, indent=2, ensure_ascii=False)
 
@@ -532,7 +532,7 @@ def merge_models_weighted_sum(
     new_config["data"]["num_styles"] = 1
     new_config["data"]["style2id"] = {DEFAULT_STYLE: 0}
     if new_config["data"]["n_speakers"] == 1:
-        new_config["data"]["spk2id"] = { output_name : 0}
+        new_config["data"]["spk2id"] = {output_name: 0}
     with open(assets_root / output_name / "config.json", "w", encoding="utf-8") as f:
         json.dump(new_config, f, indent=2, ensure_ascii=False)
 
@@ -610,7 +610,7 @@ def merge_models_add_null(
     new_config["data"]["num_styles"] = 1
     new_config["data"]["style2id"] = {DEFAULT_STYLE: 0}
     if new_config["data"]["n_speakers"] == 1:
-        new_config["data"]["spk2id"] = { output_name : 0}
+        new_config["data"]["spk2id"] = {output_name: 0}
     with open(assets_root / output_name / "config.json", "w", encoding="utf-8") as f:
         json.dump(new_config, f, indent=2, ensure_ascii=False)
 
diff --git a/style_bert_vits2/tts_model.py b/style_bert_vits2/tts_model.py
index 2994575..a4904e4 100644
--- a/style_bert_vits2/tts_model.py
+++ b/style_bert_vits2/tts_model.py
@@ -150,7 +150,9 @@ class TTSModel:
                     hps=self.hyper_parameters,
                 )
                 # 愚直。もっと上手い方法ありそう
-                params = zip(self.net_g.dec.parameters(), null_model_add.dec.parameters())
+                params = zip(
+                    self.net_g.dec.parameters(), null_model_add.dec.parameters()
+                )
                 for v in params:
                     v[0].data.add_(v[1].data, alpha=float(null_model_info["weight"]))
                 params = zip(
@@ -165,14 +167,18 @@ class TTSModel:
                 for v in params:
                     v[0].data.add_(v[1].data, alpha=float(null_model_info["style"]))
                 # テンポは sdp と dp 二つあるからとりあえずどっちも足す
-                params = zip(self.net_g.sdp.parameters(), null_model_add.sdp.parameters())
+                params = zip(
+                    self.net_g.sdp.parameters(), null_model_add.sdp.parameters()
+                )
                 for v in params:
                     v[0].data.add_(v[1].data, alpha=float(null_model_info["tempo"]))
                 params = zip(self.net_g.dp.parameters(), null_model_add.dp.parameters())
                 for v in params:
                     v[0].data.add_(v[1].data, alpha=float(null_model_info["tempo"]))
 
-            logger.info(f"Null models merged successfully ({time.time() - start_time:.2f}s)")
+            logger.info(
+                f"Null models merged successfully ({time.time() - start_time:.2f}s)"
+            )
 
         # ONNX 推論時
         else: