every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'controller' into develop

Browse Source
This commit is contained in:
misyaguziya
2024-01-14 13:14:01 +09:00
parent 7f9faf3676 d65829175e
commit 22e24514e0
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
controller.py
View File

@@ -65,11 +65,11 @@ def sendMicMessage(message):
elif config.ENABLE_TRANSLATION is False: elif config.ENABLE_TRANSLATION is False:
pass pass
else: else:
translation = model.getInputTranslate(message) translation, success = model.getInputTranslate(message)
# if translation is False: if success is False:
# config.ENABLE_TRANSLATION = False config.CHOICE_INPUT_TRANSLATOR = "CTranslate2"
# translation = "" config.CHOICE_OUTPUT_TRANSLATOR = "CTranslate2"
# view.translationEngineLimitErrorProcess() updateTranslationEngineAndEngineList()
if config.ENABLE_TRANSCRIPTION_SEND is True: if config.ENABLE_TRANSCRIPTION_SEND is True:
if config.ENABLE_SEND_MESSAGE_TO_VRC is True: if config.ENABLE_SEND_MESSAGE_TO_VRC is True:
@@ -132,11 +132,11 @@ def receiveSpeakerMessage(message):
if config.ENABLE_TRANSLATION is False: if config.ENABLE_TRANSLATION is False:
pass pass
else: else:
translation = model.getOutputTranslate(message) translation, success = model.getOutputTranslate(message)
# if translation is False: if success is False:
# config.ENABLE_TRANSLATION = False config.CHOICE_INPUT_TRANSLATOR = "CTranslate2"
# translation = "" config.CHOICE_OUTPUT_TRANSLATOR = "CTranslate2"
# view.translationEngineLimitErrorProcess() updateTranslationEngineAndEngineList()
if config.ENABLE_TRANSCRIPTION_RECEIVE is True: if config.ENABLE_TRANSCRIPTION_RECEIVE is True:
if config.ENABLE_NOTICE_XSOVERLAY is True: if config.ENABLE_NOTICE_XSOVERLAY is True:
@@ -202,12 +202,11 @@ def sendChatMessage(message):
if config.ENABLE_TRANSLATION is False: if config.ENABLE_TRANSLATION is False:
pass pass
else: else:
translation = model.getInputTranslate(message) translation, success = model.getInputTranslate(message)
# if translation is False: if success is False:
# config.ENABLE_TRANSLATION = False config.CHOICE_INPUT_TRANSLATOR = "CTranslate2"
# translation = "" config.CHOICE_OUTPUT_TRANSLATOR = "CTranslate2"
# view.translationEngineLimitErrorProcess() updateTranslationEngineAndEngineList()
# send OSC message # send OSC message
if config.ENABLE_SEND_MESSAGE_TO_VRC is True: if config.ENABLE_SEND_MESSAGE_TO_VRC is True:
if config.ENABLE_SEND_ONLY_TRANSLATED_MESSAGES is True: if config.ENABLE_SEND_ONLY_TRANSLATED_MESSAGES is True:
@@ -249,9 +248,15 @@ def messageBoxFocusOut(e):
if config.ENABLE_SEND_MESSAGE_TO_VRC is True: if config.ENABLE_SEND_MESSAGE_TO_VRC is True:
model.oscStopSendTyping() model.oscStopSendTyping()
# func select languages def updateTranslationEngineAndEngineList():
def getLatestSelectableTranslationEngines(): engine = config.CHOICE_INPUT_TRANSLATOR
return model.findTranslationEngines(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) engines = model.findTranslationEngines(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE)
if engine not in engines:
engine = engines[0]
config.CHOICE_INPUT_TRANSLATOR = engine
config.CHOICE_OUTPUT_TRANSLATOR = engine
view.updateSelectableTranslationEngineList(engines)
view.setGuiVariable_SelectedTranslationEngine(engine)
def initSetTranslateEngine(): def initSetTranslateEngine():
engine = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] engine = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
@@ -288,8 +293,7 @@ def setYourLanguageAndCountry(select):
language, country = model.getLanguageAndCountry(select) language, country = model.getLanguageAndCountry(select)
config.SOURCE_LANGUAGE = language config.SOURCE_LANGUAGE = language
config.SOURCE_COUNTRY = country config.SOURCE_COUNTRY = country
view.updateSelectableTranslationEngineList(getLatestSelectableTranslationEngines()) updateTranslationEngineAndEngineList()
view.setGuiVariable_SelectedTranslationEngine(config.CHOICE_OUTPUT_TRANSLATOR)
view.printToTextbox_selectedYourLanguages(select) view.printToTextbox_selectedYourLanguages(select)
def setTargetLanguageAndCountry(select): def setTargetLanguageAndCountry(select):
@@ -299,8 +303,7 @@ def setTargetLanguageAndCountry(select):
language, country = model.getLanguageAndCountry(select) language, country = model.getLanguageAndCountry(select)
config.TARGET_LANGUAGE = language config.TARGET_LANGUAGE = language
config.TARGET_COUNTRY = country config.TARGET_COUNTRY = country
view.updateSelectableTranslationEngineList(getLatestSelectableTranslationEngines()) updateTranslationEngineAndEngineList()
view.setGuiVariable_SelectedTranslationEngine(config.CHOICE_OUTPUT_TRANSLATOR)
view.printToTextbox_selectedTargetLanguages(select) view.printToTextbox_selectedTargetLanguages(select)
def swapYourLanguageAndTargetLanguage(): def swapYourLanguageAndTargetLanguage():
@@ -336,8 +339,7 @@ def callbackSelectedLanguagePresetTab(selected_tab_no):
config.TARGET_LANGUAGE = language config.TARGET_LANGUAGE = language
config.TARGET_COUNTRY = country config.TARGET_COUNTRY = country
view.printToTextbox_changedLanguagePresetTab(config.SELECTED_TAB_NO) view.printToTextbox_changedLanguagePresetTab(config.SELECTED_TAB_NO)
view.updateSelectableTranslationEngineList(getLatestSelectableTranslationEngines()) updateTranslationEngineAndEngineList()
view.setGuiVariable_SelectedTranslationEngine(config.CHOICE_OUTPUT_TRANSLATOR)
def callbackSelectedTranslationEngine(selected_translation_engine): def callbackSelectedTranslationEngine(selected_translation_engine):
print("callbackSelectedTranslationEngine", selected_translation_engine) print("callbackSelectedTranslationEngine", selected_translation_engine)
@@ -497,6 +499,7 @@ def callbackSetDeeplAuthkey(value):
auth_keys = config.AUTH_KEYS auth_keys = config.AUTH_KEYS
auth_keys["DeepL_API"] = None auth_keys["DeepL_API"] = None
config.AUTH_KEYS = auth_keys config.AUTH_KEYS = auth_keys
updateTranslationEngineAndEngineList()
# Transcription Tab # Transcription Tab
# Transcription (Mic) # Transcription (Mic)
@@ -840,16 +843,18 @@ def createMainWindow():
initSetConfigByExeArguments() initSetConfigByExeArguments()
initSetTranslateEngine() initSetTranslateEngine()
initSetLanguageAndCountry() initSetLanguageAndCountry()
view.updateSelectableTranslationEngineList(getLatestSelectableTranslationEngines())
if config.AUTH_KEYS["DeepL_API"] is not None: if config.AUTH_KEYS["DeepL_API"] is not None:
if model.authenticationTranslatorDeepLAuthKey("DeepL_API", config.AUTH_KEYS["DeepL_API"]) is False: if model.authenticationTranslatorDeepLAuthKey(auth_key=config.AUTH_KEYS["DeepL_API"]) is False:
# error update Auth key # error update Auth key
auth_keys = config.AUTH_KEYS auth_keys = config.AUTH_KEYS
auth_keys["DeepL_API"] = None auth_keys["DeepL_API"] = None
config.AUTH_KEYS = auth_keys config.AUTH_KEYS = auth_keys
view.printToTextbox_AuthenticationError() view.printToTextbox_AuthenticationError()
# set Translation Engine
updateTranslationEngineAndEngineList()
# set word filter # set word filter
model.addKeywords() model.addKeywords()

