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

log update

Browse Source
This commit is contained in:
w-okada 2023-08-14 11:23:53 +09:00
parent 786c88cd06
commit e8e339bd7e
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/restapi/MMVC_Rest.py
View File

@ -7,6 +7,7 @@ from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from fastapi.exceptions import RequestValidationError from fastapi.exceptions import RequestValidationError
from typing import Callable from typing import Callable
from mods.log_control import VoiceChangaerLogger
from voice_changer.VoiceChangerManager import VoiceChangerManager from voice_changer.VoiceChangerManager import VoiceChangerManager
from restapi.MMVC_Rest_Hello import MMVC_Rest_Hello from restapi.MMVC_Rest_Hello import MMVC_Rest_Hello
@ -15,6 +16,8 @@ from restapi.MMVC_Rest_Fileuploader import MMVC_Rest_Fileuploader
from const import UPLOAD_DIR, getFrontendPath, TMP_DIR from const import UPLOAD_DIR, getFrontendPath, TMP_DIR
from voice_changer.utils.VoiceChangerParams import VoiceChangerParams from voice_changer.utils.VoiceChangerParams import VoiceChangerParams
logger = VoiceChangaerLogger.get_instance().getLogger()
class ValidationErrorLoggingRoute(APIRoute): class ValidationErrorLoggingRoute(APIRoute):
def get_route_handler(self) -> Callable: def get_route_handler(self) -> Callable:
@ -42,6 +45,7 @@ class MMVC_Rest:
voiceChangerParams: VoiceChangerParams, voiceChangerParams: VoiceChangerParams,
): ):
if cls._instance is None: if cls._instance is None:
logger.info("[Voice Changer] MMVC_Rest initializing...")
app_fastapi = FastAPI() app_fastapi = FastAPI()
app_fastapi.router.route_class = ValidationErrorLoggingRoute app_fastapi.router.route_class = ValidationErrorLoggingRoute
app_fastapi.add_middleware( app_fastapi.add_middleware(
@ -102,6 +106,7 @@ class MMVC_Rest:
app_fastapi.include_router(fileUploader.router) app_fastapi.include_router(fileUploader.router)
cls._instance = app_fastapi cls._instance = app_fastapi
logger.info("[Voice Changer] MMVC_Rest initializing... done.")
return cls._instance return cls._instance
return cls._instance return cls._instance

5
server/sio/MMVC_SocketIOApp.py
View File

@ -1,9 +1,12 @@
import socketio import socketio
from mods.log_control import VoiceChangaerLogger
from sio.MMVC_SocketIOServer import MMVC_SocketIOServer from sio.MMVC_SocketIOServer import MMVC_SocketIOServer
from voice_changer.VoiceChangerManager import VoiceChangerManager from voice_changer.VoiceChangerManager import VoiceChangerManager
from const import getFrontendPath from const import getFrontendPath
logger = VoiceChangaerLogger.get_instance().getLogger()
class MMVC_SocketIOApp: class MMVC_SocketIOApp:
_instance: socketio.ASGIApp | None = None _instance: socketio.ASGIApp | None = None
@ -11,6 +14,7 @@ class MMVC_SocketIOApp:
@classmethod @classmethod
def get_instance(cls, app_fastapi, voiceChangerManager: VoiceChangerManager): def get_instance(cls, app_fastapi, voiceChangerManager: VoiceChangerManager):
if cls._instance is None: if cls._instance is None:
logger.info("[Voice Changer] MMVC_SocketIOApp initializing...")
sio = MMVC_SocketIOServer.get_instance(voiceChangerManager) sio = MMVC_SocketIOServer.get_instance(voiceChangerManager)
app_socketio = socketio.ASGIApp( app_socketio = socketio.ASGIApp(
sio, sio,
@ -42,6 +46,7 @@ class MMVC_SocketIOApp:
) )
cls._instance = app_socketio cls._instance = app_socketio
logger.info("[Voice Changer] MMVC_SocketIOApp initializing... done.")
return cls._instance return cls._instance
return cls._instance return cls._instance

2
server/voice_changer/VoiceChangerManager.py
View File

@ -72,6 +72,7 @@ class VoiceChangerManager(ServerDeviceCallbacks):
# VoiceChangerManager # VoiceChangerManager
############################ ############################
def __init__(self, params: VoiceChangerParams): def __init__(self, params: VoiceChangerParams):
logger.info("[Voice Changer] VoiceChangerManager initializing...")
self.params = params self.params = params
self.voiceChanger: VoiceChanger = None self.voiceChanger: VoiceChanger = None
self.settings: VoiceChangerManagerSettings = VoiceChangerManagerSettings() self.settings: VoiceChangerManagerSettings = VoiceChangerManagerSettings()
@ -95,6 +96,7 @@ class VoiceChangerManager(ServerDeviceCallbacks):
self.update_settings("gpu", 0) self.update_settings("gpu", 0)
# for key, val in self.stored_setting.items(): # for key, val in self.stored_setting.items():
# self.update_settings(key, val) # self.update_settings(key, val)
logger.info("[Voice Changer] VoiceChangerManager initializing... done.")
def store_setting(self, key: str, val: str | int | float): def store_setting(self, key: str, val: str | int | float):
saveItemForServerDevice = ["enableServerAudio", "serverAudioSampleRate", "serverInputDeviceId", "serverOutputDeviceId", "serverMonitorDeviceId", "serverReadChunkSize", "serverInputAudioGain", "serverOutputAudioGain"] saveItemForServerDevice = ["enableServerAudio", "serverAudioSampleRate", "serverInputDeviceId", "serverOutputDeviceId", "serverMonitorDeviceId", "serverReadChunkSize", "serverInputAudioGain", "serverOutputAudioGain"]