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

WIP:

Browse Source
This commit is contained in:
wataru 2023-04-06 04:27:46 +09:00
parent eaa0c58243
commit 28782c051a
7 changed files with 2680 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/demo_v13/dist/assets/gui_settings/RVC.json vendored
View File

@ -18,7 +18,7 @@
"showPyTorchDefault": true,
"frameworkEnable": true,
"modelUploaderEnable": true,
"configRow": true,
"configRow": false,
"uploadRow": true
},
"deviceSetting": {},
@ -57,10 +57,10 @@
"dialogs": {
"license": [
{
"title": "c",
"auther": "c",
"contact": "b",
"url": "a",
"title": "Retrieval-based-Voice-Conversion-WebUI",
"auther": "liujing04",
"contact": "",
"url": "https://github.com/liujing04/Retrieval-based-Voice-Conversion-WebUI",
"license": "MIT"
}
]

2
client/demo_v13/dist/index.js vendored
View File

File diff suppressed because one or more lines are too long

2656
client/demo_v13/dist/index.js.LICENSE.txt vendored
View File

File diff suppressed because it is too large Load Diff

10
client/demo_v13/public/assets/gui_settings/RVC.json
View File

@ -18,7 +18,7 @@
"showPyTorchDefault": true,
"frameworkEnable": true,
"modelUploaderEnable": true,
"configRow": true,
"configRow": false,
"uploadRow": true
},
"deviceSetting": {},
@ -57,10 +57,10 @@
"dialogs": {
"license": [
{
"title": "c",
"auther": "c",
"contact": "b",
"url": "a",
"title": "Retrieval-based-Voice-Conversion-WebUI",
"auther": "liujing04",
"contact": "",
"url": "https://github.com/liujing04/Retrieval-based-Voice-Conversion-WebUI",
"license": "MIT"
}
]

4
client/lib/package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "@dannadori/voice-changer-client-js",
"version": "1.0.102",
"version": "1.0.103",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@dannadori/voice-changer-client-js",
"version": "1.0.102",
"version": "1.0.103",
"license": "ISC",
"dependencies": {
"@types/readable-stream": "^2.3.15",

2
client/lib/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@dannadori/voice-changer-client-js",
"version": "1.0.102",
"version": "1.0.103",
"description": "",
"main": "dist/index.js",
"directories": {

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

@ -152,7 +152,7 @@ export const useServerSetting = (props: UseServerSettingProps): ServerSettingSta
alert("PyTorchモデルとONNXモデルのどちらか一つ以上指定する必要があります。")
return
}
if (!fileUploadSetting.configFile) {
if (!fileUploadSetting.configFile && props.clientType != "RVC") {
alert("Configファイルを指定する必要があります。")
return
}
@ -175,7 +175,7 @@ export const useServerSetting = (props: UseServerSettingProps): ServerSettingSta
fileUploadSetting.pyTorchModel.data = await fileUploadSetting.pyTorchModel.file!.arrayBuffer()
fileUploadSetting.pyTorchModel.filename = await fileUploadSetting.pyTorchModel.file!.name
}
if (!fileUploadSetting.configFile.data) {
if (fileUploadSetting.configFile && !fileUploadSetting.configFile.data) {
fileUploadSetting.configFile.data = await fileUploadSetting.configFile.file!.arrayBuffer()
fileUploadSetting.configFile.filename = await fileUploadSetting.configFile.file!.name
}
@ -201,19 +201,22 @@ export const useServerSetting = (props: UseServerSettingProps): ServerSettingSta
})
}
await _uploadFile(fileUploadSetting.configFile, (progress: number, end: boolean) => {
console.log(progress, end)
})
if (fileUploadSetting.configFile) {
await _uploadFile(fileUploadSetting.configFile, (progress: number, end: boolean) => {
console.log(progress, end)
})
}
// !! 注意!! hubertTorchModelは固定値で上書きされるため、設定しても効果ない。
const loadPromise = props.voiceChangerClient.loadModel(fileUploadSetting.configFile.filename!, fileUploadSetting.pyTorchModel?.filename || null, fileUploadSetting.onnxModel?.filename || null, fileUploadSetting.clusterTorchModel?.filename || null, fileUploadSetting.hubertTorchModel?.filename || null)
const configFileName = fileUploadSetting.configFile ? fileUploadSetting.configFile.filename || "-" : "-"
const loadPromise = props.voiceChangerClient.loadModel(configFileName, fileUploadSetting.pyTorchModel?.filename || null, fileUploadSetting.onnxModel?.filename || null, fileUploadSetting.clusterTorchModel?.filename || null, fileUploadSetting.hubertTorchModel?.filename || null)
// サーバでロード中にキャッシュにセーブ
try {
const saveData: FileUploadSetting = {
pyTorchModel: fileUploadSetting.pyTorchModel ? { data: fileUploadSetting.pyTorchModel.data, filename: fileUploadSetting.pyTorchModel.filename } : null,
onnxModel: fileUploadSetting.onnxModel ? { data: fileUploadSetting.onnxModel.data, filename: fileUploadSetting.onnxModel.filename } : null,
configFile: { data: fileUploadSetting.configFile.data, filename: fileUploadSetting.configFile.filename },
configFile: fileUploadSetting.configFile ? { data: fileUploadSetting.configFile.data, filename: fileUploadSetting.configFile.filename } : null,
hubertTorchModel: fileUploadSetting.hubertTorchModel ? {
data: fileUploadSetting.hubertTorchModel.data, filename: fileUploadSetting.hubertTorchModel.filename
} : null,