22
model.py
View File

@@ -123,11 +123,12 @@ class Model:
if source_lang in languages and target_lang in languages: if source_lang in languages and target_lang in languages:
compatible_engines.append(engine) compatible_engines.append(engine)
if "DeepL_API" in compatible_engines: if "DeepL_API" in compatible_engines:
if self.translator.deepl_client is None: if config.AUTH_KEYS["DeepL_API"] is None:
compatible_engines.remove('DeepL_API') compatible_engines.remove('DeepL_API')
return compatible_engines return compatible_engines
def getInputTranslate(self, message, fnc=None): def getInputTranslate(self, message):
translation_success_flag = True
translator_name=config.CHOICE_INPUT_TRANSLATOR translator_name=config.CHOICE_INPUT_TRANSLATOR
source_language=config.SOURCE_LANGUAGE source_language=config.SOURCE_LANGUAGE
target_language=config.TARGET_LANGUAGE target_language=config.TARGET_LANGUAGE
@@ -143,6 +144,7 @@ class Model:
# 翻訳失敗時のフェールセーフ処理 # 翻訳失敗時のフェールセーフ処理
if translation is False: if translation is False:
translation_success_flag = False
translation = self.translator.translate( translation = self.translator.translate(
translator_name="CTranslate2", translator_name="CTranslate2",
source_language=source_language, source_language=source_language,
@@ -150,13 +152,10 @@ class Model:
target_country=target_country, target_country=target_country,
message=message message=message
) )
try: return translation, translation_success_flag
fnc()
except Exception:
pass
return translation
def getOutputTranslate(self, message, fnc=None): def getOutputTranslate(self, message):
translation_success_flag = True
translator_name=config.CHOICE_OUTPUT_TRANSLATOR translator_name=config.CHOICE_OUTPUT_TRANSLATOR
source_language=config.TARGET_LANGUAGE source_language=config.TARGET_LANGUAGE
target_language=config.SOURCE_LANGUAGE target_language=config.SOURCE_LANGUAGE
@@ -172,6 +171,7 @@ class Model:
# 翻訳失敗時のフェールセーフ処理 # 翻訳失敗時のフェールセーフ処理
if translation is False: if translation is False:
translation_success_flag = False
translation = self.translator.translate( translation = self.translator.translate(
translator_name="CTranslate2", translator_name="CTranslate2",
source_language=source_language, source_language=source_language,
@@ -179,11 +179,7 @@ class Model:
target_country=target_country, target_country=target_country,
message=message message=message
) )
try: return translation, translation_success_flag
fnc()
except Exception:
pass
return translation
def addKeywords(self): def addKeywords(self):
for f in config.INPUT_MIC_WORD_FILTER: for f in config.INPUT_MIC_WORD_FILTER: