1berry/wokada-voice-changer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

separate socket io

Browse Source
This commit is contained in:
wataru 2022-12-31 16:27:18 +09:00
parent b4097598fd
commit fa00613dbe
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/MMVCServerSIO.py
View File

@ -1,16 +1,4 @@
import sys, os, struct, argparse, logging, shutil, base64, traceback import sys, os, struct, argparse, shutil, base64, traceback
# logging.getLogger('numba').setLevel(logging.WARNING)
# class UvicornSuppressFilter(logging.Filter):
# def filter(self, record):
# return False
# logger = logging.getLogger("uvicorn.error")
# logger.addFilter(UvicornSuppressFilter())
# # logger.propagate = False
# logger = logging.getLogger("multipart.multipart")
# logger.propagate = False
import misc.log_control import misc.log_control
from dataclasses import dataclass from dataclasses import dataclass
@ -51,8 +39,8 @@ from mods.VoiceChanger import VoiceChanger
from mods.ssl import create_self_signed_cert from mods.ssl import create_self_signed_cert
from sio.MMVC_Namespace import MMVC_Namespace
from voice_changer.VoiceChangerManager import VoiceChangerManager from voice_changer.VoiceChangerManager import VoiceChangerManager
from sio.MMVC_SocketIOServer import MMVC_SocketIOServer
@dataclass @dataclass
class ExApplicationInfo(): class ExApplicationInfo():
external_tensorboard_port: int external_tensorboard_port: int
@ -158,13 +146,14 @@ if __name__ == thisFilename or args.colab == True:
app_fastapi.mount( app_fastapi.mount(
"/recorder", StaticFiles(directory="../frontend/dist", html=True), name="static") "/recorder", StaticFiles(directory="../frontend/dist", html=True), name="static")
sio = socketio.AsyncServer( # sio = socketio.AsyncServer(
async_mode='asgi', # async_mode='asgi',
cors_allowed_origins='*' # cors_allowed_origins='*'
) # )
voiceChangerManager = VoiceChangerManager.get_instance() voiceChangerManager = VoiceChangerManager.get_instance()
namespace = MMVC_Namespace.get_instance(voiceChangerManager) # namespace = MMVC_Namespace.get_instance(voiceChangerManager)
sio.register_namespace(namespace) # sio.register_namespace(namespace)
sio = MMVC_SocketIOServer.get_instance(voiceChangerManager)
if CONFIG and MODEL: if CONFIG and MODEL:
voiceChangerManager.loadModel(CONFIG, MODEL) voiceChangerManager.loadModel(CONFIG, MODEL)
# namespace.loadWhisperModel("base") # namespace.loadWhisperModel("base")

20
server/sio/MMVC_SocketIOServer.py Normal file
View File

@ -0,0 +1,20 @@
import socketio
from sio.MMVC_Namespace import MMVC_Namespace
from voice_changer.VoiceChangerManager import VoiceChangerManager
class MMVC_SocketIOServer():
@classmethod
def get_instance(cls, voiceChangerManager:VoiceChangerManager):
if not hasattr(cls, "_instance"):
sio = socketio.AsyncServer(
async_mode='asgi',
cors_allowed_origins='*'
)
namespace = MMVC_Namespace.get_instance(voiceChangerManager)
sio.register_namespace(namespace)
cls._instance = sio
return cls._instance
return cls._instance