diff --git a/.gitignore b/.gitignore index 22f52c8..fe8824b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ venv/ dist/ .coverage .ipynb_checkpoints/ +.ruff_cache/ /Data/ /model_assets/ diff --git a/pyproject.toml b/pyproject.toml index 870c3b2..e8c218d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,6 +72,23 @@ cov = [ "cov-report", ] +[tool.hatch.envs.style] +detached = true +dependencies = [ + "black", + "isort", +] +[tool.hatch.envs.style.scripts] +check = [ + "black --check --diff .", + "isort --check-only --diff --profile black --gitignore --lai 2 .", +] +fmt = [ + "black .", + "isort --profile black --gitignore --lai 2 .", + "check", +] + [[tool.hatch.envs.test.matrix]] python = ["3.9", "3.10", "3.11"] diff --git a/resample.py b/resample.py index b63c64a..5c3cc79 100644 --- a/resample.py +++ b/resample.py @@ -1,6 +1,7 @@ import argparse import os from concurrent.futures import ThreadPoolExecutor +from multiprocessing import cpu_count import librosa import pyloudnorm as pyln diff --git a/server_fastapi.py b/server_fastapi.py index 49e85ac..f3d3c94 100644 --- a/server_fastapi.py +++ b/server_fastapi.py @@ -8,7 +8,7 @@ import os import sys from io import BytesIO from pathlib import Path -from typing import Optional, Any +from typing import Any, Optional from urllib.parse import unquote import GPUtil diff --git a/slice.py b/slice.py index 99fac19..4a86a3d 100644 --- a/slice.py +++ b/slice.py @@ -1,5 +1,4 @@ import argparse -import os import shutil from pathlib import Path diff --git a/style_gen.py b/style_gen.py index b22292d..384319a 100644 --- a/style_gen.py +++ b/style_gen.py @@ -6,6 +6,7 @@ from typing import Any import numpy as np import torch from numpy.typing import NDArray +from pyannote.audio import Inference, Model from tqdm import tqdm from config import config @@ -13,8 +14,6 @@ from style_bert_vits2.logging import logger from style_bert_vits2.models.hyper_parameters import HyperParameters from style_bert_vits2.utils.stdout_wrapper import SAFE_STDOUT -warnings.filterwarnings("ignore", category=UserWarning) -from pyannote.audio import Inference, Model model = Model.from_pretrained("pyannote/wespeaker-voxceleb-resnet34-LM") inference = Inference(model, window="whole") diff --git a/train_ms.py b/train_ms.py index c1a392e..c2538da 100644 --- a/train_ms.py +++ b/train_ms.py @@ -1,5 +1,6 @@ import argparse import datetime +import gc import os import platform diff --git a/webui/inference.py b/webui/inference.py index 91baed5..db59829 100644 --- a/webui/inference.py +++ b/webui/inference.py @@ -39,7 +39,7 @@ bert_models.load_tokenizer(Languages.EN) bert_models.load_model(Languages.ZH) bert_models.load_tokenizer(Languages.ZH) -languages = [l.value for l in Languages] +languages = [lang.value for lang in Languages] initial_text = "こんにちは、初めまして。あなたの名前はなんていうの?" @@ -100,7 +100,7 @@ examples = [ ], ] -initial_md = f""" +initial_md = """ - Ver 2.3で追加されたエディターのほうが実際に読み上げさせるには使いやすいかもしれません。`Editor.bat`か`python server_editor.py --inbrowser`で起動できます。 - 初期からある[jvnvのモデル](https://huggingface.co/litagin/style_bert_vits2_jvnv)は、[JVNVコーパス(言語音声と非言語音声を持つ日本語感情音声コーパス)](https://sites.google.com/site/shinnosuketakamichi/research-topics/jvnv_corpus)で学習されたモデルです。ライセンスは[CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/deed.ja)です。 diff --git a/webui/train.py b/webui/train.py index 7ce8c1e..6d72061 100644 --- a/webui/train.py +++ b/webui/train.py @@ -400,7 +400,7 @@ def run_tensorboard(model_name): yield gr.Button("Tensorboardを開く") -how_to_md = f""" +how_to_md = """ ## 使い方 - データを準備して、モデル名を入力して、必要なら設定を調整してから、「自動前処理を実行」ボタンを押してください。進捗状況等はターミナルに表示されます。