1berry/wokada-voice-changer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP:common sample

Browse Source
This commit is contained in:
wataru 2023-06-16 21:58:46 +09:00
parent 435699d387
commit 0036a779cf
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/demo/dist/index.js vendored
View File

File diff suppressed because one or more lines are too long

3
client/demo/src/components/demo/904_ModelSlotManagerDialog.tsx
View File

@ -165,8 +165,9 @@ export const ModelSlotManagerDialog = () => {
const fileValueClass = (uploadData?.slot == index) ? "model-slot-detail-row-value-edit" : isRegisterd ? "model-slot-detail-row-value-download" : "model-slot-detail-row-value" const fileValueClass = (uploadData?.slot == index) ? "model-slot-detail-row-value-edit" : isRegisterd ? "model-slot-detail-row-value-download" : "model-slot-detail-row-value"
const fileValueAction = (uploadData?.slot == index) ? (_url: string) => { const fileValueAction = (uploadData?.slot == index) ? (_url: string) => {
} : isRegisterd ? (url: string) => { } : isRegisterd ? (url: string) => {
console.log("Download url:::", url)
const link = document.createElement("a") const link = document.createElement("a")
link.href = url link.href = "/" + url
link.download = url.replace(/^.*[\\\/]/, '') link.download = url.replace(/^.*[\\\/]/, '')
link.click() link.click()
} : (_url: string) => { } } : (_url: string) => { }

7
server/voice_changer/RVC/RVC.py
View File

@ -41,7 +41,6 @@ from voice_changer.RVC.pipeline.Pipeline import Pipeline
from Exceptions import DeviceCannotSupportHalfPrecisionException, NoModeLoadedException from Exceptions import DeviceCannotSupportHalfPrecisionException, NoModeLoadedException
from const import ( from const import (
RVC_MODEL_DIRNAME,
UPLOAD_DIR, UPLOAD_DIR,
) )
import shutil import shutil
@ -388,7 +387,7 @@ class RVC:
def update_model_default(self): def update_model_default(self):
print("[Voice Changer] UPDATE MODEL DEFAULT!!") print("[Voice Changer] UPDATE MODEL DEFAULT!!")
slotDir = os.path.join(self.params.model_dir, RVC_MODEL_DIRNAME, str(self.currentSlot)) slotDir = os.path.join(self.params.model_dir, str(self.currentSlot))
params = json.load(open(os.path.join(slotDir, "params.json"), "r", encoding="utf-8")) params = json.load(open(os.path.join(slotDir, "params.json"), "r", encoding="utf-8"))
params["defaultTune"] = self.settings.tran params["defaultTune"] = self.settings.tran
params["defaultIndexRatio"] = self.settings.indexRatio params["defaultIndexRatio"] = self.settings.indexRatio
@ -401,7 +400,7 @@ class RVC:
print("[Voice Changer] UPDATE MODEL INFO", newData) print("[Voice Changer] UPDATE MODEL INFO", newData)
newDataDict = json.loads(newData) newDataDict = json.loads(newData)
try: try:
slotDir = os.path.join(self.params.model_dir, RVC_MODEL_DIRNAME, str(newDataDict["slot"])) slotDir = os.path.join(self.params.model_dir, str(newDataDict["slot"]))
except Exception as e: except Exception as e:
print("Exception::::", e) print("Exception::::", e)
params = json.load(open(os.path.join(slotDir, "params.json"), "r", encoding="utf-8")) params = json.load(open(os.path.join(slotDir, "params.json"), "r", encoding="utf-8"))
@ -413,7 +412,7 @@ class RVC:
print("[Voice Changer] UPLOAD ASSETS", params) print("[Voice Changer] UPLOAD ASSETS", params)
paramsDict = json.loads(params) paramsDict = json.loads(params)
uploadPath = os.path.join(UPLOAD_DIR, paramsDict["file"]) uploadPath = os.path.join(UPLOAD_DIR, paramsDict["file"])
storeDir = os.path.join(self.params.model_dir, RVC_MODEL_DIRNAME, str(paramsDict["slot"])) storeDir = os.path.join(self.params.model_dir, str(paramsDict["slot"]))
storePath = os.path.join( storePath = os.path.join(
storeDir, storeDir,
paramsDict["file"], paramsDict["file"],

12
server/voice_changer/VoiceChangerManager.py
View File

@ -140,16 +140,20 @@ class VoiceChangerManager(ServerDeviceCallbacks):
return self.voiceChanger.export2onnx() return self.voiceChanger.export2onnx()
def merge_models(self, request: str): def merge_models(self, request: str):
return self.voiceChanger.merge_models(request) self.voiceChanger.merge_models(request)
return self.get_info()
def update_model_default(self): def update_model_default(self):
return self.voiceChanger.update_model_default() self.voiceChanger.update_model_default()
return self.get_info()
def update_model_info(self, newData: str): def update_model_info(self, newData: str):
return self.voiceChanger.update_model_info(newData) self.voiceChanger.update_model_info(newData)
return self.get_info()
def upload_model_assets(self, params: str): def upload_model_assets(self, params: str):
return self.voiceChanger.upload_model_assets(params) self.voiceChanger.upload_model_assets(params)
return self.get_info()
def setEmitTo(self, emitTo: Callable[[Any], None]): def setEmitTo(self, emitTo: Callable[[Any], None]):
self.emitToFunc = emitTo self.emitToFunc = emitTo