From c0942b0fbc68229db05a34a03c1bee4842d5f6c2 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:07:09 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model=20:=20Add?= =?UTF-8?q?=20send=20only=20translated=20messages=20overlay=20#32=20for=20?= =?UTF-8?q?web=5Fui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 2 +- requirements_cuda.txt | 2 +- src-python/config.py | 12 ++++++++++++ src-python/webui_controller.py | 20 ++++++++++++++++---- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8f111f27..950c83d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ deepl == 1.15.0 flashtext ==2.7 pyinstaller==6.10.0 numpy==1.26.4 -sentencepiece==0.1.99 +sentencepiece==0.2.0 openvr==1.26.701 pydub==0.25.1 psutil==5.9.8 diff --git a/requirements_cuda.txt b/requirements_cuda.txt index 026f1331..df90696a 100644 --- a/requirements_cuda.txt +++ b/requirements_cuda.txt @@ -10,7 +10,7 @@ deepl == 1.15.0 flashtext ==2.7 pyinstaller==6.10.0 numpy==1.26.4 -sentencepiece==0.1.99 +sentencepiece==0.2.0 openvr==1.26.701 pydub==0.25.1 psutil==5.9.8 diff --git a/src-python/config.py b/src-python/config.py index 9faf89d4..a7049807 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -810,6 +810,17 @@ class Config: self._OVERLAY_LARGE_LOG_SETTINGS[key] = float(value) self.saveConfig(inspect.currentframe().f_code.co_name, self.OVERLAY_LARGE_LOG_SETTINGS) + @property + @json_serializable('OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE') + def OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE(self): + return self._OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE + + @OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE.setter + def OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE(self, value): + if isinstance(value, bool): + self._OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE = value + self.saveConfig(inspect.currentframe().f_code.co_name, value) + @property @json_serializable('SEND_MESSAGE_TO_VRC') def SEND_MESSAGE_TO_VRC(self): @@ -1108,6 +1119,7 @@ class Config: "ui_scaling": 1.0, "tracker": "LeftHand", } + self._OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE = False self._SEND_MESSAGE_TO_VRC = True self._SEND_RECEIVED_MESSAGE_TO_VRC = False self._LOGGER_FEATURE = False diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index e935cfe7..f259adfb 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -251,7 +251,10 @@ class Controller: model.logger.info(f"[SENT] {message}{translation}") if config.OVERLAY_LARGE_LOG is True and model.overlay.initialized is True: - overlay_image = model.createOverlayImageLargeLog("send", message, translation[0] if len(translation) > 0 else "") + if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE is True and len(translation) > 0: + overlay_image = model.createOverlayImageLargeLog("send", translation[0], "") + else: + overlay_image = model.createOverlayImageLargeLog("send", message, translation[0] if len(translation) > 0 else "") model.updateOverlayLargeLog(overlay_image) def speakerMessage(self, message) -> None: @@ -290,12 +293,18 @@ class Controller: if config.ENABLE_TRANSCRIPTION_RECEIVE is True: if config.OVERLAY_SMALL_LOG is True and model.overlay.initialized is True: + if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE is True and len(translation) > 0: + overlay_image = model.createOverlayImageSmallLog(translation[0], "") + else: overlay_image = model.createOverlayImageSmallLog(message, translation[0] if len(translation) > 0 else "") - model.updateOverlaySmallLog(overlay_image) + model.updateOverlaySmallLog(overlay_image) if config.OVERLAY_LARGE_LOG is True and model.overlay.initialized is True: + if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE is True and len(translation) > 0: + overlay_image = model.createOverlayImageLargeLog("receive", translation[0], "") + else: overlay_image = model.createOverlayImageLargeLog("receive", message, translation[0] if len(translation) > 0 else "") - model.updateOverlayLargeLog(overlay_image) + model.updateOverlayLargeLog(overlay_image) if config.SEND_RECEIVED_MESSAGE_TO_VRC is True: osc_message = self.messageFormatter("RECEIVED", translation, [message]) @@ -361,7 +370,10 @@ class Controller: model.oscSendMessage(osc_message) if config.OVERLAY_LARGE_LOG is True: - overlay_image = model.createOverlayImageLargeLog("send", message, translation[0] if len(translation) > 0 else "") + if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGE is True and len(translation) > 0: + overlay_image = model.createOverlayImageLargeLog("send", translation[0], "") + else: + overlay_image = model.createOverlayImageLargeLog("send", message, translation[0] if len(translation) > 0 else "") model.updateOverlayLargeLog(overlay_image) # update textbox message log (Sent)