diff --git a/app.py b/app.py index 13929cd..5d05d7c 100644 --- a/app.py +++ b/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, diff --git a/server_editor.py b/server_editor.py index 890a074..022a95a 100644 --- a/server_editor.py +++ b/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 # ---フロントエンド部分に関する処理--- diff --git a/server_fastapi.py b/server_fastapi.py index b7ebb77..833af4a 100644 --- a/server_fastapi.py +++ b/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 diff --git a/speech_mos.py b/speech_mos.py index 15cccef..79221ad 100644 --- a/speech_mos.py +++ b/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") diff --git a/common/tts_model.py b/style_bert_vits2/tts_model.py similarity index 100% rename from common/tts_model.py rename to style_bert_vits2/tts_model.py diff --git a/webui/inference.py b/webui/inference.py index 026481f..02d6f3a 100644 --- a/webui/inference.py +++ b/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] diff --git a/webui/merge.py b/webui/merge.py index 1fc3cee..e9dd1f0 100644 --- a/webui/merge.py +++ b/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"]