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

fixed miss-spelling

Browse Source 
setteings -> settings
This commit is contained in:
frodo821 2023-04-10 08:13:17 +09:00
parent fb1be8b4c1
commit 9afe6b79ec
No known key found for this signature in database
GPG Key ID: 29F87B8DC3A2425D
12 changed files with 28 additions and 19 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

4
client/lib/src/ServerConfigurator.ts
View File

@ -28,7 +28,7 @@ export class ServerConfigurator {
}
updateSettings = async (key: ServerSettingKey, val: string) => {
const url = this.serverUrl + "/update_setteings"
const url = this.serverUrl + "/update_settings"
const info = await new Promise<ServerInfo>(async (resolve) => {
const formData = new FormData();
formData.append("key", key);
@ -132,4 +132,4 @@ export class ServerConfigurator {
return await info
}
}
}

8
server/restapi/MMVC_Rest_Fileuploader.py
View File

@ -21,7 +21,7 @@ class MMVC_Rest_Fileuploader:
self.router.add_api_route("/info", self.get_info, methods=["GET"])
self.router.add_api_route("/upload_file", self.post_upload_file, methods=["POST"])
self.router.add_api_route("/concat_uploaded_file", self.post_concat_uploaded_file, methods=["POST"])
self.router.add_api_route("/update_setteings", self.post_update_setteings, methods=["POST"])
self.router.add_api_route("/update_settings", self.post_update_settings, methods=["POST"])
self.router.add_api_route("/load_model", self.post_load_model, methods=["POST"])
self.router.add_api_route("/load_model_for_train", self.post_load_model_for_train, methods=["POST"])
self.router.add_api_route("/extract_voices", self.post_extract_voices, methods=["POST"])
@ -43,9 +43,9 @@ class MMVC_Rest_Fileuploader:
json_compatible_item_data = jsonable_encoder(info)
return JSONResponse(content=json_compatible_item_data)
def post_update_setteings(self, key: str = Form(...), val: Union[int, str, float] = Form(...)):
print("post_update_setteings", key, val)
info = self.voiceChangerManager.update_setteings(key, val)
def post_update_settings(self, key: str = Form(...), val: Union[int, str, float] = Form(...)):
print("post_update_settings", key, val)
info = self.voiceChangerManager.update_settings(key, val)
json_compatible_item_data = jsonable_encoder(info)
return JSONResponse(content=json_compatible_item_data)

2
server/voice_changer/DDSP_SVC/DDSP_SVC.py
View File

@ -113,7 +113,7 @@ class DDSP_SVC:
self.enhancer = Enhancer(self.args.enhancer.type, "./model_DDSP-SVC/enhancer/model", "cpu")
return self.get_info()
def update_setteings(self, key: str, val: any):
def update_settings(self, key: str, val: any):
if key == "onnxExecutionProvider" and self.onnx_session != None:
if val == "CUDAExecutionProvider":
if self.settings.gpu < 0 or self.settings.gpu >= self.gpu_num:

2
server/voice_changer/DDSP_SVC/DDSP_SVC_old.py
View File

@ -90,7 +90,7 @@ class DDSP_SVC:
return self.get_info()
def update_setteings(self, key: str, val: any):
def update_settings(self, key: str, val: any):
if key == "onnxExecutionProvider" and self.onnx_session != None:
if val == "CUDAExecutionProvider":
if self.settings.gpu < 0 or self.settings.gpu >= self.gpu_num:

2
server/voice_changer/MMVCv13/MMVCv13.py
View File

@ -79,7 +79,7 @@ class MMVCv13:
)
return self.get_info()
def update_setteings(self, key: str, val: any):
def update_settings(self, key: str, val: any):
if key == "onnxExecutionProvider" and self.onnx_session != None:
if val == "CUDAExecutionProvider":
if self.settings.gpu < 0 or self.settings.gpu >= self.gpu_num:

2
server/voice_changer/MMVCv15/MMVCv15.py
View File

