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

WIP:common sample/check all vcs

Browse Source
This commit is contained in:
wataru 2023-06-17 15:35:43 +09:00
parent 9dd2808509
commit db322756f6
9 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -251,7 +251,8 @@ export const useServerSetting = (props: UseServerSettingProps): ServerSettingSta
const _uploadFile2 = useMemo(() => { const _uploadFile2 = useMemo(() => {
return async (file: File, onprogress: (progress: number, end: boolean) => void, dir: string = "") => { return async (file: File, onprogress: (progress: number, end: boolean) => void, dir: string = "") => {
if (!props.voiceChangerClient) return if (!props.voiceChangerClient) return
console.log("uploading...", file.name) console.log("uploading..1.", file)
console.log("uploading..2.", file.name)
const num = await props.voiceChangerClient.uploadFile2(file, onprogress) const num = await props.voiceChangerClient.uploadFile2(file, onprogress)
const res = await props.voiceChangerClient.concatUploadedFile(dir + file.name, num) const res = await props.voiceChangerClient.concatUploadedFile(dir + file.name, num)
console.log("uploaded", num, res) console.log("uploaded", num, res)
@ -262,6 +263,8 @@ export const useServerSetting = (props: UseServerSettingProps): ServerSettingSta
const loadModel = useMemo(() => { const loadModel = useMemo(() => {
return async (slot: number) => { return async (slot: number) => {
const fileUploadSetting = fileUploadSettings[slot] const fileUploadSetting = fileUploadSettings[slot]
console.log("[loadModel]", fileUploadSetting)
console.log("[loadModel] model:", props.clientType)
if (fileUploadSetting.isSampleMode == false) { if (fileUploadSetting.isSampleMode == false) {
if (props.clientType == "MMVCv13") { if (props.clientType == "MMVCv13") {
@ -337,6 +340,7 @@ export const useServerSetting = (props: UseServerSettingProps): ServerSettingSta
fileUploadSetting.soVitsSvc40v2Cluster, fileUploadSetting.soVitsSvc40v2Cluster,
].filter(x => { return x != null }) as ModelData[] ].filter(x => { return x != null }) as ModelData[]
console.log("[SENDING FILE]", normalModels)
for (let i = 0; i < normalModels.length; i++) { for (let i = 0; i < normalModels.length; i++) {
if (!normalModels[i].data) { if (!normalModels[i].data) {
// const fileSize = normalModels[i].file!.size / 1024 / 1024 // const fileSize = normalModels[i].file!.size / 1024 / 1024
@ -348,12 +352,12 @@ export const useServerSetting = (props: UseServerSettingProps): ServerSettingSta
for (let i = 0; i < normalModels.length; i++) { for (let i = 0; i < normalModels.length; i++) {
const progRate = 1 / normalModels.length const progRate = 1 / normalModels.length
const progOffset = 100 * i * progRate const progOffset = 100 * i * progRate
// await _uploadFile(normalModels[i], (progress: number, _end: boolean) => { await _uploadFile(normalModels[i], (progress: number, _end: boolean) => {
// setUploadProgress(progress * progRate + progOffset)
// })
await _uploadFile2(normalModels[i].file!, (progress: number, _end: boolean) => {
setUploadProgress(progress * progRate + progOffset) setUploadProgress(progress * progRate + progOffset)
}) })
// await _uploadFile2(normalModels[i].file!, (progress: number, _end: boolean) => {
// setUploadProgress(progress * progRate + progOffset)
// })
} }
} }
@ -407,24 +411,21 @@ export const useServerSetting = (props: UseServerSettingProps): ServerSettingSta
sampleId: fileUploadSetting.isSampleMode ? fileUploadSetting.sampleId || "" : "", sampleId: fileUploadSetting.isSampleMode ? fileUploadSetting.sampleId || "" : "",
rvcIndexDownload: fileUploadSetting.rvcIndexDownload || false, rvcIndexDownload: fileUploadSetting.rvcIndexDownload || false,
files: fileUploadSetting.isSampleMode ? {} : { files: fileUploadSetting.isSampleMode ? {} : {
mmvcv13Config: fileUploadSetting.mmvcv13Config?.filename || "", mmvcv13Config: props.clientType == "MMVCv13" ? fileUploadSetting.mmvcv13Config?.filename || "" : "",
mmvcv13Model: fileUploadSetting.mmvcv13Model?.filename || "", mmvcv13Model: props.clientType == "MMVCv13" ? fileUploadSetting.mmvcv13Model?.filename || "" : "",
mmvcv15Config: fileUploadSetting.mmvcv15Config?.filename || "", mmvcv15Config: props.clientType == "MMVCv15" ? fileUploadSetting.mmvcv15Config?.filename || "" : "",
mmvcv15Model: fileUploadSetting.mmvcv15Model?.filename || "", mmvcv15Model: props.clientType == "MMVCv15" ? fileUploadSetting.mmvcv15Model?.filename || "" : "",
soVitsSvc40Config: fileUploadSetting.soVitsSvc40Config?.filename || "", soVitsSvc40Config: props.clientType == "so-vits-svc-40" ? fileUploadSetting.soVitsSvc40Config?.filename || "" : "",
soVitsSvc40Model: fileUploadSetting.soVitsSvc40Model?.filename || "", soVitsSvc40Model: props.clientType == "so-vits-svc-40" ? fileUploadSetting.soVitsSvc40Model?.filename || "" : "",
soVitsSvc40Cluster: fileUploadSetting.soVitsSvc40Cluster?.filename || "", soVitsSvc40Cluster: props.clientType == "so-vits-svc-40" ? fileUploadSetting.soVitsSvc40Cluster?.filename || "" : "",
soVitsSvc40v2Config: fileUploadSetting.soVitsSvc40v2Config?.filename || "", rvcModel: props.clientType == "RVC" ? fileUploadSetting.rvcModel?.filename || "" : "",
soVitsSvc40v2Model: fileUploadSetting.soVitsSvc40v2Model?.filename || "", rvcIndex: props.clientType == "RVC" ? fileUploadSetting.rvcIndex?.filename || "" : "",
soVitsSvc40v2Cluster: fileUploadSetting.soVitsSvc40v2Cluster?.filename || "", rvcFeature: props.clientType == "RVC" ? fileUploadSetting.rvcFeature?.filename || "" : "",
rvcModel: fileUploadSetting.rvcModel?.filename || "",
rvcIndex: fileUploadSetting.rvcIndex?.filename || "",
rvcFeature: fileUploadSetting.rvcFeature?.filename || "",
ddspSvcModel: fileUploadSetting.ddspSvcModel?.filename ? "ddsp_mod/" + fileUploadSetting.ddspSvcModel?.filename : "", ddspSvcModel: props.clientType == "DDSP-SVC" ? fileUploadSetting.ddspSvcModel?.filename ? "ddsp_mod/" + fileUploadSetting.ddspSvcModel?.filename : "" : "",
ddspSvcModelConfig: fileUploadSetting.ddspSvcModelConfig?.filename ? "ddsp_mod/" + fileUploadSetting.ddspSvcModelConfig?.filename : "", ddspSvcModelConfig: props.clientType == "DDSP-SVC" ? fileUploadSetting.ddspSvcModelConfig?.filename ? "ddsp_mod/" + fileUploadSetting.ddspSvcModelConfig?.filename : "" : "",
ddspSvcDiffusion: fileUploadSetting.ddspSvcDiffusion?.filename ? "ddsp_diff/" + fileUploadSetting.ddspSvcDiffusion?.filename : "", ddspSvcDiffusion: props.clientType == "DDSP-SVC" ? fileUploadSetting.ddspSvcDiffusion?.filename ? "ddsp_diff/" + fileUploadSetting.ddspSvcDiffusion?.filename : "" : "",
ddspSvcDiffusionConfig: fileUploadSetting.ddspSvcDiffusionConfig?.filename ? "ddsp_diff/" + fileUploadSetting.ddspSvcDiffusionConfig.filename : "", ddspSvcDiffusionConfig: props.clientType == "DDSP-SVC" ? fileUploadSetting.ddspSvcDiffusionConfig?.filename ? "ddsp_diff/" + fileUploadSetting.ddspSvcDiffusionConfig.filename : "" : "",
} }
}) })

4
server/MMVCServerSIO.py
View File

@ -7,8 +7,8 @@ import platform
import os import os
import argparse import argparse
from Exceptions import WeightDownladException from Exceptions import WeightDownladException
from utils.downloader.SampleDownloader import downloadInitialSamples from downloader.SampleDownloader import downloadInitialSamples
from utils.downloader.WeightDownloader import downloadWeight from downloader.WeightDownloader import downloadWeight
from voice_changer.utils.VoiceChangerParams import VoiceChangerParams from voice_changer.utils.VoiceChangerParams import VoiceChangerParams

0
server/utils/downloader/Downloader.py → server/downloader/Downloader.py
View File

2
server/utils/downloader/SampleDownloader.py → server/downloader/SampleDownloader.py
View File

@ -8,7 +8,7 @@ from data.ModelSample import ModelSamples, generateModelSample
from data.ModelSlot import RVCModelSlot from data.ModelSlot import RVCModelSlot
from voice_changer.ModelSlotManager import ModelSlotManager from voice_changer.ModelSlotManager import ModelSlotManager
from voice_changer.RVC.ModelSlotGenerator import _setInfoByONNX, _setInfoByPytorch from voice_changer.RVC.ModelSlotGenerator import _setInfoByONNX, _setInfoByPytorch
from utils.downloader.Downloader import download, download_no_tqdm from downloader.Downloader import download, download_no_tqdm
def downloadInitialSamples(mode: RVCSampleMode, model_dir: str): def downloadInitialSamples(mode: RVCSampleMode, model_dir: str):

2
server/utils/downloader/WeightDownloader.py → server/downloader/WeightDownloader.py
View File

@ -1,7 +1,7 @@
import os import os
from concurrent.futures import ThreadPoolExecutor from concurrent.futures import ThreadPoolExecutor
from utils.downloader.Downloader import download from downloader.Downloader import download
from voice_changer.utils.VoiceChangerParams import VoiceChangerParams from voice_changer.utils.VoiceChangerParams import VoiceChangerParams
from Exceptions import WeightDownladException from Exceptions import WeightDownladException

2
server/restapi/MMVC_Rest_Fileuploader.py
View File

@ -87,7 +87,7 @@ class MMVC_Rest_Fileuploader:
): ):
try: try:
paramDict = json.loads(params) paramDict = json.loads(params)
# print("paramDict", paramDict) print("paramDict", paramDict)
# Change Filepath # Change Filepath
newFilesDict = {} newFilesDict = {}

2
server/voice_changer/VoiceChanger.py
View File

@ -81,6 +81,7 @@ class VoiceChanger:
print(f"VoiceChanger Initialized (GPU_NUM:{self.gpu_num}, mps_enabled:{self.mps_enabled})") print(f"VoiceChanger Initialized (GPU_NUM:{self.gpu_num}, mps_enabled:{self.mps_enabled})")
def switchModelType(self, modelType: ModelType): def switchModelType(self, modelType: ModelType):
print("Switch Model Type:", modelType)
try: try:
if self.voiceChanger is not None: if self.voiceChanger is not None:
# return {"status": "ERROR", "msg": "vc is already selected. currently re-select is not implemented"} # return {"status": "ERROR", "msg": "vc is already selected. currently re-select is not implemented"}
@ -119,6 +120,7 @@ class VoiceChanger:
except Exception as e: except Exception as e:
print(e) print(e)
print(traceback.format_exc()) print(traceback.format_exc())
print("Switch Model Type:", self.voiceChanger)
return {"status": "OK", "msg": "vc is switched."} return {"status": "OK", "msg": "vc is switched."}
def getModelType(self): def getModelType(self):

2
server/voice_changer/VoiceChangerManager.py
View File

@ -1,5 +1,5 @@
import numpy as np import numpy as np
from utils.downloader.SampleDownloader import downloadSample, getSampleInfos from downloader.SampleDownloader import downloadSample, getSampleInfos
from voice_changer.Local.ServerDevice import ServerDevice, ServerDeviceCallbacks from voice_changer.Local.ServerDevice import ServerDevice, ServerDeviceCallbacks
from voice_changer.ModelSlotManager import ModelSlotManager from voice_changer.ModelSlotManager import ModelSlotManager
from voice_changer.VoiceChanger import VoiceChanger from voice_changer.VoiceChanger import VoiceChanger