diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 786c9c0f4..12cbb038c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,13 +7,13 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.14.10 + rev: v0.14.14 hooks: - id: ruff args: [ --fix ] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 25.12.0 + rev: 26.1.0 hooks: - id: black diff --git a/for_deploy/webui.py b/for_deploy/webui.py index f813e513e..b0ed97d60 100644 --- a/for_deploy/webui.py +++ b/for_deploy/webui.py @@ -26,7 +26,6 @@ import librosa from infer_utils import BertFeature, ClapFeature - net_g = None device = config.webui_config.device diff --git a/oldVersion/V101/text/__init__.py b/oldVersion/V101/text/__init__.py index 2b8104f76..ffb5c681b 100644 --- a/oldVersion/V101/text/__init__.py +++ b/oldVersion/V101/text/__init__.py @@ -1,6 +1,5 @@ from .symbols import * - _symbol_to_id = {s: i for i, s in enumerate(symbols)} diff --git a/oldVersion/V101/text/chinese.py b/oldVersion/V101/text/chinese.py index f1ab415df..5d42b105e 100644 --- a/oldVersion/V101/text/chinese.py +++ b/oldVersion/V101/text/chinese.py @@ -16,7 +16,6 @@ import jieba.posseg as psg - rep_map = { ":": ",", ";": ",", diff --git a/oldVersion/V101/text/cleaner.py b/oldVersion/V101/text/cleaner.py index 6e5ce61e5..d8867af45 100644 --- a/oldVersion/V101/text/cleaner.py +++ b/oldVersion/V101/text/cleaner.py @@ -1,6 +1,5 @@ from . import chinese, cleaned_text_to_sequence - language_module_map = {"ZH": chinese} diff --git a/oldVersion/V110/text/__init__.py b/oldVersion/V110/text/__init__.py index bb33012b4..9a0b3fe48 100644 --- a/oldVersion/V110/text/__init__.py +++ b/oldVersion/V110/text/__init__.py @@ -1,6 +1,5 @@ from .symbols import * - _symbol_to_id = {s: i for i, s in enumerate(symbols)} diff --git a/oldVersion/V110/text/chinese.py b/oldVersion/V110/text/chinese.py index 66150b653..43d161ad7 100644 --- a/oldVersion/V110/text/chinese.py +++ b/oldVersion/V110/text/chinese.py @@ -15,7 +15,6 @@ import jieba.posseg as psg - rep_map = { ":": ",", ";": ",", diff --git a/oldVersion/V110/text/cleaner.py b/oldVersion/V110/text/cleaner.py index a7a08d9b3..9c0ccae69 100644 --- a/oldVersion/V110/text/cleaner.py +++ b/oldVersion/V110/text/cleaner.py @@ -1,6 +1,5 @@ from . import chinese, japanese, cleaned_text_to_sequence - language_module_map = {"ZH": chinese, "JP": japanese} diff --git a/oldVersion/V111/text/chinese.py b/oldVersion/V111/text/chinese.py index 66150b653..43d161ad7 100644 --- a/oldVersion/V111/text/chinese.py +++ b/oldVersion/V111/text/chinese.py @@ -15,7 +15,6 @@ import jieba.posseg as psg - rep_map = { ":": ",", ";": ",", diff --git a/oldVersion/V111/text/cleaner.py b/oldVersion/V111/text/cleaner.py index dbe57a5ce..2c0823879 100644 --- a/oldVersion/V111/text/cleaner.py +++ b/oldVersion/V111/text/cleaner.py @@ -1,7 +1,6 @@ from . import chinese, japanese, cleaned_text_to_sequence from .fix import japanese as japanese_fix - language_module_map = {"ZH": chinese, "JP": japanese} language_module_map_fix = {"ZH": chinese, "JP": japanese_fix} diff --git a/oldVersion/V200/text/bert_utils.py b/oldVersion/V200/text/bert_utils.py index 7e0c4a95e..551120266 100644 --- a/oldVersion/V200/text/bert_utils.py +++ b/oldVersion/V200/text/bert_utils.py @@ -4,7 +4,6 @@ from config import config - MIRROR: str = config.mirror diff --git a/oldVersion/V200/text/chinese.py b/oldVersion/V200/text/chinese.py index 66150b653..43d161ad7 100644 --- a/oldVersion/V200/text/chinese.py +++ b/oldVersion/V200/text/chinese.py @@ -15,7 +15,6 @@ import jieba.posseg as psg - rep_map = { ":": ",", ";": ",", diff --git a/oldVersion/V200/text/cleaner.py b/oldVersion/V200/text/cleaner.py index 52d7ed049..71f7ce495 100644 --- a/oldVersion/V200/text/cleaner.py +++ b/oldVersion/V200/text/cleaner.py @@ -1,6 +1,5 @@ from . import chinese, japanese, english, cleaned_text_to_sequence - language_module_map = {"ZH": chinese, "JP": japanese, "EN": english} diff --git a/oldVersion/V200/text/english_bert_mock.py b/oldVersion/V200/text/english_bert_mock.py index 4aba0fc1d..9b185a1a9 100644 --- a/oldVersion/V200/text/english_bert_mock.py +++ b/oldVersion/V200/text/english_bert_mock.py @@ -5,7 +5,6 @@ from config import config - LOCAL_PATH = "./bert/deberta-v3-large" tokenizer = DebertaV2Tokenizer.from_pretrained(LOCAL_PATH) diff --git a/oldVersion/V210/text/bert_utils.py b/oldVersion/V210/text/bert_utils.py index 7e0c4a95e..551120266 100644 --- a/oldVersion/V210/text/bert_utils.py +++ b/oldVersion/V210/text/bert_utils.py @@ -4,7 +4,6 @@ from config import config - MIRROR: str = config.mirror diff --git a/oldVersion/V210/text/chinese.py b/oldVersion/V210/text/chinese.py index 3caf5fa48..bf40938c6 100644 --- a/oldVersion/V210/text/chinese.py +++ b/oldVersion/V210/text/chinese.py @@ -15,7 +15,6 @@ import jieba.posseg as psg - rep_map = { ":": ",", ";": ",", diff --git a/oldVersion/V210/text/cleaner.py b/oldVersion/V210/text/cleaner.py index 52d7ed049..71f7ce495 100644 --- a/oldVersion/V210/text/cleaner.py +++ b/oldVersion/V210/text/cleaner.py @@ -1,6 +1,5 @@ from . import chinese, japanese, english, cleaned_text_to_sequence - language_module_map = {"ZH": chinese, "JP": japanese, "EN": english} diff --git a/oldVersion/V210/text/english_bert_mock.py b/oldVersion/V210/text/english_bert_mock.py index 2f3c9af3d..6ea655e17 100644 --- a/oldVersion/V210/text/english_bert_mock.py +++ b/oldVersion/V210/text/english_bert_mock.py @@ -5,7 +5,6 @@ from config import config - LOCAL_PATH = "./bert/deberta-v3-large" tokenizer = DebertaV2Tokenizer.from_pretrained(LOCAL_PATH) diff --git a/oldVersion/V220/text/bert_utils.py b/oldVersion/V220/text/bert_utils.py index 7e0c4a95e..551120266 100644 --- a/oldVersion/V220/text/bert_utils.py +++ b/oldVersion/V220/text/bert_utils.py @@ -4,7 +4,6 @@ from config import config - MIRROR: str = config.mirror diff --git a/oldVersion/V220/text/chinese.py b/oldVersion/V220/text/chinese.py index 3caf5fa48..bf40938c6 100644 --- a/oldVersion/V220/text/chinese.py +++ b/oldVersion/V220/text/chinese.py @@ -15,7 +15,6 @@ import jieba.posseg as psg - rep_map = { ":": ",", ";": ",", diff --git a/oldVersion/V220/text/cleaner.py b/oldVersion/V220/text/cleaner.py index 52d7ed049..71f7ce495 100644 --- a/oldVersion/V220/text/cleaner.py +++ b/oldVersion/V220/text/cleaner.py @@ -1,6 +1,5 @@ from . import chinese, japanese, english, cleaned_text_to_sequence - language_module_map = {"ZH": chinese, "JP": japanese, "EN": english} diff --git a/oldVersion/V220/text/english_bert_mock.py b/oldVersion/V220/text/english_bert_mock.py index 2f3c9af3d..6ea655e17 100644 --- a/oldVersion/V220/text/english_bert_mock.py +++ b/oldVersion/V220/text/english_bert_mock.py @@ -5,7 +5,6 @@ from config import config - LOCAL_PATH = "./bert/deberta-v3-large" tokenizer = DebertaV2Tokenizer.from_pretrained(LOCAL_PATH) diff --git a/onnx_modules/V200/text/bert_utils.py b/onnx_modules/V200/text/bert_utils.py index 7db177ce2..ac1be5374 100644 --- a/onnx_modules/V200/text/bert_utils.py +++ b/onnx_modules/V200/text/bert_utils.py @@ -4,7 +4,6 @@ from config import config - MIRROR: str = config.mirror diff --git a/onnx_modules/V200/text/chinese.py b/onnx_modules/V200/text/chinese.py index 927f98008..27c231008 100644 --- a/onnx_modules/V200/text/chinese.py +++ b/onnx_modules/V200/text/chinese.py @@ -15,7 +15,6 @@ import jieba.posseg as psg - rep_map = { ":": ",", ";": ",", diff --git a/onnx_modules/V200/text/cleaner.py b/onnx_modules/V200/text/cleaner.py index f4018ead3..dfcf5f1a6 100644 --- a/onnx_modules/V200/text/cleaner.py +++ b/onnx_modules/V200/text/cleaner.py @@ -1,6 +1,5 @@ from . import chinese, japanese, english, cleaned_text_to_sequence - language_module_map = {"ZH": chinese, "JP": japanese, "EN": english} diff --git a/onnx_modules/V200/text/english_bert_mock.py b/onnx_modules/V200/text/english_bert_mock.py index cdf6b6f8d..c2a058024 100644 --- a/onnx_modules/V200/text/english_bert_mock.py +++ b/onnx_modules/V200/text/english_bert_mock.py @@ -5,7 +5,6 @@ from config import config - LOCAL_PATH = "./bert/deberta-v3-large" tokenizer = DebertaV2Tokenizer.from_pretrained(LOCAL_PATH) diff --git a/text/bert_utils.py b/text/bert_utils.py index 7e0c4a95e..551120266 100644 --- a/text/bert_utils.py +++ b/text/bert_utils.py @@ -4,7 +4,6 @@ from config import config - MIRROR: str = config.mirror diff --git a/text/chinese.py b/text/chinese.py index a94ba7083..050c34c54 100644 --- a/text/chinese.py +++ b/text/chinese.py @@ -26,7 +26,6 @@ import jieba.posseg as psg - rep_map = { ":": ",", ";": ",", diff --git a/text/cleaner.py b/text/cleaner.py index f1efda25b..5e0fafb87 100644 --- a/text/cleaner.py +++ b/text/cleaner.py @@ -1,6 +1,5 @@ from text import chinese, japanese, english, cleaned_text_to_sequence - language_module_map = {"ZH": chinese, "JP": japanese, "EN": english} diff --git a/text/english_bert_mock.py b/text/english_bert_mock.py index 2f3c9af3d..6ea655e17 100644 --- a/text/english_bert_mock.py +++ b/text/english_bert_mock.py @@ -5,7 +5,6 @@ from config import config - LOCAL_PATH = "./bert/deberta-v3-large" tokenizer = DebertaV2Tokenizer.from_pretrained(LOCAL_PATH) diff --git a/text/japanese.py b/text/japanese.py index 8acad31ee..85e3ab473 100644 --- a/text/japanese.py +++ b/text/japanese.py @@ -12,7 +12,6 @@ import pyopenjtalk import jaconv - # Mapping of hiragana to phonetic representation hiragana_map = { "う゛ぁ": " v a", diff --git a/tools/log.py b/tools/log.py index 3b57df087..a8a164962 100644 --- a/tools/log.py +++ b/tools/log.py @@ -5,7 +5,6 @@ from loguru import logger import sys - # 移除所有默认的处理器 logger.remove() diff --git a/transforms.py b/transforms.py index a11f799e0..c78e655e4 100644 --- a/transforms.py +++ b/transforms.py @@ -3,7 +3,6 @@ import numpy as np - DEFAULT_MIN_BIN_WIDTH = 1e-3 DEFAULT_MIN_BIN_HEIGHT = 1e-3 DEFAULT_MIN_DERIVATIVE = 1e-3