From 4acfc2977e2c2c7c291ca424a6a4f401544d83eb Mon Sep 17 00:00:00 2001
From: litagin02 <litagin02@gmail.com>
Date: Tue, 12 Mar 2024 19:10:43 +0900
Subject: [PATCH] Ensure to write use_jp_extra option to config.json

---
 colab.ipynb                              | 4 ++--
 style_bert_vits2/utils/stdout_wrapper.py | 2 +-
 webui/train.py                           | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/colab.ipynb b/colab.ipynb
index 97a5b8d..0684088 100644
--- a/colab.ipynb
+++ b/colab.ipynb
@@ -35,8 +35,8 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "#@title このセルを実行して環境構築してください。\n",
-        "#@markdown 最後に赤文字でエラーや警告が出ても何故かうまくいくみたいです。\n",
+        "# このセルを実行して環境構築してください。\n",
+        "# エラーダイアログ「WARNING: The following packages were previously imported in this runtime: [pydevd_plugins]」が出るが「キャンセル」を選択して続行してください。\n",
         "\n",
         "!git clone https://github.com/litagin02/Style-Bert-VITS2.git\n",
         "%cd Style-Bert-VITS2/\n",
diff --git a/style_bert_vits2/utils/stdout_wrapper.py b/style_bert_vits2/utils/stdout_wrapper.py
index 174d1fd..95659dc 100644
--- a/style_bert_vits2/utils/stdout_wrapper.py
+++ b/style_bert_vits2/utils/stdout_wrapper.py
@@ -35,7 +35,7 @@ class StdoutWrapper(TextIO):
 
 
 try:
-    import google.colab  # type: ignore
+    # import google.colab  # type: ignore
 
     SAFE_STDOUT = StdoutWrapper()
 except ImportError:
diff --git a/webui/train.py b/webui/train.py
index d837471..7ce8c1e 100644
--- a/webui/train.py
+++ b/webui/train.py
@@ -87,6 +87,9 @@ def initialize(
 
     config["train"]["bf16_run"] = False  # デフォルトでFalseのはずだが念のため
 
+    # 今はデフォルトであるが、以前は非JP-Extra版になくバグの原因になるので念のため
+    config["data"]["use_jp_extra"] = use_jp_extra
+
     model_path = os.path.join(dataset_path, "models")
     if os.path.exists(model_path):
         logger.warning(