Merge branch 'dev' of github.com:litagin02/Style-Bert-VITS2

style_bert_vits2/models/infer_onnx.py

@@ -1,4 +1,5 @@
-from typing import Any, Optional, Sequence, Union
+from collections.abc import Sequence
+from typing import Any, Optional, Union
 
 import numpy as np
 import onnxruntime

style_bert_vits2/models/utils/__init__.py

@@ -11,8 +11,10 @@ import torch
 from numpy.typing import NDArray
 
 from style_bert_vits2.logging import logger
-from style_bert_vits2.models.utils import checkpoints  # type: ignore
-from style_bert_vits2.models.utils import safetensors  # type: ignore
+from style_bert_vits2.models.utils import (
+    checkpoints,  # type: ignore # noqa: F401
+    safetensors,  # type: ignore # noqa: F401
+)
 
 
 if TYPE_CHECKING:

style_bert_vits2/nlp/__init__.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, Sequence, Union
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Any, Optional, Union
 
 from numpy.typing import NDArray
 

style_bert_vits2/nlp/chinese/bert_feature.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, Sequence, Union
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Any, Optional, Union
 
 import numpy as np
 import onnxruntime

style_bert_vits2/nlp/english/bert_feature.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, Sequence, Union
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Any, Optional, Union
 
 import numpy as np
 import onnxruntime

style_bert_vits2/nlp/japanese/bert_feature.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, Sequence, Union
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Any, Optional, Union
 
 import numpy as np
 import onnxruntime

style_bert_vits2/nlp/onnx_bert_models.py

@@ -11,8 +11,9 @@ Style-Bert-VITS2 の ONNX 推論に必要な各言語ごとの ONNX 版 BERT モ
 
 import gc
 import time
+from collections.abc import Sequence
 from pathlib import Path
-from typing import Any, Optional, Sequence, Union
+from typing import Any, Optional, Union
 
 import onnxruntime
 from huggingface_hub import hf_hub_download

style_bert_vits2/tts_model.py

@@ -2,8 +2,9 @@ from __future__ import annotations
 
 import gc
 import time
+from collections.abc import Sequence
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Optional, Sequence, Union
+from typing import TYPE_CHECKING, Any, Optional, Union
 
 import numpy as np
 import onnxruntime

style_bert_vits2/utils/__init__.py

@@ -1,4 +1,5 @@
-from typing import Any, Sequence, Union
+from collections.abc import Sequence
+from typing import Any, Union
 
 import onnxruntime