bugfix:export onnx

client/demo/dist/assets/gui_settings/RVC.json

@@ -32,6 +32,10 @@
             {
                 "name": "modelSwitch",
                 "options": {}
+            },
+            {
+                "name": "onnxExport",
+                "options": {}
             }
         ],
         "modelSetting": [
@@ -50,7 +54,6 @@
                     "showHalfPrecision": true,
                     "defaultEnablePyTorch": true,
 
-                    "showOnnxExportButton": true,
                     "showDefaultTune": true
                 }
             },

client/demo/package-lock.json

@@ -9,7 +9,7 @@
             "version": "1.0.0",
             "license": "ISC",
             "dependencies": {
-                "@dannadori/voice-changer-client-js": "^1.0.113",
+                "@dannadori/voice-changer-client-js": "^1.0.114",
                 "@fortawesome/fontawesome-svg-core": "^6.4.0",
                 "@fortawesome/free-brands-svg-icons": "^6.4.0",
                 "@fortawesome/free-regular-svg-icons": "^6.4.0",
@@ -30,7 +30,7 @@
                 "babel-loader": "^9.1.2",
                 "copy-webpack-plugin": "^11.0.0",
                 "css-loader": "^6.7.3",
-                "eslint": "^8.38.0",
+                "eslint": "^8.39.0",
                 "eslint-config-prettier": "^8.8.0",
                 "eslint-plugin-prettier": "^4.2.1",
                 "eslint-plugin-react": "^7.32.2",
@@ -3097,9 +3097,9 @@
             }
         },
         "node_modules/@dannadori/voice-changer-client-js": {
-            "version": "1.0.113",
+            "version": "1.0.114",
-            "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.113.tgz",
+            "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.114.tgz",
-            "integrity": "sha512-UGm1KrgEiPlh/7x+/1I9SRAjUbbVA9XgXDayNQyWRVtFLmcfzpkGwJjIcoTH0t8TLzw17D1HWYtGWLES7+tc+w==",
+            "integrity": "sha512-RAEJSQg/ri4/lQSBo40XS5W5JlXV9rJakGvACin2dY6jCANdpp77hAqxiqZgvIv/gMx8udrN9g8hktov8AyMCg==",
             "dependencies": {
                 "@types/readable-stream": "^2.3.15",
                 "amazon-chime-sdk-js": "^3.13.0",
@@ -3177,9 +3177,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "8.38.0",
+            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz",
-            "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
+            "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==",
             "dev": true,
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5402,15 +5402,15 @@
             }
         },
         "node_modules/eslint": {
-            "version": "8.38.0",
+            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz",
-            "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
+            "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==",
             "dev": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.4.0",
                 "@eslint/eslintrc": "^2.0.2",
-                "@eslint/js": "8.38.0",
+                "@eslint/js": "8.39.0",
                 "@humanwhocodes/config-array": "^0.11.8",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@nodelib/fs.walk": "^1.2.8",
@@ -5420,7 +5420,7 @@
                 "debug": "^4.3.2",
                 "doctrine": "^3.0.0",
                 "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^7.1.1",
+                "eslint-scope": "^7.2.0",
                 "eslint-visitor-keys": "^3.4.0",
                 "espree": "^9.5.1",
                 "esquery": "^1.4.2",
@@ -5545,15 +5545,19 @@
             }
         },
         "node_modules/eslint-scope": {
-            "version": "7.1.1",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+            "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
             "dev": true,
-            "license": "BSD-2-Clause",
             "dependencies": {
                 "esrecurse": "^4.3.0",
                 "estraverse": "^5.2.0"
             },
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
             }
         },
         "node_modules/eslint-visitor-keys": {
@@ -12913,9 +12917,9 @@
             }
         },
         "@dannadori/voice-changer-client-js": {
-            "version": "1.0.113",
+            "version": "1.0.114",
-            "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.113.tgz",
+            "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.114.tgz",
-            "integrity": "sha512-UGm1KrgEiPlh/7x+/1I9SRAjUbbVA9XgXDayNQyWRVtFLmcfzpkGwJjIcoTH0t8TLzw17D1HWYtGWLES7+tc+w==",
+            "integrity": "sha512-RAEJSQg/ri4/lQSBo40XS5W5JlXV9rJakGvACin2dY6jCANdpp77hAqxiqZgvIv/gMx8udrN9g8hktov8AyMCg==",
             "requires": {
                 "@types/readable-stream": "^2.3.15",
                 "amazon-chime-sdk-js": "^3.13.0",
@@ -12966,9 +12970,9 @@
             }
         },
         "@eslint/js": {
-            "version": "8.38.0",
+            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz",
-            "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
+            "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==",
             "dev": true
         },
         "@fortawesome/fontawesome-common-types": {
@@ -14502,15 +14506,15 @@
             "dev": true
         },
         "eslint": {
-            "version": "8.38.0",
+            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz",
-            "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
+            "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==",
             "dev": true,
             "requires": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.4.0",
                 "@eslint/eslintrc": "^2.0.2",
-                "@eslint/js": "8.38.0",
+                "@eslint/js": "8.39.0",
                 "@humanwhocodes/config-array": "^0.11.8",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@nodelib/fs.walk": "^1.2.8",
@@ -14520,7 +14524,7 @@
                 "debug": "^4.3.2",
                 "doctrine": "^3.0.0",
                 "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^7.1.1",
+                "eslint-scope": "^7.2.0",
                 "eslint-visitor-keys": "^3.4.0",
                 "espree": "^9.5.1",
                 "esquery": "^1.4.2",
@@ -14651,7 +14655,9 @@
             }
         },
         "eslint-scope": {
-            "version": "7.1.1",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+            "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
             "dev": true,
             "requires": {
                 "esrecurse": "^4.3.0",

client/demo/package.json

@@ -30,7 +30,7 @@
         "babel-loader": "^9.1.2",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.7.3",
-        "eslint": "^8.38.0",
+        "eslint": "^8.39.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-react": "^7.32.2",
@@ -51,7 +51,7 @@
         "webpack-dev-server": "^4.13.3"
     },
     "dependencies": {
-        "@dannadori/voice-changer-client-js": "^1.0.113",
+        "@dannadori/voice-changer-client-js": "^1.0.114",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",
         "@fortawesome/free-brands-svg-icons": "^6.4.0",
         "@fortawesome/free-regular-svg-icons": "^6.4.0",

client/demo/public/assets/gui_settings/RVC.json

@@ -32,6 +32,10 @@
             {
                 "name": "modelSwitch",
                 "options": {}
+            },
+            {
+                "name": "onnxExport",
+                "options": {}
             }
         ],
         "modelSetting": [
@@ -50,7 +54,6 @@
                     "showHalfPrecision": true,
                     "defaultEnablePyTorch": true,
 
-                    "showOnnxExportButton": true,
                     "showDefaultTune": true
                 }
             },

