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

👍[Update] Main : 翻訳エンジンの手動設定に変更

Browse Source 
翻訳エンジンの自動設定機能を削除
input/outputの翻訳エンジンを別に設定できるように機能を追加
Aurhkeyの認証をDeepLのみ削減
This commit is contained in:
misyaguziya
2023-12-30 23:38:09 +09:00
parent a82435dc29
commit 1777988294
4 changed files with 112 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
config.py
View File

@@ -150,13 +150,22 @@ class Config:
self._TARGET_LANGUAGE = value self._TARGET_LANGUAGE = value
@property @property
def CHOICE_TRANSLATOR(self): def CHOICE_INPUT_TRANSLATOR(self):
return self._CHOICE_TRANSLATOR return self._CHOICE_INPUT_TRANSLATOR
@CHOICE_TRANSLATOR.setter @CHOICE_INPUT_TRANSLATOR.setter
def CHOICE_TRANSLATOR(self, value): def CHOICE_INPUT_TRANSLATOR(self, value):
if value in translatorEngine: if value in translatorEngine:
self._CHOICE_TRANSLATOR = value self._CHOICE_INPUT_TRANSLATOR= value
@property
def CHOICE_OUTPUT_TRANSLATOR(self):
return self._CHOICE_OUTPUT_TRANSLATOR
@CHOICE_OUTPUT_TRANSLATOR.setter
def CHOICE_OUTPUT_TRANSLATOR(self, value):
if value in translatorEngine:
self._CHOICE_OUTPUT_TRANSLATOR = value
# Save Json Data # Save Json Data
## Main Window ## Main Window
@@ -171,6 +180,28 @@ class Config:
self._SELECTED_TAB_NO = value self._SELECTED_TAB_NO = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property
@json_serializable('SELECTED_TAB_YOUR_TRANSLATOR_ENGINES')
def SELECTED_TAB_YOUR_TRANSLATOR_ENGINES(self):
return self._SELECTED_TAB_YOUR_TRANSLATOR_ENGINES
@SELECTED_TAB_YOUR_TRANSLATOR_ENGINES.setter
def SELECTED_TAB_YOUR_TRANSLATOR_ENGINES(self, value):
if isinstance(value, dict):
self._SELECTED_TAB_YOUR_TRANSLATOR_ENGINES = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property
@json_serializable('SELECTED_TAB_TARGET_TRANSLATOR_ENGINES')
def SELECTED_TAB_TARGET_TRANSLATOR_ENGINES(self):
return self._SELECTED_TAB_TARGET_TRANSLATOR_ENGINES
@SELECTED_TAB_TARGET_TRANSLATOR_ENGINES.setter
def SELECTED_TAB_TARGET_TRANSLATOR_ENGINES(self, value):
if isinstance(value, dict):
self._SELECTED_TAB_TARGET_TRANSLATOR_ENGINES = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property @property
@json_serializable('SELECTED_TAB_YOUR_LANGUAGES') @json_serializable('SELECTED_TAB_YOUR_LANGUAGES')
def SELECTED_TAB_YOUR_LANGUAGES(self): def SELECTED_TAB_YOUR_LANGUAGES(self):
@@ -562,7 +593,8 @@ class Config:
self._ENABLE_TRANSCRIPTION_SEND = False self._ENABLE_TRANSCRIPTION_SEND = False
self._ENABLE_TRANSCRIPTION_RECEIVE = False self._ENABLE_TRANSCRIPTION_RECEIVE = False
self._ENABLE_FOREGROUND = False self._ENABLE_FOREGROUND = False
self._CHOICE_TRANSLATOR = translatorEngine[0] self._CHOICE_INPUT_TRANSLATOR = translatorEngine[0]
self._CHOICE_OUTPUT_TRANSLATOR = translatorEngine[0]
self._SOURCE_LANGUAGE = "Japanese" self._SOURCE_LANGUAGE = "Japanese"
self._SOURCE_COUNTRY = "Japan" self._SOURCE_COUNTRY = "Japan"
self._TARGET_LANGUAGE = "English" self._TARGET_LANGUAGE = "English"
@@ -571,6 +603,16 @@ class Config:
# Save Json Data # Save Json Data
## Main Window ## Main Window
self._SELECTED_TAB_NO = "1" self._SELECTED_TAB_NO = "1"
self._SELECTED_TAB_YOUR_TRANSLATOR_ENGINES = {
"1":translatorEngine[0],
"2":translatorEngine[0],
"3":translatorEngine[0],
}
self._SELECTED_TAB_TARGET_TRANSLATOR_ENGINES = {
"1":translatorEngine[0],
"2":translatorEngine[0],
"3":translatorEngine[0],
}
self._SELECTED_TAB_YOUR_LANGUAGES = { self._SELECTED_TAB_YOUR_LANGUAGES = {
"1":"Japanese\n(Japan)", "1":"Japanese\n(Japan)",
"2":"Japanese\n(Japan)", "2":"Japanese\n(Japan)",

52
controller.py
View File

@@ -209,6 +209,12 @@ def messageBoxFocusOut(e):
model.oscStopSendTyping() model.oscStopSendTyping()
# func select languages # func select languages
def initSetTranslateEngine():
engine = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
config.CHOICE_INPUT_TRANSLATOR = engine
engine = config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
config.CHOICE_OUTPUT_TRANSLATOR = engine
def initSetLanguageAndCountry(): def initSetLanguageAndCountry():
select = config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO] select = config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO]
language, country = model.getLanguageAndCountry(select) language, country = model.getLanguageAndCountry(select)
@@ -218,7 +224,18 @@ def initSetLanguageAndCountry():
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
config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE)
def setYourTranslateEngine(select):
engines = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES
engines[config.SELECTED_TAB_NO] = select
config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES = engines
config.CHOICE_INPUT_TRANSLATOR = select
def setTargetTranslateEngine(select):
engines = config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES
engines[config.SELECTED_TAB_NO] = select
config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES = engines
config.CHOICE_OUTPUT_TRANSLATOR = select
def setYourLanguageAndCountry(select): def setYourLanguageAndCountry(select):
languages = config.SELECTED_TAB_YOUR_LANGUAGES languages = config.SELECTED_TAB_YOUR_LANGUAGES
@@ -227,7 +244,6 @@ 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
config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE)
view.printToTextbox_selectedYourLanguages(select) view.printToTextbox_selectedYourLanguages(select)
def setTargetLanguageAndCountry(select): def setTargetLanguageAndCountry(select):
@@ -237,7 +253,6 @@ 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
config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE)
view.printToTextbox_selectedTargetLanguages(select) view.printToTextbox_selectedTargetLanguages(select)
def swapYourLanguageAndTargetLanguage(): def swapYourLanguageAndTargetLanguage():
@@ -252,17 +267,26 @@ def swapYourLanguageAndTargetLanguage():
def callbackSelectedLanguagePresetTab(selected_tab_no): def callbackSelectedLanguagePresetTab(selected_tab_no):
config.SELECTED_TAB_NO = selected_tab_no config.SELECTED_TAB_NO = selected_tab_no
view.updateGuiVariableByPresetTabNo(config.SELECTED_TAB_NO) view.updateGuiVariableByPresetTabNo(config.SELECTED_TAB_NO)
engines = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES
engine = engines[config.SELECTED_TAB_NO]
config.CHOICE_INPUT_TRANSLATOR = engine
engines = config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES
engine = engines[config.SELECTED_TAB_NO]
config.CHOICE_OUTPUT_TRANSLATOR = engine
languages = config.SELECTED_TAB_YOUR_LANGUAGES languages = config.SELECTED_TAB_YOUR_LANGUAGES
select = languages[config.SELECTED_TAB_NO] select = languages[config.SELECTED_TAB_NO]
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
languages = config.SELECTED_TAB_TARGET_LANGUAGES languages = config.SELECTED_TAB_TARGET_LANGUAGES
select = languages[config.SELECTED_TAB_NO] select = languages[config.SELECTED_TAB_NO]
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
config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE)
view.printToTextbox_changedLanguagePresetTab(config.SELECTED_TAB_NO) view.printToTextbox_changedLanguagePresetTab(config.SELECTED_TAB_NO)
# command func # command func
@@ -392,7 +416,7 @@ def callbackSetUiLanguage(value):
def callbackSetDeeplAuthkey(value): def callbackSetDeeplAuthkey(value):
print("callbackSetDeeplAuthkey", str(value)) print("callbackSetDeeplAuthkey", str(value))
if len(value) == 39: if len(value) == 39:
result = model.authenticationTranslator(choice_translator="DeepL_API", auth_key=value) result = model.authenticationTranslatorDeepLAuthKey(auth_key=value)
if result is True: if result is True:
key = value key = value
view.printToTextbox_AuthenticationSuccess() view.printToTextbox_AuthenticationSuccess()
@@ -402,12 +426,10 @@ def callbackSetDeeplAuthkey(value):
auth_keys = config.AUTH_KEYS auth_keys = config.AUTH_KEYS
auth_keys["DeepL_API"] = key auth_keys["DeepL_API"] = key
config.AUTH_KEYS = auth_keys config.AUTH_KEYS = auth_keys
config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE)
elif len(value) == 0: elif len(value) == 0:
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
config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE)
# Transcription Tab (Mic) # Transcription Tab (Mic)
def callbackSetMicHost(value): def callbackSetMicHost(value):
@@ -703,15 +725,17 @@ def createMainWindow():
# init config # init config
initSetConfigByExeArguments() initSetConfigByExeArguments()
initSetTranslateEngine()
initSetLanguageAndCountry() initSetLanguageAndCountry()
if model.authenticationTranslator(config.CHOICE_TRANSLATOR, config.AUTH_KEYS[config.CHOICE_TRANSLATOR]) is False: # if (config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] == "DeepL_API" or
# error update Auth key # config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] == "DeepL_API"):
auth_keys = config.AUTH_KEYS # if model.authenticationTranslator("DeepL_API", config.AUTH_KEYS["DeepL_API"]) is False:
auth_keys[config.CHOICE_TRANSLATOR] = None # # error update Auth key
config.AUTH_KEYS = auth_keys # auth_keys = config.AUTH_KEYS
view.printToTextbox_AuthenticationError() # auth_keys["DeepL_API"] = None
config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) # config.AUTH_KEYS = auth_keys
# view.printToTextbox_AuthenticationError()
# set word filter # set word filter
model.addKeywords() model.addKeywords()

