w-okada · Naferien · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023
diff --git a/.gitignore b/.gitignore
@@ -43,12 +43,15 @@ docker/cudnn/
 server/pretrain/
 server/weights/
 server/model_dir/
+server/model_dir2/
 server/weights_/
 server/weights__/
 server/models/
 server/samples.json
 server/samples_0003_t.json
 server/samples_0003_o.json
+server/samples_0003_o2.json
+server/samples_0003_t2.json
 
 server/test_official_v1_v2.json
 server/test_ddpn_v1_v2.json

diff --git a/client/demo/dist/index.html b/client/demo/dist/index.html
@@ -1 +1,10 @@
-<!doctype html><html style="width:100%;height:100%;overflow:hidden"><head><meta charset="utf-8"/><title>Voice Changer Client Demo</title><script defer="defer" src="index.js"></script></head><body style="width:100%;height:100%;margin:0"><div id="app" style="width:100%;height:100%"></div></body></html>
+<!DOCTYPE html>
+<html style="width: 100%; height: 100%; overflow: hidden">
+    <head>
+        <meta charset="utf-8" />
+        <title>Voice Changer Client Demo</title>
+    <script defer src="index.js"></script></head>
+    <body style="width: 100%; height: 100%; margin: 0px">
+        <div id="app" style="width: 100%; height: 100%"></div>
+    </body>
+</html>
diff --git a/client/demo/dist/index.js b/client/demo/dist/index.js
diff --git a/client/demo/dist/index.js.LICENSE.txt b/client/demo/dist/index.js.LICENSE.txt
diff --git a/client/demo/src/001_globalHooks/010_useMessageBuilder.ts b/client/demo/src/001_globalHooks/010_useMessageBuilder.ts
@@ -27,7 +27,6 @@ export const useMessageBuilder_old = (): MessageBuilderStateAndMethod => {
             lang = "en"
         }
 
