From 21f098e8ece501e932aea0815da9e7945e2bc768 Mon Sep 17 00:00:00 2001 From: wataru Date: Sun, 28 May 2023 22:08:10 +0900 Subject: [PATCH] modification --- server/voice_changer/MMVCv15/MMVCv15.py | 4 ++-- .../voice_changer/RVC/pitchExtractor/CrepePitchExtractor.py | 2 +- .../voice_changer/RVC/pitchExtractor/DioPitchExtractor.py | 2 +- .../RVC/pitchExtractor/HarvestPitchExtractor.py | 2 +- server/voice_changer/VoiceChanger.py | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/voice_changer/MMVCv15/MMVCv15.py b/server/voice_changer/MMVCv15/MMVCv15.py index def2c4d0..3e3338f9 100644 --- a/server/voice_changer/MMVCv15/MMVCv15.py +++ b/server/voice_changer/MMVCv15/MMVCv15.py @@ -331,8 +331,8 @@ class MMVCv15: else: audio = self._pyTorch_inference(data) return audio - except onnxruntime.capi.onnxruntime_pybind11_state.InvalidArgument as e: - print(e) + except onnxruntime.capi.onnxruntime_pybind11_state.InvalidArgument as _e: + print(_e) raise ONNXInputArgumentException() def __del__(self): diff --git a/server/voice_changer/RVC/pitchExtractor/CrepePitchExtractor.py b/server/voice_changer/RVC/pitchExtractor/CrepePitchExtractor.py index cd13bcca..5ff672af 100644 --- a/server/voice_changer/RVC/pitchExtractor/CrepePitchExtractor.py +++ b/server/voice_changer/RVC/pitchExtractor/CrepePitchExtractor.py @@ -52,6 +52,6 @@ class CrepePitchExtractor(PitchExtractor): ) + 1 f0_mel[f0_mel <= 1] = 1 f0_mel[f0_mel > 255] = 255 - f0_coarse = np.rint(f0_mel).astype(np.int) + f0_coarse = np.rint(f0_mel).astype(int) return f0_coarse, f0bak diff --git a/server/voice_changer/RVC/pitchExtractor/DioPitchExtractor.py b/server/voice_changer/RVC/pitchExtractor/DioPitchExtractor.py index eafc72be..f7d30207 100644 --- a/server/voice_changer/RVC/pitchExtractor/DioPitchExtractor.py +++ b/server/voice_changer/RVC/pitchExtractor/DioPitchExtractor.py @@ -37,6 +37,6 @@ class DioPitchExtractor(PitchExtractor): ) + 1 f0_mel[f0_mel <= 1] = 1 f0_mel[f0_mel > 255] = 255 - f0_coarse = np.rint(f0_mel).astype(np.int) + f0_coarse = np.rint(f0_mel).astype(int) return f0_coarse, f0bak diff --git a/server/voice_changer/RVC/pitchExtractor/HarvestPitchExtractor.py b/server/voice_changer/RVC/pitchExtractor/HarvestPitchExtractor.py index 4043092f..b54cb699 100644 --- a/server/voice_changer/RVC/pitchExtractor/HarvestPitchExtractor.py +++ b/server/voice_changer/RVC/pitchExtractor/HarvestPitchExtractor.py @@ -38,6 +38,6 @@ class HarvestPitchExtractor(PitchExtractor): ) + 1 f0_mel[f0_mel <= 1] = 1 f0_mel[f0_mel > 255] = 255 - f0_coarse = np.rint(f0_mel).astype(np.int) + f0_coarse = np.rint(f0_mel).astype(int) return f0_coarse, f0bak diff --git a/server/voice_changer/VoiceChanger.py b/server/voice_changer/VoiceChanger.py index 129fb586..31a04f71 100755 --- a/server/voice_changer/VoiceChanger.py +++ b/server/voice_changer/VoiceChanger.py @@ -98,7 +98,7 @@ class VoiceChangerSettings: class VoiceChanger: - settings: VoiceChangerSettings + settings: VoiceChangerSettings = VoiceChangerSettings() voiceChanger: VoiceChangerModel | None = None ioRecorder: IORecorder sola_buffer: AudioInOut @@ -352,7 +352,7 @@ class VoiceChanger: def update_settings(self, key: str, val: Any): if self.voiceChanger is None: print("[Voice Changer] Voice Changer is not selected.") - return + return self.get_info() if key in self.settings.intData: setattr(self.settings, key, int(val)) @@ -567,7 +567,7 @@ class VoiceChanger: print("[Voice Changer] [Exception]", e) return np.zeros(1).astype(np.int16), [0, 0, 0] except ONNXInputArgumentException as e: - print("[Voice Changer] [Exception]", e) + print("[Voice Changer] [Exception] onnx are waiting valid input.", e) return np.zeros(1).astype(np.int16), [0, 0, 0] except HalfPrecisionChangingException as e: print("[Voice Changer] Switching model configuration....", e)