From 12175a078864c43287108fe83fa8215a41b963e3 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Fri, 20 Oct 2023 10:29:46 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D[Update]=20Model=20:=20=E7=BF=BB?= =?UTF-8?q?=E8=A8=B3=E3=82=A8=E3=83=B3=E3=82=B8=E3=83=B3=E3=81=B8=E3=81=AE?= =?UTF-8?q?request=E3=81=8C=E5=A4=B1=E6=95=97=E3=81=97=E3=81=9F=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=81=AB=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=82=92=E5=87=BA=E5=8A=9B=E3=81=99=E3=82=8B=E6=A9=9F=E8=83=BD?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller.py | 22 +++--- model.py | 74 +++++++++----------- models/translation/translation_translator.py | 2 +- 3 files changed, 47 insertions(+), 51 deletions(-) diff --git a/controller.py b/controller.py index bb7fae7b..2082840e 100644 --- a/controller.py +++ b/controller.py @@ -26,9 +26,10 @@ def sendMicMessage(message): view.printToTextbox_AuthenticationError() else: translation = model.getInputTranslate(message) - - if translation == None: - translation = "" + if translation == False: + config.ENABLE_TRANSLATION = False + translation = "" + view.translationEngineLimitErrorProcess() if config.ENABLE_TRANSCRIPTION_SEND is True: if config.ENABLE_SEND_MESSAGE_TO_VRC is True: @@ -91,9 +92,10 @@ def receiveSpeakerMessage(message): view.printToTextbox_AuthenticationError() else: translation = model.getOutputTranslate(message) - - if translation == None: - translation = "" + if translation == False: + config.ENABLE_TRANSLATION = False + translation = "" + view.translationEngineLimitErrorProcess() if config.ENABLE_TRANSCRIPTION_RECEIVE is True: if config.ENABLE_NOTICE_XSOVERLAY is True: @@ -158,9 +160,10 @@ def sendChatMessage(message): view.printToTextbox_AuthenticationError() else: translation = model.getInputTranslate(message) - - if translation == None: - translation = "" + if translation == False: + config.ENABLE_TRANSLATION = False + translation = "" + view.translationEngineLimitErrorProcess() # send OSC message if config.ENABLE_SEND_MESSAGE_TO_VRC is True: @@ -389,7 +392,6 @@ def callbackSetDeeplAuthkey(value): config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) else: view.printToTextbox_AuthenticationError() - print(config.AUTH_KEYS, config.CHOICE_TRANSLATOR) # Transcription Tab (Mic) def callbackSetMicHost(value): diff --git a/model.py b/model.py index 91507df1..8f25c706 100644 --- a/model.py +++ b/model.py @@ -142,51 +142,45 @@ class Model: return self.translator.translator_status[config.CHOICE_TRANSLATOR] def getInputTranslate(self, message): - try: - if config.CHOICE_TRANSLATOR == "DeepL_API": - if config.TARGET_LANGUAGE == "English": - if config.TARGET_COUNTRY in ["United States", "Canada", "Philippines"]: - config.TARGET_LANGUAGE = "English American" - else: - config.TARGET_LANGUAGE = "English British" - elif config.TARGET_LANGUAGE in ["Portuguese"]: - if config.TARGET_COUNTRY == "Portugal": - config.TARGET_LANGUAGE = "Portuguese European" - else: - config.TARGET_LANGUAGE = "Portuguese Brazilian" + if config.CHOICE_TRANSLATOR == "DeepL_API": + if config.TARGET_LANGUAGE == "English": + if config.TARGET_COUNTRY in ["United States", "Canada", "Philippines"]: + config.TARGET_LANGUAGE = "English American" + else: + config.TARGET_LANGUAGE = "English British" + elif config.TARGET_LANGUAGE in ["Portuguese"]: + if config.TARGET_COUNTRY == "Portugal": + config.TARGET_LANGUAGE = "Portuguese European" + else: + config.TARGET_LANGUAGE = "Portuguese Brazilian" - translation = self.translator.translate( - translator_name=config.CHOICE_TRANSLATOR, - source_language=config.SOURCE_LANGUAGE, - target_language=config.TARGET_LANGUAGE, - message=message - ) - except: - translation = None + translation = self.translator.translate( + translator_name=config.CHOICE_TRANSLATOR, + source_language=config.SOURCE_LANGUAGE, + target_language=config.TARGET_LANGUAGE, + message=message + ) return translation def getOutputTranslate(self, message): - try: - if config.CHOICE_TRANSLATOR == "DeepL_API": - if config.SOURCE_LANGUAGE == "English": - if config.SOURCE_COUNTRY in ["United States", "Canada", "Philippines"]: - config.SOURCE_LANGUAGE = "English American" - else: - config.SOURCE_LANGUAGE = "English British" - elif config.SOURCE_LANGUAGE in ["Portuguese"]: - if config.SOURCE_COUNTRY == "Portugal": - config.SOURCE_LANGUAGE = "Portuguese European" - else: - config.SOURCE_LANGUAGE = "Portuguese Brazilian" + if config.CHOICE_TRANSLATOR == "DeepL_API": + if config.SOURCE_LANGUAGE == "English": + if config.SOURCE_COUNTRY in ["United States", "Canada", "Philippines"]: + config.SOURCE_LANGUAGE = "English American" + else: + config.SOURCE_LANGUAGE = "English British" + elif config.SOURCE_LANGUAGE in ["Portuguese"]: + if config.SOURCE_COUNTRY == "Portugal": + config.SOURCE_LANGUAGE = "Portuguese European" + else: + config.SOURCE_LANGUAGE = "Portuguese Brazilian" - translation = self.translator.translate( - translator_name=config.CHOICE_TRANSLATOR, - source_language=config.TARGET_LANGUAGE, - target_language=config.SOURCE_LANGUAGE, - message=message - ) - except: - translation = None + translation = self.translator.translate( + translator_name=config.CHOICE_TRANSLATOR, + source_language=config.TARGET_LANGUAGE, + target_language=config.SOURCE_LANGUAGE, + message=message + ) return translation def addKeywords(self): diff --git a/models/translation/translation_translator.py b/models/translation/translation_translator.py index 4f4a1550..bcca750f 100644 --- a/models/translation/translation_translator.py +++ b/models/translation/translation_translator.py @@ -66,5 +66,5 @@ class Translator(): to_language=target_language, ) except: - pass + result = False return result \ No newline at end of file