👍[Update] Model : 翻訳失敗時にCTranslate2での翻訳処理を追加修正

不要なコードを削除

model.py

@@ -1,4 +1,3 @@
-import tempfile
 from zipfile import ZipFile
 from subprocess import Popen
 from os import makedirs as os_makedirs
@@ -10,10 +9,9 @@ from logging import getLogger, FileHandler, Formatter, INFO
 from time import sleep
 from queue import Queue
 from threading import Thread, Event
-from requests import get as requests_get, head as requests_head
+from requests import get as requests_get
 import webbrowser
 
-from tqdm import tqdm
 from flashtext import KeywordProcessor
 from models.translation.translation_translator import Translator
 from models.transcription.transcription_utils import getInputDevices, getDefaultOutputDevice
@@ -68,7 +66,7 @@ class Model:
 
     def resetTranslator(self):
         del self.translator
-        self.translator = Translator(config.PATH_LOCAL)
+        self.translator = Translator(config.PATH_LOCAL, config.CTRANSLATE2_WEIGHTS[config.WEIGHT_TYPE])
 
     def resetKeywordProcessor(self):
         del self.keyword_processor
@@ -101,8 +99,6 @@ class Model:
         for tl_key in tl_keys:
             for lang in translation_lang[tl_key]["source"]:
                 translation_langs.append(lang)
-            for lang in translation_lang[tl_key]["target"]:
-                translation_langs.append(lang)
         translation_langs = list(set(translation_langs))
         supported_langs = list(filter(lambda x: x in transcription_langs, translation_langs))
 
@@ -122,81 +118,70 @@ class Model:
     def findTranslationEngines(self, source_lang, target_lang):
         compatible_engines = []
         for engine in translatorEngine:
-            source_languages = translation_lang.get(engine, {}).get("source", {})
+            languages = translation_lang.get(engine, {}).get("source", {})
-            target_languages = translation_lang.get(engine, {}).get("target", {})
+            if source_lang in languages and target_lang in languages:
-            if source_lang in source_languages and target_lang in target_languages:
                 compatible_engines.append(engine)
+        if "DeepL_API" in compatible_engines:
+            if self.translator.deepl_client is None:
+                compatible_engines.remove('DeepL_API')
         return compatible_engines
 
-    def getInputTranslate(self, message):
+    def getInputTranslate(self, message, fnc=None):
         translator_name=config.CHOICE_INPUT_TRANSLATOR
         source_language=config.SOURCE_LANGUAGE
         target_language=config.TARGET_LANGUAGE
         target_country = config.TARGET_COUNTRY
 
-        if translator_name == "DeepL_API":
-            if target_language == "English":
-                if target_country in ["United States", "Canada", "Philippines"]:
-                    target_language = "English American"
-                else:
-                    target_language = "English British"
-            elif target_language == "Portuguese":
-                if target_country in ["Portugal"]:
-                    target_language = "Portuguese European"
-                else:
-                    target_language = "Portuguese Brazilian"
-        else:
-            if target_language in ["English American", "English British"]:
-                target_language = "English"
-            elif target_language in ["Portuguese European", "Portuguese Brazilian"]:
-                target_language = "Portuguese"
-
         translation = self.translator.translate(
                         translator_name=translator_name,
                         source_language=source_language,
                         target_language=target_language,
+                        target_country=target_country,
                         message=message
                 )
+
+        # 翻訳失敗時のフェールセーフ処理
+        if translation is False:
+            translation = self.translator.translate(
+                                translator_name="CTranslate2",
+                                source_language=source_language,
+                                target_language=target_language,
+                                target_country=target_country,
+                                message=message
+                        )
+            try:
+                fnc()
+            except Exception:
+                pass
         return translation
 
-    def getOutputTranslate(self, message):
+    def getOutputTranslate(self, message, fnc=None):
         translator_name=config.CHOICE_OUTPUT_TRANSLATOR
         source_language=config.TARGET_LANGUAGE
         target_language=config.SOURCE_LANGUAGE
         target_country=config.SOURCE_COUNTRY
 
