diff --git a/server/restapi/MMVC_Rest.py b/server/restapi/MMVC_Rest.py index a109247e..e1b0a947 100644 --- a/server/restapi/MMVC_Rest.py +++ b/server/restapi/MMVC_Rest.py @@ -8,7 +8,6 @@ from voice_changer.VoiceChangerManager import VoiceChangerManager from restapi.MMVC_Rest_Hello import MMVC_Rest_Hello from restapi.MMVC_Rest_VoiceChanger import MMVC_Rest_VoiceChanger from restapi.MMVC_Rest_Fileuploader import MMVC_Rest_Fileuploader -from restapi.MMVC_Rest_Trainer import MMVC_Rest_Trainer from const import getFrontendPath, TMP_DIR @@ -60,8 +59,6 @@ class MMVC_Rest: app_fastapi.include_router(restVoiceChanger.router) fileUploader = MMVC_Rest_Fileuploader(voiceChangerManager) app_fastapi.include_router(fileUploader.router) - trainer = MMVC_Rest_Trainer() - app_fastapi.include_router(trainer.router) cls._instance = app_fastapi return cls._instance diff --git a/server/restapi/MMVC_Rest_Fileuploader.py b/server/restapi/MMVC_Rest_Fileuploader.py index 54e8c875..7c5b0925 100644 --- a/server/restapi/MMVC_Rest_Fileuploader.py +++ b/server/restapi/MMVC_Rest_Fileuploader.py @@ -75,30 +75,6 @@ class MMVC_Rest_Fileuploader: "indexFilename": indexFilename } } - # print("---------------------------------------------------->", props) - - # # Upload File Path - # pyTorchModelFilePath = os.path.join(UPLOAD_DIR, pyTorchModelFilename) if pyTorchModelFilename != "-" else None - # onnxModelFilePath = os.path.join(UPLOAD_DIR, onnxModelFilename) if onnxModelFilename != "-" else None - # configFilePath = os.path.join(UPLOAD_DIR, configFilename) - # clusterTorchModelFilePath = os.path.join(UPLOAD_DIR, clusterTorchModelFilename) if clusterTorchModelFilename != "-" else None - # featureFilePath = os.path.join(UPLOAD_DIR, featureFilename) if featureFilename != "-" else None - # indexFilePath = os.path.join(UPLOAD_DIR, indexFilename) if indexFilename != "-" else None - - # # Stored File Path by Slot - # pyTorchModelStoredFilePath = os.path.join(UPLOAD_DIR, f"{slot}", pyTorchModelFilename) if pyTorchModelFilename != "-" else None - # onnxModelStoredFilePath = os.path.join(UPLOAD_DIR, f"{slot}", onnxModelFilename) if onnxModelFilename != "-" else None - # configStoredFilePath = os.path.join(UPLOAD_DIR, f"{slot}", configFilename) - # clusterTorchModelStoredFilePath = os.path.join(UPLOAD_DIR, f"{slot}", clusterTorchModelFilename) if clusterTorchModelFilename != "-" else None - # featureStoredFilePath = os.path.join(UPLOAD_DIR, f"{slot}", featureFilename) if featureFilename != "-" else None - # indexStoredFilePath = os.path.join(UPLOAD_DIR, f"{slot}", indexFilename) if indexFilename != "-" else None - - # # Store File - # if pyTorchModelFilename != "-": - # pyTorchModelFilePath = os.path.join(UPLOAD_DIR, pyTorchModelFilename) - # pyTorchModelStoredFilePath = os.path.join(UPLOAD_DIR, f"{slot}", pyTorchModelFilename) - # shutil.move(pyTorchModelFilePath, pyTorchModelStoredFilePath) - # Change Filepath for key, val in props["files"].items(): if val != "-": @@ -151,7 +127,7 @@ class MMVC_Rest_Fileuploader: def get_model_type( self, ): - info = self.voiceChangerManager.getModelType(modelType) + info = self.voiceChangerManager.getModelType() json_compatible_item_data = jsonable_encoder(info) return JSONResponse(content=json_compatible_item_data) diff --git a/server/restapi/MMVC_Rest_Trainer.py b/server/restapi/MMVC_Rest_Trainer.py deleted file mode 100644 index 2f879d90..00000000 --- a/server/restapi/MMVC_Rest_Trainer.py +++ /dev/null @@ -1,94 +0,0 @@ -import os - -from fastapi import APIRouter,Form -from fastapi.encoders import jsonable_encoder -from fastapi.responses import JSONResponse - - -from restapi.mods.Trainer_Speakers import mod_get_speakers -from restapi.mods.Trainer_Training import mod_post_pre_training, mod_post_start_training, mod_post_stop_training, mod_get_related_files, mod_get_tail_training_log -from restapi.mods.Trainer_Model import mod_get_model, mod_delete_model - -from restapi.mods.Trainer_Models import mod_get_models -from restapi.mods.Trainer_MultiSpeakerSetting import mod_get_multi_speaker_setting, mod_post_multi_speaker_setting -from restapi.mods.Trainer_Speaker_Voice import mod_get_speaker_voice -from restapi.mods.Trainer_Speaker_Voices import mod_get_speaker_voices - -from restapi.mods.Trainer_Speaker import mod_delete_speaker -from dataclasses import dataclass - -INFO_DIR = "info" -# os.makedirs(INFO_DIR, exist_ok=True) - -@dataclass -class ExApplicationInfo(): - external_tensorboard_port: int - -exApplitionInfo = ExApplicationInfo(external_tensorboard_port=0) - -class MMVC_Rest_Trainer: - def __init__(self): - self.router = APIRouter() - self.router.add_api_route("/get_speakers", self.get_speakers, methods=["GET"]) - self.router.add_api_route("/delete_speaker", self.delete_speaker, methods=["DELETE"]) - self.router.add_api_route("/get_speaker_voices", self.get_speaker_voices, methods=["GET"]) - self.router.add_api_route("/get_speaker_voice", self.get_speaker_voice, methods=["GET"]) - self.router.add_api_route("/get_multi_speaker_setting", self.get_multi_speaker_setting, methods=["GET"]) - self.router.add_api_route("/post_multi_speaker_setting", self.post_multi_speaker_setting, methods=["POST"]) - self.router.add_api_route("/get_models", self.get_models, methods=["GET"]) - self.router.add_api_route("/get_model", self.get_model, methods=["GET"]) - self.router.add_api_route("/delete_model", self.delete_model, methods=["DELETE"]) - self.router.add_api_route("/post_pre_training", self.post_pre_training, methods=["POST"]) - self.router.add_api_route("/post_start_training", self.post_start_training, methods=["POST"]) - self.router.add_api_route("/post_stop_training", self.post_stop_training, methods=["POST"]) - self.router.add_api_route("/get_related_files", self.get_related_files, methods=["GET"]) - self.router.add_api_route("/get_tail_training_log", self.get_tail_training_log, methods=["GET"]) - self.router.add_api_route("/get_ex_application_info", self.get_ex_application_info, methods=["GET"]) - - def get_speakers(self): - return mod_get_speakers() - - def delete_speaker(self, speaker: str = Form(...)): - return mod_delete_speaker(speaker) - - def get_speaker_voices(self, speaker: str): - return mod_get_speaker_voices(speaker) - - def get_speaker_voice(self, speaker: str, voice: str): - return mod_get_speaker_voice(speaker, voice) - - def get_multi_speaker_setting(self): - return mod_get_multi_speaker_setting() - - def post_multi_speaker_setting(self, setting: str = Form(...)): - return mod_post_multi_speaker_setting(setting) - - def get_models(self): - return mod_get_models() - - def get_model(self, model: str): - return mod_get_model(model) - - def delete_model(self, model: str = Form(...)): - return mod_delete_model(model) - - def post_pre_training(self, batch: int = Form(...)): - return mod_post_pre_training(batch) - - def post_start_training(self, enable_finetuning: bool = Form(...),GModel: str = Form(...),DModel: str = Form(...)): - print("POST START TRAINING..") - return mod_post_start_training(enable_finetuning, GModel, DModel) - - def post_stop_training(self): - print("POST STOP TRAINING..") - return mod_post_stop_training() - - def get_related_files(self): - return mod_get_related_files() - - def get_tail_training_log(self, num: int): - return mod_get_tail_training_log(num) - - def get_ex_application_info(self): - json_compatible_item_data = jsonable_encoder(exApplitionInfo) - return JSONResponse(content=json_compatible_item_data) diff --git a/server/voice_changer/RVC/RVC.py b/server/voice_changer/RVC/RVC.py index 3897d217..f0a6befe 100644 --- a/server/voice_changer/RVC/RVC.py +++ b/server/voice_changer/RVC/RVC.py @@ -105,11 +105,6 @@ class RVC: except Exception as e: print("EXCEPTION during loading hubert/contentvec model", e) - # if pyTorch_model_file != None: - # self.settings.pyTorchModelFile = pyTorch_model_file - # if onnx_model_file: - # self.settings.onnxModelFile = onnx_model_file - # PyTorchモデル生成 if self.settings.pyTorchModelFile != None: cpt = torch.load(self.settings.pyTorchModelFile, map_location="cpu")