diff --git a/app.py b/app.py index 4da8e7a..1773378 100644 --- a/app.py +++ b/app.py @@ -49,7 +49,7 @@ model_holder = TTSModelHolder( ignore_onnx=True, ) -with gr.Blocks(theme=GRADIO_THEME) as app: +with gr.Blocks() as app: gr.Markdown(f"# Style-Bert-VITS2 WebUI (version {VERSION})") with gr.Tabs(): with gr.Tab("音声合成"): @@ -66,6 +66,7 @@ with gr.Blocks(theme=GRADIO_THEME) as app: create_onnx_app(model_holder=model_holder) app.launch( + theme=GRADIO_THEME, server_name=args.host, server_port=args.port, inbrowser=not args.no_autolaunch, diff --git a/gradio_tabs/convert_onnx.py b/gradio_tabs/convert_onnx.py index 47f8276..8ba1dec 100644 --- a/gradio_tabs/convert_onnx.py +++ b/gradio_tabs/convert_onnx.py @@ -52,7 +52,7 @@ def create_onnx_app(model_holder: TTSModelHolder) -> gr.Blocks: initial_id = 0 initial_pth_files = get_model_files(model_names[initial_id]) - with gr.Blocks(theme=GRADIO_THEME) as app: + with gr.Blocks() as app: gr.Markdown(initial_md) with gr.Row(): with gr.Column(): @@ -100,4 +100,4 @@ if __name__ == "__main__": assets_root = path_config.assets_root model_holder = TTSModelHolder(assets_root, "cpu", "", ignore_onnx=True) app = create_onnx_app(model_holder) - app.launch(inbrowser=True) + app.launch(inbrowser=True, theme=GRADIO_THEME) diff --git a/gradio_tabs/dataset.py b/gradio_tabs/dataset.py index abedf62..3c722c8 100644 --- a/gradio_tabs/dataset.py +++ b/gradio_tabs/dataset.py @@ -115,7 +115,7 @@ Style-Bert-VITS2の学習用データセットを作成するためのツール def create_dataset_app() -> gr.Blocks: - with gr.Blocks(theme=GRADIO_THEME) as app: + with gr.Blocks() as app: gr.Markdown( "**既に1ファイル2-12秒程度の音声ファイル集とその書き起こしデータがある場合は、このタブは使用せずに学習できます。**" ) @@ -273,4 +273,4 @@ def create_dataset_app() -> gr.Blocks: if __name__ == "__main__": app = create_dataset_app() - app.launch(inbrowser=True) + app.launch(inbrowser=True, theme=GRADIO_THEME) diff --git a/gradio_tabs/inference.py b/gradio_tabs/inference.py index 7898283..02d4d58 100644 --- a/gradio_tabs/inference.py +++ b/gradio_tabs/inference.py @@ -361,7 +361,7 @@ def create_inference_app(model_holder: TTSModelHolder) -> gr.Blocks: initial_id = 0 initial_pth_files = get_model_files(model_names[initial_id]) - with gr.Blocks(theme=GRADIO_THEME) as app: + with gr.Blocks() as app: gr.Markdown(initial_md) gr.Markdown(terms_of_use_md) null_models = gr.State({}) @@ -742,4 +742,4 @@ if __name__ == "__main__": assets_root, device, torch_device_to_onnx_providers(device) ) app = create_inference_app(model_holder) - app.launch(inbrowser=True) + app.launch(inbrowser=True, theme=GRADIO_THEME) diff --git a/gradio_tabs/merge.py b/gradio_tabs/merge.py index 75cc661..89536d0 100644 --- a/gradio_tabs/merge.py +++ b/gradio_tabs/merge.py @@ -1042,7 +1042,7 @@ def create_merge_app(model_holder: TTSModelHolder) -> gr.Blocks: str(f) for f in model_holder.model_files_dict[model_names[initial_id]] ] - with gr.Blocks(theme=GRADIO_THEME) as app: + with gr.Blocks() as app: gr.Markdown( "複数のStyle-Bert-VITS2モデルから、声質・話し方・話す速さを取り替えたり混ぜたり引いたりして新しいモデルを作成できます。" ) @@ -1554,4 +1554,4 @@ if __name__ == "__main__": assets_root, device, torch_device_to_onnx_providers(device), ignore_onnx=True ) app = create_merge_app(model_holder) - app.launch(inbrowser=True) + app.launch(inbrowser=True, theme=GRADIO_THEME) diff --git a/gradio_tabs/style_vectors.py b/gradio_tabs/style_vectors.py index 46e8a74..e81c960 100644 --- a/gradio_tabs/style_vectors.py +++ b/gradio_tabs/style_vectors.py @@ -416,7 +416,7 @@ https://ja.wikipedia.org/wiki/DBSCAN def create_style_vectors_app(): - with gr.Blocks(theme=GRADIO_THEME) as app: + with gr.Blocks() as app: with gr.Accordion("使い方", open=False): gr.Markdown(how_to_md) model_name = gr.Textbox(placeholder="your_model_name", label="モデル名") @@ -583,4 +583,4 @@ def create_style_vectors_app(): if __name__ == "__main__": app = create_style_vectors_app() - app.launch(inbrowser=True) + app.launch(inbrowser=True, theme=GRADIO_THEME) diff --git a/gradio_tabs/train.py b/gradio_tabs/train.py index 61dfda8..303c858 100644 --- a/gradio_tabs/train.py +++ b/gradio_tabs/train.py @@ -492,7 +492,7 @@ english_teacher.wav|Mary|EN|How are you? I'm fine, thank you, and you? def create_train_app(): - with gr.Blocks(theme=GRADIO_THEME).queue() as app: + with gr.Blocks().queue() as app: gr.Markdown(change_log_md) with gr.Accordion("使い方", open=False): gr.Markdown(how_to_md) @@ -852,4 +852,4 @@ def create_train_app(): if __name__ == "__main__": app = create_train_app() - app.launch(inbrowser=True) + app.launch(inbrowser=True, theme=GRADIO_THEME) diff --git a/pyproject.toml b/pyproject.toml index ae10dbe..860ba79 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,10 +28,10 @@ dependencies = [ "nltk>=3.9,<4", "num2words", "numba", - "numpy>=1.26,<3", + "numpy>=2,<2.5", "onnxruntime", "pydantic>=2.0", - "pyopenjtalk-dict", + "pyopenjtalk-plus", "pypinyin", "pyworld-prebuilt", "safetensors", diff --git a/requirements-colab.txt b/requirements-colab.txt index b04e4de..388c177 100644 --- a/requirements-colab.txt +++ b/requirements-colab.txt @@ -8,7 +8,7 @@ librosa>=0.11,<1 loguru nltk>=3.9,<4 num2words -numpy>=1.26,<3 +numpy>=2,<2.5 onnx onnxconverter-common onnxruntime @@ -16,7 +16,7 @@ onnxruntime-gpu onnxsim-prebuilt pyannote.audio>=3.1.0 pyloudnorm -pyopenjtalk-dict +pyopenjtalk-plus pypinyin pyworld-prebuilt torch diff --git a/requirements-infer.txt b/requirements-infer.txt index d650653..ecfd754 100644 --- a/requirements-infer.txt +++ b/requirements-infer.txt @@ -10,7 +10,7 @@ jieba loguru nltk>=3.9,<4 num2words -numpy>=1.26,<3 +numpy>=2,<2.5 onnx onnxconverter-common onnxruntime @@ -22,7 +22,7 @@ psutil # punctuators pyannote.audio>=3.1.0 # pyloudnorm -pyopenjtalk-dict +pyopenjtalk-plus pypinyin pyworld-prebuilt # stable_ts diff --git a/requirements.txt b/requirements.txt index f7df7c5..c0690aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ librosa>=0.11,<1 loguru nltk>=3.9,<4 num2words -numpy>=1.26,<3 +numpy>=2,<2.5 onnx onnxconverter-common onnxruntime @@ -22,7 +22,7 @@ psutil punctuators pyannote.audio>=3.1.0 pyloudnorm -pyopenjtalk-dict +pyopenjtalk-plus pypinyin pyworld-prebuilt stable_ts