PublicMirrors/voice-changer
1
0
Fork 0
mirror of https://github.com/w-okada/voice-changer.git synced 2025-02-03 00:33:57 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

prepare for characters

Browse Source
This commit is contained in:
wataru 2023-03-24 08:44:06 +09:00
parent 8c7c6994b3
commit 6bcdf53c97
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/lib/src/const.ts
View File

@ -9,7 +9,7 @@ export const ClientType = {
"MMVCv13": "MMVCv13", "MMVCv13": "MMVCv13",
"so_vits_svc_40": "so_vits_svc_40", "so_vits_svc_40": "so_vits_svc_40",
"so_vits_svc_40v2": "so_vits_svc_40v2", "so_vits_svc_40v2": "so_vits_svc_40v2",
"so_vits_svc_40v2_tsukuyomi": "so_vits_svc_40v2_tsukuyomi", "so_vits_svc_40v2_c": "so_vits_svc_40v2_c",
} as const } as const
export type ClientType = typeof ClientType[keyof typeof ClientType] export type ClientType = typeof ClientType[keyof typeof ClientType]

2
client/lib/src/hooks/useServerSetting.ts
View File

@ -54,7 +54,7 @@ export const useServerSetting = (props: UseServerSettingProps): ServerSettingSta
return DefaultServerSetting_MMVCv15 return DefaultServerSetting_MMVCv15
} else if (props.clientType == "so_vits_svc_40") { } else if (props.clientType == "so_vits_svc_40") {
return DefaultServerSetting_so_vits_svc_40 return DefaultServerSetting_so_vits_svc_40
} else if (props.clientType == "so_vits_svc_40v2" || props.clientType == "so_vits_svc_40v2_tsukuyomi") { } else if (props.clientType == "so_vits_svc_40v2" || props.clientType == "so_vits_svc_40v2_c") {
return DefaultServerSetting_so_vits_svc_40v2 return DefaultServerSetting_so_vits_svc_40v2
} else { } else {
return DefaultServerSetting_MMVCv15 return DefaultServerSetting_MMVCv15

2
client/lib/src/hooks/useWorkletNodeSetting.ts
View File

@ -26,7 +26,7 @@ export const useWorkletNodeSetting = (props: UseWorkletNodeSettingProps): Workle
return DefaultWorkletNodeSetting return DefaultWorkletNodeSetting
} else if (props.clientType == "so_vits_svc_40") { } else if (props.clientType == "so_vits_svc_40") {
return DefaultWorkletNodeSetting_so_vits_svc_40 return DefaultWorkletNodeSetting_so_vits_svc_40
} else if (props.clientType == "so_vits_svc_40v2" || props.clientType == "so_vits_svc_40v2_tsukuyomi") { } else if (props.clientType == "so_vits_svc_40v2" || props.clientType == "so_vits_svc_40v2_c") {
return DefaultWorkletNodeSetting_so_vits_svc_40v2 return DefaultWorkletNodeSetting_so_vits_svc_40v2
} else { } else {
return DefaultWorkletNodeSetting return DefaultWorkletNodeSetting

11
server/const.py
View File

@ -40,8 +40,13 @@ def getFrontendPath():
frontend_path = os.path.join(sys._MEIPASS, "dist_so-vits-svc_40") if hasattr(sys, "_MEIPASS") else "../client/demo_so-vits-svc_40/dist" frontend_path = os.path.join(sys._MEIPASS, "dist_so-vits-svc_40") if hasattr(sys, "_MEIPASS") else "../client/demo_so-vits-svc_40/dist"
elif modelType == "so-vits-svc-40v2": elif modelType == "so-vits-svc-40v2":
frontend_path = os.path.join(sys._MEIPASS, "dist_so-vits-svc_40v2") if hasattr(sys, "_MEIPASS") else "../client/demo_so-vits-svc_40v2/dist" frontend_path = os.path.join(sys._MEIPASS, "dist_so-vits-svc_40v2") if hasattr(sys, "_MEIPASS") else "../client/demo_so-vits-svc_40v2/dist"
elif modelType == "DDSP-SVC":
frontend_path = os.path.join(sys._MEIPASS, "dist_DDSP-SVC") if hasattr(sys, "_MEIPASS") else "../client/demo_DDSP-SVC/dist"
elif modelType == "so-vits-svc-40v2_tsukuyomi": # elif modelType == "so-vits-svc-40v2_tsukuyomi":
frontend_path = os.path.join(sys._MEIPASS, "dist_so-vits-svc_40v2_tsukuyomi") if hasattr(sys, "_MEIPASS") \ # frontend_path = os.path.join(sys._MEIPASS, "dist_so-vits-svc_40v2_tsukuyomi") if hasattr(sys, "_MEIPASS") \
else "../client/demo_so-vits-svc_40v2_tsukuyomi/dist" # else "../client/demo_so-vits-svc_40v2_tsukuyomi/dist"
elif modelType == "so-vits-svc-40v2_c":
frontend_path = os.path.join(sys._MEIPASS, "dist_so-vits-svc_40v2_c") if hasattr(sys, "_MEIPASS") \
else "../client/demo_so-vits-svc_40v2_c/dist"
return frontend_path return frontend_path

7
server/voice_changer/VoiceChanger.py
View File

@ -55,12 +55,15 @@ class VoiceChanger():
elif self.modelType == "MMVCv13": elif self.modelType == "MMVCv13":
from voice_changer.MMVCv13.MMVCv13 import MMVCv13 from voice_changer.MMVCv13.MMVCv13 import MMVCv13
self.voiceChanger = MMVCv13() self.voiceChanger = MMVCv13()
elif self.modelType == "so-vits-svc-40v2" or self.modelType == "so-vits-svc-40v2_tsukuyomi": elif self.modelType == "so-vits-svc-40v2" or self.modelType == "so-vits-svc-40v2_c":
from voice_changer.SoVitsSvc40v2.SoVitsSvc40v2 import SoVitsSvc40v2 from voice_changer.SoVitsSvc40v2.SoVitsSvc40v2 import SoVitsSvc40v2
self.voiceChanger = SoVitsSvc40v2(params) self.voiceChanger = SoVitsSvc40v2(params)
elif self.modelType == "so-vits-svc-40": elif self.modelType == "so-vits-svc-40":
from voice_changer.SoVitsSvc40.SoVitsSvc40 import SoVitsSvc40 from voice_changer.SoVitsSvc40.SoVitsSvc40 import SoVitsSvc40
self.voiceChanger = SoVitsSvc40(params) self.voiceChanger = SoVitsSvc40(params)
elif self.modelType == "DDSP-SVC":
from voice_changer.DDSP_SVC.DDSP_SVC import DDSP_SVC
self.voiceChanger = DDSP_SVC(params)
else: else:
from voice_changer.MMVCv13.MMVCv13 import MMVCv13 from voice_changer.MMVCv13.MMVCv13 import MMVCv13
@ -75,7 +78,7 @@ class VoiceChanger():
def loadModel(self, config: str, pyTorch_model_file: str = None, onnx_model_file: str = None, clusterTorchModel: str = None): def loadModel(self, config: str, pyTorch_model_file: str = None, onnx_model_file: str = None, clusterTorchModel: str = None):
if self.modelType == "MMVCv15" or self.modelType == "MMVCv13": if self.modelType == "MMVCv15" or self.modelType == "MMVCv13":
return self.voiceChanger.loadModel(config, pyTorch_model_file, onnx_model_file) return self.voiceChanger.loadModel(config, pyTorch_model_file, onnx_model_file)
elif self.modelType == "so-vits-svc-40" or self.modelType == "so-vits-svc-40v2" or self.modelType == "so-vits-svc-40v2_tsukuyomi": elif self.modelType == "so-vits-svc-40" or self.modelType == "so-vits-svc-40v2" or self.modelType == "so-vits-svc-40v2_c":
return self.voiceChanger.loadModel(config, pyTorch_model_file, onnx_model_file, clusterTorchModel) return self.voiceChanger.loadModel(config, pyTorch_model_file, onnx_model_file, clusterTorchModel)
else: else:
return self.voiceChanger.loadModel(config, pyTorch_model_file, onnx_model_file, clusterTorchModel) return self.voiceChanger.loadModel(config, pyTorch_model_file, onnx_model_file, clusterTorchModel)