diff --git a/GPT_SoVITS/inference_webui.py b/GPT_SoVITS/inference_webui.py index a361ed58..e8c8e20f 100644 --- a/GPT_SoVITS/inference_webui.py +++ b/GPT_SoVITS/inference_webui.py @@ -84,10 +84,10 @@ bert_path = os.environ.get("bert_path", "GPT_SoVITS/pretrained_models/chinese-ro infer_ttswebui = os.environ.get("infer_ttswebui", 9872) infer_ttswebui = int(infer_ttswebui) is_share = os.environ.get("is_share", "False") -is_share = eval(is_share) +is_share = is_share.lower() in ("true", "1", "yes") if "_CUDA_VISIBLE_DEVICES" in os.environ: os.environ["CUDA_VISIBLE_DEVICES"] = os.environ["_CUDA_VISIBLE_DEVICES"] -is_half = eval(os.environ.get("is_half", "True")) and torch.cuda.is_available() +is_half = os.environ.get("is_half", "True").lower() in ("true", "1", "yes") and torch.cuda.is_available() # is_half=False punctuation = set(["!", "?", "…", ",", ".", "-", " "]) import gradio as gr diff --git a/api.py b/api.py index cc0896a2..27dc8601 100644 --- a/api.py +++ b/api.py @@ -176,9 +176,9 @@ import subprocess class DefaultRefer: def __init__(self, path, text, language): - self.path = args.default_refer_path - self.text = args.default_refer_text - self.language = args.default_refer_language + self.path = path + self.text = text + self.language = language def is_ready(self) -> bool: return is_full(self.path, self.text, self.language) @@ -1082,11 +1082,11 @@ def handle_change(path, text, language): {"code": 400, "message": '缺少任意一项以下参数: "path", "text", "language"'}, status_code=400 ) - if path != "" or path is not None: + if path != "" and path is not None: default_refer.path = path - if text != "" or text is not None: + if text != "" and text is not None: default_refer.text = text - if language != "" or language is not None: + if language != "" and language is not None: default_refer.language = language logger.info(f"当前默认参考音频路径: {default_refer.path}") diff --git a/api_v2.py b/api_v2.py index 21511db3..d8cf74fc 100644 --- a/api_v2.py +++ b/api_v2.py @@ -481,11 +481,11 @@ async def tts_get_endpoint( ): req = { "text": text, - "text_lang": text_lang.lower(), + "text_lang": text_lang.lower() if text_lang else "", "ref_audio_path": ref_audio_path, "aux_ref_audio_paths": aux_ref_audio_paths, "prompt_text": prompt_text, - "prompt_lang": prompt_lang.lower(), + "prompt_lang": prompt_lang.lower() if prompt_lang else "", "top_k": top_k, "top_p": top_p, "temperature": temperature,