diff --git a/client/lib/src/const.ts b/client/lib/src/const.ts index 02f29430..7ccbe4e1 100644 --- a/client/lib/src/const.ts +++ b/client/lib/src/const.ts @@ -9,7 +9,7 @@ export const ClientType = { "MMVCv13": "MMVCv13", "so_vits_svc_40": "so_vits_svc_40", "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 export type ClientType = typeof ClientType[keyof typeof ClientType] diff --git a/client/lib/src/hooks/useServerSetting.ts b/client/lib/src/hooks/useServerSetting.ts index 3932c2d6..fe541f31 100644 --- a/client/lib/src/hooks/useServerSetting.ts +++ b/client/lib/src/hooks/useServerSetting.ts @@ -54,7 +54,7 @@ export const useServerSetting = (props: UseServerSettingProps): ServerSettingSta return DefaultServerSetting_MMVCv15 } else if (props.clientType == "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 } else { return DefaultServerSetting_MMVCv15 diff --git a/client/lib/src/hooks/useWorkletNodeSetting.ts b/client/lib/src/hooks/useWorkletNodeSetting.ts index f42129e2..176f7f8d 100644 --- a/client/lib/src/hooks/useWorkletNodeSetting.ts +++ b/client/lib/src/hooks/useWorkletNodeSetting.ts @@ -26,7 +26,7 @@ export const useWorkletNodeSetting = (props: UseWorkletNodeSettingProps): Workle return DefaultWorkletNodeSetting } else if (props.clientType == "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 } else { return DefaultWorkletNodeSetting diff --git a/server/const.py b/server/const.py index 59896991..5b7ff560 100644 --- a/server/const.py +++ b/server/const.py @@ -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" 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" + 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": - 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" + # elif modelType == "so-vits-svc-40v2_tsukuyomi": + # 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" + 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 diff --git a/server/voice_changer/VoiceChanger.py b/server/voice_changer/VoiceChanger.py index b24fd789..97bb327a 100755 --- a/server/voice_changer/VoiceChanger.py +++ b/server/voice_changer/VoiceChanger.py @@ -55,12 +55,15 @@ class VoiceChanger(): elif self.modelType == "MMVCv13": from voice_changer.MMVCv13.MMVCv13 import 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 self.voiceChanger = SoVitsSvc40v2(params) elif self.modelType == "so-vits-svc-40": from voice_changer.SoVitsSvc40.SoVitsSvc40 import SoVitsSvc40 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: 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): if self.modelType == "MMVCv15" or self.modelType == "MMVCv13": 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) else: return self.voiceChanger.loadModel(config, pyTorch_model_file, onnx_model_file, clusterTorchModel)