58
model.py
View File

@@ -83,13 +83,8 @@ class Model:
del self.keyword_processor del self.keyword_processor
self.keyword_processor = KeywordProcessor() self.keyword_processor = KeywordProcessor()
def authenticationTranslator(self, choice_translator=None, auth_key=None): def authenticationTranslatorDeepLAuthKey(self, auth_key):
if choice_translator is None: result = self.translator.authenticationDeepLAuthKey(auth_key)
choice_translator = config.CHOICE_TRANSLATOR
if auth_key is None:
auth_key = config.AUTH_KEYS[choice_translator]
result = self.translator.authentication(choice_translator, auth_key)
return result return result
def startLogger(self): def startLogger(self):
@@ -123,25 +118,25 @@ class Model:
country = parts[1][1:-1] country = parts[1][1:-1]
return language, country return language, country
def findTranslationEngine(self, source_lang, target_lang): # def findTranslationEngine(self, source_lang, target_lang):
compatible_engines = [] # compatible_engines = []
for engine in translatorEngine: # for engine in translatorEngine:
source_languages = translation_lang.get(engine, {}).get("source", {}) # source_languages = translation_lang.get(engine, {}).get("source", {})
target_languages = translation_lang.get(engine, {}).get("target", {}) # target_languages = translation_lang.get(engine, {}).get("target", {})
if source_lang in source_languages and target_lang in target_languages: # if source_lang in source_languages and target_lang in target_languages:
compatible_engines.append(engine) # compatible_engines.append(engine)
engine_name = compatible_engines[0] # engine_name = compatible_engines[0]
if engine_name == "DeepL" and config.AUTH_KEYS["DeepL_API"] is not None: # if engine_name == "DeepL" and config.AUTH_KEYS["DeepL_API"] is not None:
if self.authenticationTranslator(engine_name, config.AUTH_KEYS["DeepL_API"]) is True: # if self.authenticationTranslator(engine_name, config.AUTH_KEYS["DeepL_API"]) is True:
engine_name = "DeepL_API" # engine_name = "DeepL_API"
elif engine_name == "DeepL_API" and config.AUTH_KEYS["DeepL_API"] is None: # elif engine_name == "DeepL_API" and config.AUTH_KEYS["DeepL_API"] is None:
engine_name = "DeepL" # engine_name = "DeepL"
return engine_name # return engine_name
def getInputTranslate(self, message): def getInputTranslate(self, message):
translator_name=config.CHOICE_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
target_country = config.TARGET_COUNTRY target_country = config.TARGET_COUNTRY
@@ -157,19 +152,12 @@ class Model:
target_language = "Portuguese European" target_language = "Portuguese European"
else: else:
target_language = "Portuguese Brazilian" target_language = "Portuguese Brazilian"
elif translator_name == "DeepL": else:
if target_language in ["English American", "English British"]: if target_language in ["English American", "English British"]:
target_language = "English" target_language = "English"
elif target_language in ["Portuguese European", "Portuguese Brazilian"]: elif target_language in ["Portuguese European", "Portuguese Brazilian"]:
target_language = "Portuguese" target_language = "Portuguese"
# translation = self.translator.translate_ctranslate2(
# translator_name=translator_name,
# source_language=source_language,
# target_language=target_language,
# message=message
# )
translation = self.translator.translate( translation = self.translator.translate(
translator_name=translator_name, translator_name=translator_name,
source_language=source_language, source_language=source_language,
@@ -179,7 +167,7 @@ class Model:
return translation return translation
def getOutputTranslate(self, message): def getOutputTranslate(self, message):
translator_name=config.CHOICE_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
target_country = config.SOURCE_COUNTRY target_country = config.SOURCE_COUNTRY
@@ -195,18 +183,12 @@ class Model:
target_language = "Portuguese European" target_language = "Portuguese European"
else: else:
target_language = "Portuguese Brazilian" target_language = "Portuguese Brazilian"
elif translator_name == "DeepL": else:
if target_language in ["English American", "English British"]: if target_language in ["English American", "English British"]:
target_language = "English" target_language = "English"
elif target_language in ["Portuguese European", "Portuguese Brazilian"]: elif target_language in ["Portuguese European", "Portuguese Brazilian"]:
target_language = "Portuguese" target_language = "Portuguese"
# translation = self.translator.translate_ctranslate2(
# translator_name=translator_name,
# source_language=source_language,
# target_language=target_language,
# message=message
# )
translation = self.translator.translate( translation = self.translator.translate(
translator_name=translator_name, translator_name=translator_name,
source_language=source_language, source_language=source_language,

14
models/translation/translation_translator.py
View File

@@ -21,15 +21,13 @@ class Translator():
self.translator = ctranslate2.Translator(self.weight_path, device="cpu", device_index=0, compute_type="int8", inter_threads=1, intra_threads=4) self.translator = ctranslate2.Translator(self.weight_path, device="cpu", device_index=0, compute_type="int8", inter_threads=1, intra_threads=4)
self.tokenizer = transformers.AutoTokenizer.from_pretrained(tokenizer) self.tokenizer = transformers.AutoTokenizer.from_pretrained(tokenizer)
def authentication(self, translator_name, authkey=None): def authenticationDeepLAuthKey(self, authkey):
result = True result = True
match translator_name: try:
case "DeepL_API": self.deepl_client = deepl_Translator(authkey)
try: self.deepl_client.translate_text(" ", target_lang="EN-US")
self.deepl_client = deepl_Translator(authkey) except Exception:
self.deepl_client.translate_text(" ", target_lang="EN-US") result = False
except Exception:
result = False
return result return result
def translate(self, translator_name, source_language, target_language, message): def translate(self, translator_name, source_language, target_language, message):