From 5ea920433ef6e3cd55b9fdaaab8eeb93fdd18efc Mon Sep 17 00:00:00 2001
From: wataru <wataru@fdev.local.com>
Date: Thu, 3 Nov 2022 04:23:04 +0900
Subject: [PATCH] update

---
 demo/MMVCServerSIO.py | 26 +++++++++++++-------------
 trainer/Dockerfile    |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/demo/MMVCServerSIO.py b/demo/MMVCServerSIO.py
index 04f4b86d..3f74034f 100755
--- a/demo/MMVCServerSIO.py
+++ b/demo/MMVCServerSIO.py
@@ -22,7 +22,7 @@ import numpy as np
 
 from mods.ssl import create_self_signed_cert
 from mods.VoiceChanger import VoiceChanger
-from mods.Whisper import Whisper
+# from mods.Whisper import Whisper
 
 class UvicornSuppressFilter(logging.Filter):
     def filter(self, record):
@@ -54,22 +54,22 @@ class MyCustomNamespace(socketio.AsyncNamespace):
             self.voiceChanger.destroy()
         self.voiceChanger = VoiceChanger(config, model)
 
-    def loadWhisperModel(self, model):
-        self.whisper = Whisper()
-        self.whisper.loadModel("tiny")
-        print("load")
+    # def loadWhisperModel(self, model):
+    #     self.whisper = Whisper()
+    #     self.whisper.loadModel("tiny")
+    #     print("load")
 
     def changeVoice(self, gpu, srcId, dstId, timestamp, prefixChunkSize, unpackedData):
-        if hasattr(self, 'whisper') == True:
-            self.whisper.addData(unpackedData)
+        # if hasattr(self, 'whisper') == True:
+        #     self.whisper.addData(unpackedData)
 
         return self.voiceChanger.on_request(gpu, srcId, dstId, timestamp, prefixChunkSize, unpackedData)
 
-    def transcribe(self):
-        if hasattr(self, 'whisper') == True:
-            self.whisper.transcribe(0)
-        else:
-            print("whisper not found")
+    # def transcribe(self):
+    #     if hasattr(self, 'whisper') == True:
+    #         self.whisper.transcribe(0)
+    #     else:
+    #         print("whisper not found")
 
 
     def on_connect(self, sid, environ):
@@ -154,7 +154,7 @@ if __name__ == thisFilename or args.colab == True:
     sio.register_namespace(namespace) 
     if CONFIG and MODEL:
         namespace.loadModel(CONFIG, MODEL)
-    namespace.loadWhisperModel("base")
+    # namespace.loadWhisperModel("base")
     
     
     app_socketio = socketio.ASGIApp(
diff --git a/trainer/Dockerfile b/trainer/Dockerfile
index 3c85bcd6..7517caa2 100644
--- a/trainer/Dockerfile
+++ b/trainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM dannadori/voice-changer-internal:20221103_035426 as front
+FROM dannadori/voice-changer-internal:20221103_041401 as front
 FROM debian:bullseye-slim as base
 
 ARG DEBIAN_FRONTEND=noninteractive