From 42ee7d7608388fa63cdf90be4fd08d7996d6d70f Mon Sep 17 00:00:00 2001 From: litagin02 Date: Mon, 11 Mar 2024 09:27:36 +0900 Subject: [PATCH] Fix: ensure encoding utf-8 --- initialize.py | 2 +- style_bert_vits2/models/hyper_parameters.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/initialize.py b/initialize.py index 927a91a..3736151 100644 --- a/initialize.py +++ b/initialize.py @@ -9,7 +9,7 @@ from style_bert_vits2.logging import logger def download_bert_models(): - with open("bert/bert_models.json", "r") as fp: + with open("bert/bert_models.json", "r", encoding="utf-8") as fp: models = json.load(fp) for k, v in models.items(): local_path = Path("bert").joinpath(k) diff --git a/style_bert_vits2/models/hyper_parameters.py b/style_bert_vits2/models/hyper_parameters.py index 53dc7f3..30c579e 100644 --- a/style_bert_vits2/models/hyper_parameters.py +++ b/style_bert_vits2/models/hyper_parameters.py @@ -53,11 +53,11 @@ class HyperParametersData(BaseModel): n_speakers: int = 512 cleaned_text: bool = True spk2id: dict[str, int] = { - "Dummy": 0, + "Dummy": 0, } num_styles: int = 1 style2id: dict[str, int] = { - "Neutral": 0, + "Neutral": 0, } @@ -68,6 +68,7 @@ class HyperParametersModelSLM(BaseModel): nlayers: int = 13 initial_channel: int = 64 + class HyperParametersModel(BaseModel): use_spk_conditioned_encoder: bool = True use_noise_scaled_mas: bool = True @@ -98,7 +99,7 @@ class HyperParametersModel(BaseModel): class HyperParameters(BaseModel): - model_name: str = 'Dummy' + model_name: str = "Dummy" version: str = "2.0-JP-Extra" train: HyperParametersTrain = HyperParametersTrain() data: HyperParametersData = HyperParametersData() @@ -112,7 +113,6 @@ class HyperParameters(BaseModel): # model_ 以下を Pydantic の保護対象から除外する model_config = ConfigDict(protected_namespaces=()) - @staticmethod def load_from_json(json_path: Union[str, Path]) -> "HyperParameters": """ @@ -125,5 +125,5 @@ class HyperParameters(BaseModel): HyperParameters: ハイパーパラメータ """ - with open(json_path, "r") as f: + with open(json_path, "r", encoding="utf-8") as f: return HyperParameters.model_validate_json(f.read())