diff --git a/controller.py b/controller.py index 2082840e..d8dfc1fb 100644 --- a/controller.py +++ b/controller.py @@ -22,8 +22,6 @@ def sendMicMessage(message): return elif config.ENABLE_TRANSLATION is False: pass - elif model.getTranslatorStatus() is False: - view.printToTextbox_AuthenticationError() else: translation = model.getInputTranslate(message) if translation == False: @@ -88,8 +86,6 @@ def receiveSpeakerMessage(message): translation = "" if config.ENABLE_TRANSLATION is False: pass - elif model.getTranslatorStatus() is False: - view.printToTextbox_AuthenticationError() else: translation = model.getOutputTranslate(message) if translation == False: @@ -156,8 +152,6 @@ def sendChatMessage(message): translation = "" if config.ENABLE_TRANSLATION is False: pass - elif model.getTranslatorStatus() is False: - view.printToTextbox_AuthenticationError() else: translation = model.getInputTranslate(message) if translation == False: @@ -215,7 +209,6 @@ def initSetLanguageAndCountry(): config.TARGET_LANGUAGE = language config.TARGET_COUNTRY = country config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) - model.authenticationTranslator() def setYourLanguageAndCountry(select): languages = config.SELECTED_TAB_YOUR_LANGUAGES @@ -225,7 +218,6 @@ def setYourLanguageAndCountry(select): config.SOURCE_LANGUAGE = language config.SOURCE_COUNTRY = country config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) - model.authenticationTranslator() view.printToTextbox_selectedYourLanguages(select) def setTargetLanguageAndCountry(select): @@ -236,7 +228,6 @@ def setTargetLanguageAndCountry(select): config.TARGET_LANGUAGE = language config.TARGET_COUNTRY = country config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) - model.authenticationTranslator() view.printToTextbox_selectedTargetLanguages(select) def callbackSelectedLanguagePresetTab(selected_tab_no): @@ -253,7 +244,6 @@ def callbackSelectedLanguagePresetTab(selected_tab_no): config.TARGET_LANGUAGE = language config.TARGET_COUNTRY = country config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) - model.authenticationTranslator() view.printToTextbox_changedLanguagePresetTab(config.SELECTED_TAB_NO) # command func @@ -377,21 +367,23 @@ def callbackSetUiLanguage(value): # Translation Tab def callbackSetDeeplAuthkey(value): print("callbackSetDeeplAuthkey", str(value)) - if len(value) > 0: + if len(value) == 39: result = model.authenticationTranslator(choice_translator="DeepL_API", auth_key=value) if result is True: - auth_keys = config.AUTH_KEYS - auth_keys["DeepL_API"] = value - config.AUTH_KEYS = auth_keys + key = value view.printToTextbox_AuthenticationSuccess() + else: + key = None + view.printToTextbox_AuthenticationError() + auth_keys = config.AUTH_KEYS + auth_keys["DeepL_API"] = key + config.AUTH_KEYS = auth_keys config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) elif len(value) == 0: auth_keys = config.AUTH_KEYS auth_keys["DeepL_API"] = None config.AUTH_KEYS = auth_keys config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) - else: - view.printToTextbox_AuthenticationError() # Transcription Tab (Mic) def callbackSetMicHost(value): @@ -638,11 +630,13 @@ def createMainWindow(): # init config initSetLanguageAndCountry() - if model.authenticationTranslator() is False: + if model.authenticationTranslator(config.CHOICE_TRANSLATOR, config.AUTH_KEYS[config.CHOICE_TRANSLATOR]) is False: # error update Auth key + auth_keys = config.AUTH_KEYS + auth_keys[config.CHOICE_TRANSLATOR] = None + config.AUTH_KEYS = auth_keys view.printToTextbox_AuthenticationError() config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) - model.authenticationTranslator() # set word filter model.addKeywords() diff --git a/model.py b/model.py index 8f25c706..8d0f0083 100644 --- a/model.py +++ b/model.py @@ -121,8 +121,7 @@ class Model: country = parts[1][1:-1] return language, country - @staticmethod - def findTranslationEngine(source_lang, target_lang): + def findTranslationEngine(self, source_lang, target_lang): compatible_engines = [] for engine in translatorEngine: source_languages = translation_lang.get(engine, {}).get("source", {}) @@ -132,16 +131,15 @@ class Model: engine_name = compatible_engines[0] if engine_name == "DeepL" and config.AUTH_KEYS["DeepL_API"] != None: - engine_name = "DeepL_API" + if self.authenticationTranslator(engine_name, config.AUTH_KEYS["DeepL_API"]) is True: + engine_name = "DeepL_API" elif engine_name == "DeepL_API" and config.AUTH_KEYS["DeepL_API"] == None: engine_name = "DeepL" return engine_name - def getTranslatorStatus(self): - return self.translator.translator_status[config.CHOICE_TRANSLATOR] - def getInputTranslate(self, message): + print(config.CHOICE_TRANSLATOR, config.AUTH_KEYS) if config.CHOICE_TRANSLATOR == "DeepL_API": if config.TARGET_LANGUAGE == "English": if config.TARGET_COUNTRY in ["United States", "Canada", "Philippines"]: @@ -153,6 +151,11 @@ class Model: config.TARGET_LANGUAGE = "Portuguese European" else: config.TARGET_LANGUAGE = "Portuguese Brazilian" + elif config.CHOICE_TRANSLATOR == "DeepL": + if config.TARGET_LANGUAGE in ["English American", "English British"]: + config.TARGET_LANGUAGE = "English" + elif config.TARGET_LANGUAGE in ["Portuguese European", "Portuguese Brazilian"]: + config.TARGET_COUNTRY = "Portugal" translation = self.translator.translate( translator_name=config.CHOICE_TRANSLATOR, @@ -174,6 +177,11 @@ class Model: config.SOURCE_LANGUAGE = "Portuguese European" else: config.SOURCE_LANGUAGE = "Portuguese Brazilian" + elif config.CHOICE_TRANSLATOR == "DeepL": + if config.SOURCE_LANGUAGE in ["English American", "English British"]: + config.SOURCE_LANGUAGE = "English" + elif config.SOURCE_LANGUAGE in ["Portuguese European", "Portuguese Brazilian"]: + config.SOURCE_COUNTRY = "Portugal" translation = self.translator.translate( translator_name=config.CHOICE_TRANSLATOR, diff --git a/models/translation/translation_translator.py b/models/translation/translation_translator.py index bcca750f..81bd0ef5 100644 --- a/models/translation/translation_translator.py +++ b/models/translation/translation_translator.py @@ -6,34 +6,22 @@ from .translation_languages import translatorEngine, translation_lang # Translator class Translator(): def __init__(self): + pass self.translator_status = {} - for translator in translatorEngine: - self.translator_status[translator] = False - self.deepl_client = None def authentication(self, translator_name, authkey=None): - result = False + result = True match translator_name: - case "DeepL": - self.translator_status[translator_name] = True - result = True case "DeepL_API": try: self.deepl_client = deepl_Translator(authkey) self.deepl_client.translate_text(" ", target_lang="EN-US") - self.translator_status[translator_name] = True - result = True except: - self.translator_status[translator_name] = False - case "Google": - self.translator_status[translator_name] = True - result = True - case "Bing": - self.translator_status[translator_name] = True - result = True + result = False return result def translate(self, translator_name, source_language, target_language, message): + print(translator_name, source_language, target_language, message) try: result = "" source_language=translation_lang[translator_name]["source"][source_language]