client/demo/src/components/demo/002_ComponentGenerator.tsx

@@ -41,6 +41,7 @@ import { EnableEnhancerRow, EnableEnhancerRowProps } from "./components/610_Enab
 import { DstIdRow2, DstIdRow2Props } from "./components/602v2_DstIdRow2"
 import { SilenceFrontRow, SilenceFrontRowProps } from "./components/812_SilenceFrontRow"
 import { ModelSwitchRow, ModelSwitchRowProps } from "./components/204_ModelSwitchRow"
+import { ONNXExportRow, ONNXExportRowProps } from "./components/205_ONNXExportRow"
 
 export const catalog: { [key: string]: (props: any) => JSX.Element } = {}
 
@@ -66,6 +67,7 @@ const initialize = () => {
     addToCatalog("performance", (props: PerformanceRowProps) => { return <PerformanceRow {...props} /> })
     addToCatalog("serverInfo", (props: ServerInfoRowProps) => { return <ServerInfoRow {...props} /> })
     addToCatalog("modelSwitch", (props: ModelSwitchRowProps) => { return <ModelSwitchRow {...props} /> })
+    addToCatalog("onnxExport", (props: ONNXExportRowProps) => { return <ONNXExportRow {...props} /> })
 
 
 

client/demo/src/components/demo/components/205_ONNXExportRow.tsx

@@ -0,0 +1,47 @@
+import { OnnxExporterInfo } from "@dannadori/voice-changer-client-js"
+import React, { useMemo } from "react"
+import { useAppState } from "../../../001_provider/001_AppStateProvider"
+import { useGuiState } from "../001_GuiStateProvider"
+
+
+export type ONNXExportRowProps = {
+}
+
+export const ONNXExportRow = (_props: ONNXExportRowProps) => {
+    const appState = useAppState()
+    const guiState = useGuiState()
+
+    const onnxExporthRow = useMemo(() => {
+        const onnxExportButtonAction = async () => {
+
+            if (guiState.isConverting) {
+                alert("cannot export onnx when voice conversion is enabled")
+                return
+            }
+            document.getElementById("dialog")?.classList.add("dialog-container-show")
+            guiState.stateControls.showWaitingCheckbox.updateState(true)
+            const res = await appState.serverSetting.getOnnx() as OnnxExporterInfo
+            const a = document.createElement("a")
+            a.href = res.path
+            a.download = res.filename;
+            document.body.appendChild(a);
+            a.click();
+            document.body.removeChild(a);
+            guiState.stateControls.showWaitingCheckbox.updateState(false)
+
+        }
+        return (
+            <>
+                <div className="body-row split-3-7 left-padding-1 guided">
+                    <div className="body-item-title left-padding-1">Export ONNX</div>
+                    <div className="body-button-container">
+                        <div className="body-button left-margin-1" onClick={onnxExportButtonAction}>export onnx</div>
+                    </div>
+                </div>
+            </>
+        )
+    }, [appState.getInfo, appState.serverSetting.serverSetting])
+
+    return onnxExporthRow
+}
+

client/demo/src/components/demo/components/301-3_PyTorchSelectRow.tsx

@@ -1,13 +1,12 @@
 import React, { useMemo } from "react"
-import { fileSelector, OnnxExporterInfo } from "@dannadori/voice-changer-client-js"
+import { fileSelector } from "@dannadori/voice-changer-client-js"
 import { useAppState } from "../../../001_provider/001_AppStateProvider"
 import { useGuiState } from "../001_GuiStateProvider"
 
 export type PyTorchSelectRow = {
-    showOnnxExportButton: boolean
 }
 
-export const PyTorchSelectRow = (props: PyTorchSelectRow) => {
+export const PyTorchSelectRow = (_props: PyTorchSelectRow) => {
     const appState = useAppState()
     const guiState = useGuiState()
 
@@ -34,26 +33,6 @@ export const PyTorchSelectRow = (props: PyTorchSelectRow) => {
             })
         }
 
-        const onnxExportButtonAction = async () => {
-
-            if (guiState.isConverting) {
-                alert("cannot export onnx when voice conversion is enabled")
-                return
-            }
-            document.getElementById("dialog")?.classList.add("dialog-container-show")
-            guiState.stateControls.showWaitingCheckbox.updateState(true)
-            const res = await appState.serverSetting.getOnnx() as OnnxExporterInfo
-            const a = document.createElement("a")
-            a.href = res.path
-            a.download = res.filename;
-            document.body.appendChild(a);
-            a.click();
-            document.body.removeChild(a);
-            guiState.stateControls.showWaitingCheckbox.updateState(false)
-
-        }
-
-        const onnxExportButton = props.showOnnxExportButton ? <div className="body-button left-margin-1" onClick={onnxExportButtonAction}>export onnx</div> : <></>
 
         return (
             <div className="body-row split-3-3-4 left-padding-1 guided">
@@ -64,7 +43,6 @@ export const PyTorchSelectRow = (props: PyTorchSelectRow) => {
                 <div className="body-button-container">
                     <div className="body-button" onClick={onPyTorchFileLoadClicked}>select</div>
                     <div className="body-button left-margin-1" onClick={onPyTorchFileClearClicked}>clear</div>
-                    {onnxExportButton}
                 </div>
             </div>
         )

client/demo/src/components/demo/components/301_ModelUploaderRow.tsx

@@ -56,7 +56,7 @@ export const ModelUploaderRow = (props: ModelUploaderRowProps) => {
                 <ModelSlotRow />
                 {props.showConfig ? <ConfigSelectRow /> : <></>}
                 {props.showOnnx ? <ONNXSelectRow /> : <></>}
-                {props.showPyTorch && guiState.showPyTorchModelUpload ? <PyTorchSelectRow showOnnxExportButton={props.showOnnxExportButton || false} /> : <></>}
+                {props.showPyTorch && guiState.showPyTorchModelUpload ? <PyTorchSelectRow /> : <></>}
                 {props.showCorrespondence ? <CorrespondenceSelectRow /> : <></>}
                 {props.showPyTorchCluster ? <PyTorchClusterSelectRow /> : <></>}
                 {props.showFeature ? <FeatureSelectRow /> : <></>}

client/lib/package-lock.json

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

client/lib/package.json

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

server/voice_changer/RVC/RVC.py

@@ -384,7 +384,7 @@ class RVC:
             print("[Voice Changer] export2onnx, No pyTorch session.")
             return {"status": "ng", "path": f""}
 
-        pyTorchModelFile = self.settings.modelSlots[self.currentSlot].pyTorchModelFile
+        pyTorchModelFile = self.settings.modelSlots[self.slot].pyTorchModelFile  # inference前にexportできるようにcurrentSlotではなくslot
 
         if pyTorchModelFile == None:
             print("[Voice Changer] export2onnx, No pyTorch filepath.")