👍[Update] Model : 翻訳エンジンへのrequestが失敗した場合にエラーログを出力する機能を追加
This commit is contained in:
@@ -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):
|
||||
|
||||
74
model.py
74
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):
|
||||
|
||||
@@ -66,5 +66,5 @@ class Translator():
|
||||
to_language=target_language,
|
||||
)
|
||||
except:
|
||||
pass
|
||||
result = False
|
||||
return result
|
||||
Reference in New Issue
Block a user