-        if translator_name == "DeepL_API":
-            if target_language == "English":
-                if target_country in ["United States", "Canada", "Philippines"]:
-                    target_language = "English American"
-                else:
-                    target_language = "English British"
-            elif target_language == "Portuguese":
-                if target_country in ["Portugal"]:
-                    target_language = "Portuguese European"
-                else:
-                    target_language = "Portuguese Brazilian"
-        else:
-            if target_language in ["English American", "English British"]:
-                target_language = "English"
-            elif target_language in ["Portuguese European", "Portuguese Brazilian"]:
-                target_language = "Portuguese"
-
         translation = self.translator.translate(
                         translator_name=translator_name,
                         source_language=source_language,
                         target_language=target_language,
+                        target_country=target_country,
                         message=message
                 )
 
         # 翻訳失敗時のフェールセーフ処理
-        if translation is False and "Filipino":
+        if translation is False:
             translation = self.translator.translate(
                                 translator_name="CTranslate2",
-                                source_language=config.TARGET_LANGUAGE,
+                                source_language=source_language,
-                                target_language=config.SOURCE_LANGUAGE,
+                                target_language=target_language,
+                                target_country=target_country,
                                 message=message
                         )
+            try:
+                fnc()
+            except Exception:
+                pass
         return translation
 
     def addKeywords(self):

models/translation/translation_languages.py

@@ -360,7 +360,7 @@ dict_ctranslate2_languages = {
     'Luxembourgish': 'lb',
     'Myanmar': 'my',
     'Tibetan': 'bo',
-    'Tagalog': 'tl',
+    'Filipino': 'tl',
     'Malagasy': 'mg',
     'Assamese': 'as',
     'Tatar': 'tt',
@@ -372,7 +372,7 @@ dict_ctranslate2_languages = {
     'Sundanese': 'su'
 }
 
-translation_lang["ctranslate2"] = {
+translation_lang["CTranslate2"] = {
     "source":dict_ctranslate2_languages,
     "target":dict_ctranslate2_languages,
 }

models/translation/translation_translator.py

@@ -20,6 +20,7 @@ class Translator():
         self.weight_path = os.path.join(path, "weight", directory_name)
         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.deepl_client = None
 
     def authenticationDeepLAuthKey(self, authkey):
         result = True
@@ -27,10 +28,11 @@ class Translator():
             self.deepl_client = deepl_Translator(authkey)
             self.deepl_client.translate_text(" ", target_lang="EN-US")
         except Exception:
+            self.deepl_client = None
             result = False
         return result
 
-    def translate(self, translator_name, source_language, target_language, message):
+    def translate(self, translator_name, source_language, target_language, target_country, message):
         try:
             result = ""
             source_language=translation_lang[translator_name]["source"][source_language]
@@ -44,6 +46,19 @@ class Translator():
                         to_language=target_language,
                         )
                 case "DeepL_API":
+                    if self.deepl_client is None:
+                        result = False
+                    else:
+                        if target_language == "English":
+                            if target_country in ["United States", "Canada", "Philippines"]:
+                                target_language = "English American"
+                            else:
+                                target_language = "English British"
+                        elif target_language == "Portuguese":
+                            if target_country in ["Portugal"]:
+                                target_language = "Portuguese European"
+                            else:
+                                target_language = "Portuguese Brazilian"
                         result = self.deepl_client.translate_text(
                             message,
                             source_lang=source_language,
@@ -83,17 +98,3 @@ class Translator():
                 traceback.print_exc(file=f)
             result = False
         return result
-
-    # def translate_ctranslate2(self, translator_name, source_language, target_language, message):
-
-    #     source_language=translation_lang["ctranslate2"]["source"][source_language]
-    #     target_language=translation_lang["ctranslate2"]["target"][target_language]
-
-    #     self.tokenizer.src_lang = source_language
-    #     source = self.tokenizer.convert_ids_to_tokens(self.tokenizer.encode(message))
-    #     target_prefix = [self.tokenizer.lang_code_to_token[target_language]]
-    #     results = self.translator.translate_batch([source], target_prefix=[target_prefix])
-    #     target = results[0].hypotheses[0][1:]
-
-    #     result = self.tokenizer.decode(self.tokenizer.convert_tokens_to_ids(target))
-    #     return result