-        console.log(messagesRef.current)
         return messagesRef.current.find(x => { return x.file == file && x.id == id })?.message[lang] || "unknwon message"
     }
     return {

diff --git a/client/demo/src/components/demo/904_ModelSlotManagerDialog.tsx b/client/demo/src/components/demo/904_ModelSlotManagerDialog.tsx
@@ -39,7 +39,7 @@ export const ModelSlotManagerDialog = () => {
         if (mode != "localFile") {
             return <></>
         }
-        if (!serverSetting.serverSetting.modelSlots) {
+        if (!serverSetting.serverSetting.slotInfos) {
             return <></>
         }
 
@@ -114,7 +114,7 @@ export const ModelSlotManagerDialog = () => {
         }
 
 
-        const slots = serverSetting.serverSetting.modelSlots.map((x, index) => {
+        const slots = serverSetting.serverSetting.slotInfos.map((x, index) => {
             let modelFileName = ""
             if (uploadData?.slot == index) {
                 modelFileName = (uploadData.model?.name || "").replace(/^.*[\\\/]/, '')
@@ -248,7 +248,7 @@ export const ModelSlotManagerDialog = () => {
 
     }, [
         mode,
-        serverSetting.serverSetting.modelSlots,
+        serverSetting.serverSetting.slotInfos,
         serverSetting.fileUploadSettings,
         serverSetting.uploadProgress,
         serverSetting.setFileUploadSetting,

diff --git a/client/demo/src/components/demo/905_MergeLabDialog.tsx b/client/demo/src/components/demo/905_MergeLabDialog.tsx
@@ -13,19 +13,22 @@ export const MergeLabDialog = () => {
 
     // スロットが変更されたときの初期化処理
     const newSlotChangeKey = useMemo(() => {
-        if (!serverSetting.serverSetting.modelSlots) {
+        if (!serverSetting.serverSetting.slotInfos) {
             return ""
         }
-        return serverSetting.serverSetting.modelSlots.reduce((prev, cur) => {
+        return serverSetting.serverSetting.slotInfos.reduce((prev, cur) => {
             return prev + "_" + cur.modelFile
         }, "")
-    }, [serverSetting.serverSetting.modelSlots])
+    }, [serverSetting.serverSetting.slotInfos])
 
     const filterItems = useMemo(() => {
-        return serverSetting.serverSetting.modelSlots.reduce((prev, cur) => {
+        return serverSetting.serverSetting.slotInfos.reduce((prev, cur) => {
             const key = `${cur.modelType},${cur.samplingRate},${cur.embChannels}`
             const val = { type: cur.modelType, samplingRate: cur.samplingRate, embChannels: cur.embChannels }
             const existKeys = Object.keys(prev)
+            if (cur.voiceChangerType == null) {
+                return prev
+            }
             if (cur.modelFile.length == 0) {
                 return prev
             }
@@ -41,7 +44,7 @@ export const MergeLabDialog = () => {
     }, [newSlotChangeKey])
 
     const models = useMemo(() => {
-        return serverSetting.serverSetting.modelSlots.filter(x => {
+        return serverSetting.serverSetting.slotInfos.filter(x => {
             const filterVals = filterItems[currentFilter]
             if (!filterVals) {
                 return false

diff --git a/client/demo/src/components/demo/components/204_ModelSwitchRow.tsx b/client/demo/src/components/demo/components/204_ModelSwitchRow.tsx
@@ -9,11 +9,11 @@ export const ModelSwitchRow = (_props: ModelSwitchRowProps) => {
     const appState = useAppState()
 
     const modelSwitchRow = useMemo(() => {
-        const slot = appState.serverSetting.serverSetting.modelSlotIndex
+        const slot = appState.serverSetting.serverSetting.slotIndex
         const onSwitchModelClicked = async (slot: number) => {
             // Quick hack for same slot is selected. 下３桁が実際のSlotID
             const dummyModelSlotIndex = (Math.floor(Date.now() / 1000)) * 1000 + slot
-            await appState.serverSetting.updateServerSettings({ ...appState.serverSetting.serverSetting, modelSlotIndex: dummyModelSlotIndex })
+            await appState.serverSetting.updateServerSettings({ ...appState.serverSetting.serverSetting, slotIndex: dummyModelSlotIndex })
             setTimeout(() => { // quick hack
                 appState.getInfo()
             }, 1000 * 2)
@@ -24,7 +24,7 @@ export const ModelSwitchRow = (_props: ModelSwitchRowProps) => {
         }
 
 
-        const modelSlots = appState.serverSetting.serverSetting.modelSlots
+        const modelSlots = appState.serverSetting.serverSetting.slotInfos
         let options: React.JSX.Element[] = []
         if (modelSlots) {
             options = modelSlots.map((x, index) => {

diff --git a/client/demo/src/components/demo/components2/100_ModelSlotArea.tsx b/client/demo/src/components/demo/components2/100_ModelSlotArea.tsx
@@ -18,22 +18,25 @@ export const ModelSlotArea = (_props: ModelSlotAreaProps) => {
 
 
     const modelTiles = useMemo(() => {
-        if (!serverSetting.serverSetting.modelSlots) {
+        if (!serverSetting.serverSetting.slotInfos) {
             return []
         }
-        return serverSetting.serverSetting.modelSlots.map((x, index) => {
+        return serverSetting.serverSetting.slotInfos.map((x, index) => {
+            if (x.voiceChangerType == null) {
+                return null
+            }
             if (x.modelFile.length == 0) {
                 return null
             }
-            const tileContainerClass = index == serverSetting.serverSetting.modelSlotIndex ? "model-slot-tile-container-selected" : "model-slot-tile-container"
+            const tileContainerClass = index == serverSetting.serverSetting.slotIndex ? "model-slot-tile-container-selected" : "model-slot-tile-container"
             const name = x.name.length > 8 ? x.name.substring(0, 7) + "..." : x.name
             const iconElem = x.iconFile.length > 0 ?
                 <img className="model-slot-tile-icon" src={x.iconFile} alt={x.name} /> :
                 <div className="model-slot-tile-icon-no-entry">no image</div>
 
             const clickAction = async () => {
                 const dummyModelSlotIndex = (Math.floor(Date.now() / 1000)) * 1000 + index
-                await serverSetting.updateServerSettings({ ...serverSetting.serverSetting, modelSlotIndex: dummyModelSlotIndex })
+                await serverSetting.updateServerSettings({ ...serverSetting.serverSetting, slotIndex: dummyModelSlotIndex })
                 setTimeout(() => { // quick hack
                     getInfo()
                 }, 1000 * 2)
@@ -50,7 +53,7 @@ export const ModelSlotArea = (_props: ModelSlotAreaProps) => {
                 </div >
             )
         }).filter(x => x != null)
-    }, [serverSetting.serverSetting.modelSlots, serverSetting.serverSetting.modelSlotIndex])
+    }, [serverSetting.serverSetting.slotInfos, serverSetting.serverSetting.slotIndex])
 
 
     const modelSlotArea = useMemo(() => {

diff --git a/client/demo/src/components/demo/components2/101_CharacterArea.tsx b/client/demo/src/components/demo/components2/101_CharacterArea.tsx
@@ -21,11 +21,12 @@ export const CharacterArea = (_props: CharacterAreaProps) => {
     }, [])
 
     const selected = useMemo(() => {
-        if (serverSetting.serverSetting.modelSlotIndex == undefined) {
+        console.log("serverSetting.serverSetting.slotInfos::", serverSetting.serverSetting.slotIndex, serverSetting.serverSetting.slotInfos)
+        if (serverSetting.serverSetting.slotIndex == undefined) {
             return
         }
-        return serverSetting.serverSetting.modelSlots[serverSetting.serverSetting.modelSlotIndex]
-    }, [serverSetting.serverSetting.modelSlotIndex, serverSetting.serverSetting.modelSlots])
+        return serverSetting.serverSetting.slotInfos[serverSetting.serverSetting.slotIndex]
+    }, [serverSetting.serverSetting.slotIndex, serverSetting.serverSetting.slotInfos])
 
 
     useEffect(() => {

diff --git a/client/demo/src/hooks/useMessageBuilder.ts b/client/demo/src/hooks/useMessageBuilder.ts
@@ -27,7 +27,6 @@ export const useMessageBuilder = (): MessageBuilderStateAndMethod => {
             lang = "en"
         }
 
-        console.log(messagesRef.current)
         return messagesRef.current.find(x => { return x.file == file && x.id == id })?.message[lang] || "unknwon message"
     }
     return {

diff --git a/client/lib/src/ServerConfigurator.ts b/client/lib/src/ServerConfigurator.ts
@@ -1,4 +1,4 @@
-import { ClientType, MergeModelRequest, OnnxExporterInfo, ServerInfo, ServerSettingKey } from "./const";
+import { ClientType, MergeModelRequest, OnnxExporterInfo, ServerInfo, ServerSettingKey, VoiceChangerType } from "./const";
 
 
 type FileChunk = {
@@ -166,16 +166,12 @@ export class ServerConfigurator {
         })
     }
 
-    loadModel = async (slot: number, isHalf: boolean, params: string = "{}") => {
-        if (isHalf == undefined || isHalf == null) {
-            console.warn("isHalf is invalid value", isHalf)
-            isHalf = false
-        }
+    loadModel = async (slot: number, voiceChangerType: VoiceChangerType, params: string = "{}") => {
         const url = this.serverUrl + "/load_model"
         const info = new Promise<ServerInfo>(async (resolve) => {
             const formData = new FormData();
             formData.append("slot", "" + slot);
-            formData.append("isHalf", "" + isHalf);
+            formData.append("voiceChangerType", voiceChangerType);
             formData.append("params", params);
 
             const request = new Request(url, {

diff --git a/client/lib/src/VoiceChangerClient.ts b/client/lib/src/VoiceChangerClient.ts
@@ -3,7 +3,7 @@ import { VoiceChangerWorkletNode, VoiceChangerWorkletListener } from "./VoiceCha
 import workerjs from "raw-loader!../worklet/dist/index.js";
 import { VoiceFocusDeviceTransformer, VoiceFocusTransformDevice } from "amazon-chime-sdk-js";
 import { createDummyMediaStream, validateUrl } from "./util";
-import { ClientType, DefaultVoiceChangerClientSetting, MergeModelRequest, ServerSettingKey, VoiceChangerClientSetting, WorkletNodeSetting, WorkletSetting } from "./const";
+import { ClientType, DefaultVoiceChangerClientSetting, MergeModelRequest, ServerSettingKey, VoiceChangerClientSetting, VoiceChangerType, WorkletNodeSetting, WorkletSetting } from "./const";
 import { ServerConfigurator } from "./ServerConfigurator";
 
 // オーディオデータの流れ
@@ -298,10 +298,10 @@ export class VoiceChangerClient {
     }
     loadModel = (
         slot: number,
-        isHalf: boolean,
+        voiceChangerType: VoiceChangerType,
         params: string,
     ) => {
-        return this.configurator.loadModel(slot, isHalf, params)
+        return this.configurator.loadModel(slot, voiceChangerType, params)
     }
     uploadAssets = (params: string) => {
         return this.configurator.uploadAssets(params)

diff --git a/client/lib/src/const.ts b/client/lib/src/const.ts
@@ -16,6 +16,16 @@ export const ClientType = {
 } as const
 export type ClientType = typeof ClientType[keyof typeof ClientType]
 
+export const VoiceChangerType = {
+    "MMVCv15": "MMVCv15",
+    "MMVCv13": "MMVCv13",
+    "so-vits-svc-40": "so-vits-svc-40",
+    "DDSP-SVC": "DDSP-SVC",
+    "RVC": "RVC"
+} as const
+export type VoiceChangerType = typeof VoiceChangerType[keyof typeof VoiceChangerType]
+
+
 ///////////////////////
 // サーバセッティング
 ///////////////////////
@@ -122,7 +132,8 @@ export const ServerSettingKey = {
     "rvcQuality": "rvcQuality",
     "modelSamplingRate": "modelSamplingRate",
     "silenceFront": "silenceFront",
-    "modelSlotIndex": "modelSlotIndex",
+    // "modelSlotIndex": "modelSlotIndex",
+    "slotIndex": "slotIndex",
 
     "useEnhancer": "useEnhancer",
     "useDiff": "useDiff",
@@ -181,7 +192,8 @@ export type VoiceChangerServerSetting = {
     rvcQuality: number // 0:low, 1:high
     silenceFront: number // 0:off, 1:on
     modelSamplingRate: ModelSamplingRate // 32000,40000,48000
-    modelSlotIndex: number,
+    // modelSlotIndex: number,
+    slotIndex: number,
 
     useEnhancer: number// DDSP-SVC
     useDiff: number// DDSP-SVC
@@ -197,7 +209,31 @@ export type VoiceChangerServerSetting = {
     enableDirectML: number
 }
 
-type ModelSlot = {
+// type ModelSlot = {
+//     modelFile: string
+//     featureFile: string,
+//     indexFile: string,
+
+//     defaultTune: number,
+//     defaultIndexRatio: number,
+//     defaultProtect: number,
+
+//     modelType: ModelType,
+//     embChannels: number,
+//     f0: boolean,
+//     samplingRate: number
+//     deprecated: boolean
+
+
+//     name: string,
+//     description: string,
+//     credit: string,
+//     termsOfUseUrl: string,
+//     iconFile: string
+// }
+
+type SlotInfo = {
+    voiceChangerType: VoiceChangerType | null
     modelFile: string
     featureFile: string,
     indexFile: string,
@@ -233,7 +269,8 @@ export type ServerInfo = VoiceChangerServerSetting & {
     pyTorchModelFile: string,
     onnxModelFile: string,
     onnxExecutionProviders: OnnxExecutionProvider[]
-    modelSlots: ModelSlot[]
+    // modelSlots: ModelSlot[]
+    slotInfos: SlotInfo[]
     serverAudioInputDevices: ServerAudioDevice[]
     serverAudioOutputDevices: ServerAudioDevice[]
     sampleModels: RVCSampleModel[]
@@ -311,7 +348,8 @@ export const DefaultServerSetting: ServerInfo = {
     rvcQuality: 0,
     modelSamplingRate: 48000,
     silenceFront: 1,
-    modelSlotIndex: 0,
+    // modelSlotIndex: 0,
+    slotIndex: 0,
     sampleModels: [],
     gpus: [],
 
@@ -331,7 +369,8 @@ export const DefaultServerSetting: ServerInfo = {
     pyTorchModelFile: "",
     onnxModelFile: "",
     onnxExecutionProviders: [],
-    modelSlots: [],
+    // modelSlots: [],
+    slotInfos: [],
     serverAudioInputDevices: [],
     serverAudioOutputDevices: []
 }