Refactor: moved common/tts_model.py to style_bert_vits2/

app.py

@@ -6,7 +6,7 @@ import torch
 import yaml
 
 from style_bert_vits2.constants import GRADIO_THEME, LATEST_VERSION
-from common.tts_model import ModelHolder
+from style_bert_vits2.tts_model import ModelHolder
 from webui import (
     create_dataset_app,
     create_inference_app,

server_editor.py

@@ -30,7 +30,6 @@ from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
 from scipy.io import wavfile
 
-from common.tts_model import ModelHolder
 from style_bert_vits2.constants import (
     DEFAULT_ASSIST_TEXT_WEIGHT,
     DEFAULT_NOISE,
@@ -52,6 +51,7 @@ from style_bert_vits2.nlp.japanese.user_dict import (
     rewrite_word,
     update_dict,
 )
+from style_bert_vits2.tts_model import ModelHolder
 
 
 # ---フロントエンド部分に関する処理---

server_fastapi.py

@@ -20,7 +20,6 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import FileResponse, Response
 from scipy.io import wavfile
 
-from common.tts_model import Model, ModelHolder
 from config import config
 from style_bert_vits2.constants import (
     DEFAULT_ASSIST_TEXT_WEIGHT,
@@ -35,6 +34,7 @@ from style_bert_vits2.constants import (
     Languages,
 )
 from style_bert_vits2.logging import logger
+from style_bert_vits2.tts_model import Model, ModelHolder
 
 ln = config.server_config.language
 

speech_mos.py

@@ -10,9 +10,9 @@ import pandas as pd
 import torch
 from tqdm import tqdm
 
-from style_bert_vits2.logging import logger
-from common.tts_model import Model
 from config import config
+from style_bert_vits2.logging import logger
+from style_bert_vits2.tts_model import Model
 
 warnings.filterwarnings("ignore")
 

webui/inference.py

@@ -4,7 +4,6 @@ from typing import Optional
 
 import gradio as gr
 
-from common.tts_model import ModelHolder
 from style_bert_vits2.constants import (
     DEFAULT_ASSIST_TEXT_WEIGHT,
     DEFAULT_LENGTH,
@@ -22,6 +21,7 @@ from style_bert_vits2.logging import logger
 from style_bert_vits2.models.infer import InvalidToneError
 from style_bert_vits2.nlp.japanese.g2p_utils import g2kata_tone, kata_tone2phone_tone
 from style_bert_vits2.nlp.japanese.normalizer import normalize_text
+from style_bert_vits2.tts_model import ModelHolder
 
 languages = [l.value for l in Languages]
 

webui/merge.py

@@ -9,9 +9,9 @@ import yaml
 from safetensors import safe_open
 from safetensors.torch import save_file
 
-from common.tts_model import Model, ModelHolder
 from style_bert_vits2.constants import DEFAULT_STYLE, GRADIO_THEME
 from style_bert_vits2.logging import logger
+from style_bert_vits2.tts_model import Model, ModelHolder
 
 
 voice_keys = ["dec"]