@ -103,7 +103,7 @@ class MMVCv15:
self.onxx_input_length = i.shape[2]
return self.get_info()
def update_setteings(self, key: str, val: any):
def update_settings(self, key: str, val: any):
if key == "onnxExecutionProvider" and self.settings.onnxModelFile != "": # self.onnx_session != None:
if val == "CUDAExecutionProvider":
if self.settings.gpu < 0 or self.settings.gpu >= self.gpu_num:

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

@ -115,7 +115,7 @@ class RVC:
self.onnx_session = ModelWrapper(onnx_model_file, is_half=self.is_half)
return self.get_info()
def update_setteings(self, key: str, val: any):
def update_settings(self, key: str, val: any):
if key == "onnxExecutionProvider" and self.onnx_session != None:
if val == "CUDAExecutionProvider":
if self.settings.gpu < 0 or self.settings.gpu >= self.gpu_num:

2
server/voice_changer/SoVitsSvc40/SoVitsSvc40.py
View File

@ -139,7 +139,7 @@ class SoVitsSvc40:
# print("output", i)
return self.get_info()
def update_setteings(self, key: str, val: any):
def update_settings(self, key: str, val: any):
if key == "onnxExecutionProvider" and self.onnx_session != None:
if val == "CUDAExecutionProvider":
if self.settings.gpu < 0 or self.settings.gpu >= self.gpu_num:

2
server/voice_changer/SoVitsSvc40v2/SoVitsSvc40v2.py
View File

@ -123,7 +123,7 @@ class SoVitsSvc40v2:
input_info = self.onnx_session.get_inputs()
return self.get_info()
def update_setteings(self, key: str, val: any):
def update_settings(self, key: str, val: any):
if key == "onnxExecutionProvider" and self.onnx_session != None:
if val == "CUDAExecutionProvider":
if self.settings.gpu < 0 or self.settings.gpu >= self.gpu_num:

13
server/voice_changer/VoiceChanger.py
View File

@ -1,3 +1,4 @@
from typing import Protocol
from const import TMP_DIR, getModelType
import torch
import os
@ -5,6 +6,8 @@ import traceback
import numpy as np
from dataclasses import dataclass, asdict
import resampy
import multiprocessing as mp
import ctypes as cty
from voice_changer.IORecorder import IORecorder
@ -20,6 +23,10 @@ STREAM_ANALYZE_FILE_DIO = os.path.join(TMP_DIR, "analyze-dio.png")
STREAM_ANALYZE_FILE_HARVEST = os.path.join(TMP_DIR, "analyze-harvest.png")
class VoiceChangerModel(Protocol):
def get_processing_sampling_rate(self) -> int: ...
@dataclass
class VocieChangerSettings():
inputSampleRate: int = 24000 # 48000 or 24000
@ -37,6 +44,8 @@ class VocieChangerSettings():
class VoiceChanger():
settings: VocieChangerSettings
voiceChanger: VoiceChangerModel
def __init__(self, params):
# 初期化
@ -92,7 +101,7 @@ class VoiceChanger():
data.update(self.voiceChanger.get_info())
return data
def update_setteings(self, key: str, val: any):
def update_settings(self, key: str, val: any):
if key in self.settings.intData:
setattr(self.settings, key, int(val))
if key == "crossFadeOffsetRate" or key == "crossFadeEndRate":
@ -122,7 +131,7 @@ class VoiceChanger():
elif key in self.settings.strData:
setattr(self.settings, key, str(val))
else:
ret = self.voiceChanger.update_setteings(key, val)
ret = self.voiceChanger.update_settings(key, val)
if ret == False:
print(f"{key} is not mutable variable or unknown variable!")

4
server/voice_changer/VoiceChangerManager.py
View File

@ -23,9 +23,9 @@ class VoiceChangerManager():
else:
return {"status": "ERROR", "msg": "no model loaded"}
def update_setteings(self, key: str, val: any):
def update_settings(self, key: str, val: any):
if hasattr(self, 'voiceChanger'):
info = self.voiceChanger.update_setteings(key, val)
info = self.voiceChanger.update_settings(key, val)
info["status"] = "OK"
return info
else: