From d2da83a1fdbb9aa144316da99d1d0c860f07f155 Mon Sep 17 00:00:00 2001
From: litagin02 <litagin02@gmail.com>
Date: Fri, 2 Feb 2024 23:06:31 +0900
Subject: [PATCH] Fix normal model N bug

---
 infer.py         | 8 ++++----
 text/japanese.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/infer.py b/infer.py
index 72997e0..6febc08 100644
--- a/infer.py
+++ b/infer.py
@@ -9,8 +9,6 @@ from text.cleaner import clean_text
 from text.symbols import symbols
 from common.log import logger
 
-# latest_version = "1.0"
-
 
 class InvalidToneError(ValueError):
     pass
@@ -18,6 +16,7 @@ class InvalidToneError(ValueError):
 
 def get_net_g(model_path: str, version: str, device: str, hps):
     if version.endswith("JP-Extra"):
+        logger.info("Using JP-Extra model")
         net_g = SynthesizerTrnJPExtra(
             len(symbols),
             hps.data.filter_length // 2 + 1,
@@ -26,6 +25,7 @@ def get_net_g(model_path: str, version: str, device: str, hps):
             **hps.model,
         ).to(device)
     else:
+        logger.info("Using normal model")
         net_g = SynthesizerTrn(
             len(symbols),
             hps.data.filter_length // 2 + 1,
@@ -53,8 +53,8 @@ def get_text(
     assist_text_weight=0.7,
     given_tone=None,
 ):
-    # 在此处实现当前版本的get_text
-    norm_text, phone, tone, word2ph = clean_text(text, language_str)
+    use_jp_extra = hps.version.endswith("JP-Extra")
+    norm_text, phone, tone, word2ph = clean_text(text, language_str, use_jp_extra)
     if given_tone is not None:
         if len(given_tone) != len(phone):
             raise InvalidToneError(
diff --git a/text/japanese.py b/text/japanese.py
index 77696c6..5c05587 100644
--- a/text/japanese.py
+++ b/text/japanese.py
@@ -210,7 +210,7 @@ def g2p(
 
     assert len(phones) == sum(word2ph), f"{len(phones)} != {sum(word2ph)}"
 
-    # 最後にuse_jp_extraでない場合は「N」を「n」に変換
+    # use_jp_extraでない場合は「N」を「n」に変換
     if not use_jp_extra:
         phones = [phone if phone != "N" else "n" for phone in phones]