From 23c2fa11190cd9aeffaec4b8694406498981d3c9 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 9 May 2024 11:51:24 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Model=20:=20?= =?UTF-8?q?=E7=BF=BB=E8=A8=B3=E5=87=A6=E7=90=86=E3=81=AE=E3=83=9E=E3=82=B9?= =?UTF-8?q?=E3=82=AF=E5=87=A6=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit まだ一部バグあり --- controller.py | 9 ++--- model.py | 36 ++++++++++++-------- models/translation/translation_translator.py | 23 +++++++++---- 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/controller.py b/controller.py index 47f15f66..634d3181 100644 --- a/controller.py +++ b/controller.py @@ -61,10 +61,11 @@ def messageFormatter(format_type:str, translation, message): return osc_message def changeToCTranslate2Process(): - config.CHOICE_INPUT_TRANSLATOR = "CTranslate2" - config.CHOICE_OUTPUT_TRANSLATOR = "CTranslate2" - updateTranslationEngineAndEngineList() - view.printToTextbox_TranslationEngineLimitError() + if config.CHOICE_INPUT_TRANSLATOR != "CTranslate2" or config.CHOICE_OUTPUT_TRANSLATOR != "CTranslate2": + config.CHOICE_INPUT_TRANSLATOR = "CTranslate2" + config.CHOICE_OUTPUT_TRANSLATOR = "CTranslate2" + updateTranslationEngineAndEngineList() + view.printToTextbox_TranslationEngineLimitError() # func transcription send message def sendMicMessage(message): diff --git a/model.py b/model.py index 487b55be..7d89a0a9 100644 --- a/model.py +++ b/model.py @@ -183,13 +183,17 @@ class Model: # 翻訳失敗時のフェールセーフ処理 if translation is False: translation_success_flag = False - translation = self.translator.translate( - translator_name="CTranslate2", - source_language=source_language, - target_language=target_language, - target_country=target_country, - message=message - ) + while True: + translation = self.translator.translate( + translator_name="CTranslate2", + source_language=source_language, + target_language=target_language, + target_country=target_country, + message=message + ) + if translation is not False: + break + sleep(0.1) return translation, translation_success_flag def getOutputTranslate(self, message): @@ -210,13 +214,17 @@ class Model: # 翻訳失敗時のフェールセーフ処理 if translation is False: translation_success_flag = False - translation = self.translator.translate( - translator_name="CTranslate2", - source_language=source_language, - target_language=target_language, - target_country=target_country, - message=message - ) + while True: + translation = self.translator.translate( + translator_name="CTranslate2", + source_language=source_language, + target_language=target_language, + target_country=target_country, + message=message + ) + if translation is not False: + break + sleep(0.1) return translation, translation_success_flag def addKeywords(self): diff --git a/models/translation/translation_translator.py b/models/translation/translation_translator.py index a71d0f55..d2717747 100644 --- a/models/translation/translation_translator.py +++ b/models/translation/translation_translator.py @@ -52,6 +52,18 @@ class Translator(): self.ctranslate2_translator = None self.ctranslate2_tokenizer = None + def translateCTranslate2(self, message, source_language, target_language): + try: + self.ctranslate2_tokenizer.src_lang = source_language + source = self.ctranslate2_tokenizer.convert_ids_to_tokens(self.ctranslate2_tokenizer.encode(message)) + target_prefix = [self.ctranslate2_tokenizer.lang_code_to_token[target_language]] + results = self.ctranslate2_translator.translate_batch([source], target_prefix=[target_prefix]) + target = results[0].hypotheses[0][1:] + result = self.ctranslate2_tokenizer.decode(self.ctranslate2_tokenizer.convert_tokens_to_ids(target)) + except Exception: + result = False + return result + @staticmethod def getLanguageCode(translator_name, target_country, source_language, target_language): match translator_name: @@ -115,12 +127,11 @@ class Translator(): to_language=target_language, ) case "CTranslate2": - self.ctranslate2_tokenizer.src_lang = source_language - source = self.ctranslate2_tokenizer.convert_ids_to_tokens(self.ctranslate2_tokenizer.encode(message)) - target_prefix = [self.ctranslate2_tokenizer.lang_code_to_token[target_language]] - results = self.ctranslate2_translator.translate_batch([source], target_prefix=[target_prefix]) - target = results[0].hypotheses[0][1:] - result = self.ctranslate2_tokenizer.decode(self.ctranslate2_tokenizer.convert_tokens_to_ids(target)) + result = self.translateCTranslate2( + message=message, + source_language=source_language, + target_language=target_language, + ) except Exception: import traceback with open('error.log', 'a') as f: From bbde617414d7e761de55f88c38a1f8aa5a65753d Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 9 May 2024 20:46:38 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Model=20:=20?= =?UTF-8?q?=E7=BF=BB=E8=A8=B3=E5=87=A6=E7=90=86=E3=81=AE=E3=83=9E=E3=82=B9?= =?UTF-8?q?=E3=82=AF=E5=87=A6=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller.py | 5 +-- model.py | 7 ++-- models/translation/translation_translator.py | 37 ++++++++++++-------- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/controller.py b/controller.py index 634d3181..cb826080 100644 --- a/controller.py +++ b/controller.py @@ -400,10 +400,11 @@ def callbackSelectedTranslationEngine(selected_translation_engine): def callbackToggleTranslation(is_turned_on): config.ENABLE_TRANSLATION = is_turned_on if config.ENABLE_TRANSLATION is True: - model.changeTranslatorCTranslate2Model() + if model.isLoadedCTranslate2Model() is False: + model.changeTranslatorCTranslate2Model() view.printToTextbox_enableTranslation() else: - model.clearTranslatorCTranslate2Model() + # model.clearTranslatorCTranslate2Model() view.printToTextbox_disableTranslation() def callbackToggleTranscriptionSend(is_turned_on): diff --git a/model.py b/model.py index 7d89a0a9..d5d5c3e7 100644 --- a/model.py +++ b/model.py @@ -103,8 +103,11 @@ class Model: def changeTranslatorCTranslate2Model(self): self.translator.changeCTranslate2Model(config.PATH_LOCAL, config.CTRANSLATE2_WEIGHT_TYPE) - def clearTranslatorCTranslate2Model(self): - self.translator.clearCTranslate2Model() + def isLoadedCTranslate2Model(self): + return self.translator.isLoadedCTranslate2Model() + + # def clearTranslatorCTranslate2Model(self): + # self.translator.clearCTranslate2Model() def checkTranscriptionWhisperModelWeight(self): return checkWhisperWeight(config.PATH_LOCAL, config.WHISPER_WEIGHT_TYPE) diff --git a/models/translation/translation_translator.py b/models/translation/translation_translator.py index d2717747..0ef71b88 100644 --- a/models/translation/translation_translator.py +++ b/models/translation/translation_translator.py @@ -14,6 +14,7 @@ class Translator(): self.deepl_client = None self.ctranslate2_translator = None self.ctranslate2_tokenizer = None + self.is_loaded_ctranslate2_model = False def authenticationDeepLAuthKey(self, authkey): result = True @@ -44,24 +45,30 @@ class Translator(): print("Error: changeCTranslate2Model()", e) tokenizer_path = os.path.join("./weights", "ctranslate2", directory_name, "tokenizer") self.ctranslate2_tokenizer = transformers.AutoTokenizer.from_pretrained(tokenizer, cache_dir=tokenizer_path) + self.is_loaded_ctranslate2_model = True - def clearCTranslate2Model(self): - del self.ctranslate2_translator - del self.ctranslate2_tokenizer - gc.collect() - self.ctranslate2_translator = None - self.ctranslate2_tokenizer = None + def isLoadedCTranslate2Model(self): + return self.is_loaded_ctranslate2_model + + # def clearCTranslate2Model(self): + # del self.ctranslate2_translator + # del self.ctranslate2_tokenizer + # gc.collect() + # self.ctranslate2_translator = None + # self.ctranslate2_tokenizer = None def translateCTranslate2(self, message, source_language, target_language): - try: - self.ctranslate2_tokenizer.src_lang = source_language - source = self.ctranslate2_tokenizer.convert_ids_to_tokens(self.ctranslate2_tokenizer.encode(message)) - target_prefix = [self.ctranslate2_tokenizer.lang_code_to_token[target_language]] - results = self.ctranslate2_translator.translate_batch([source], target_prefix=[target_prefix]) - target = results[0].hypotheses[0][1:] - result = self.ctranslate2_tokenizer.decode(self.ctranslate2_tokenizer.convert_tokens_to_ids(target)) - except Exception: - result = False + result = False + if self.is_loaded_ctranslate2_model is True: + try: + self.ctranslate2_tokenizer.src_lang = source_language + source = self.ctranslate2_tokenizer.convert_ids_to_tokens(self.ctranslate2_tokenizer.encode(message)) + target_prefix = [self.ctranslate2_tokenizer.lang_code_to_token[target_language]] + results = self.ctranslate2_translator.translate_batch([source], target_prefix=[target_prefix]) + target = results[0].hypotheses[0][1:] + result = self.ctranslate2_tokenizer.decode(self.ctranslate2_tokenizer.convert_tokens_to_ids(target)) + except Exception: + pass return result @staticmethod From cdea680f0807d0553754cb9b5bf8f9a2e4f319e5 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Fri, 10 May 2024 16:44:36 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model=20:?= =?UTF-8?q?=20translation=20=E3=83=A2=E3=83=87=E3=83=AB=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=89=E6=99=82=E3=81=AE=E3=83=9E=E3=82=B9=E3=82=AF=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit モデルデータをgcするコードを削除 重複する処理を関数化 --- controller.py | 1 - model.py | 94 +++++++++----------- models/translation/translation_translator.py | 9 +- 3 files changed, 44 insertions(+), 60 deletions(-) diff --git a/controller.py b/controller.py index cb826080..dc5ceef2 100644 --- a/controller.py +++ b/controller.py @@ -404,7 +404,6 @@ def callbackToggleTranslation(is_turned_on): model.changeTranslatorCTranslate2Model() view.printToTextbox_enableTranslation() else: - # model.clearTranslatorCTranslate2Model() view.printToTextbox_disableTranslation() def callbackToggleTranscriptionSend(is_turned_on): diff --git a/model.py b/model.py index d5d5c3e7..f350cfc7 100644 --- a/model.py +++ b/model.py @@ -106,9 +106,6 @@ class Model: def isLoadedCTranslate2Model(self): return self.translator.isLoadedCTranslate2Model() - # def clearTranslatorCTranslate2Model(self): - # self.translator.clearCTranslate2Model() - def checkTranscriptionWhisperModelWeight(self): return checkWhisperWeight(config.PATH_LOCAL, config.WHISPER_WEIGHT_TYPE) @@ -168,67 +165,62 @@ class Model: compatible_engines.remove('DeepL_API') return compatible_engines + def getTranslate(self, translator_name, source_language, target_language, target_country, message): + success_flag = False + 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 True: + success_flag = True + else: + while True: + translation = self.translator.translate( + translator_name="CTranslate2", + source_language=source_language, + target_language=target_language, + target_country=target_country, + message=message + ) + if translation is not False: + break + sleep(0.1) + return translation, success_flag + def getInputTranslate(self, message): - translation_success_flag = True translator_name=config.CHOICE_INPUT_TRANSLATOR source_language=config.SOURCE_LANGUAGE target_language=config.TARGET_LANGUAGE target_country = config.TARGET_COUNTRY - 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_success_flag = False - while True: - translation = self.translator.translate( - translator_name="CTranslate2", - source_language=source_language, - target_language=target_language, - target_country=target_country, - message=message - ) - if translation is not False: - break - sleep(0.1) - return translation, translation_success_flag + translation, success_flag = self.getTranslate( + translator_name, + source_language, + target_language, + target_country, + message + ) + return translation, success_flag def getOutputTranslate(self, message): - translation_success_flag = True translator_name=config.CHOICE_OUTPUT_TRANSLATOR source_language=config.TARGET_LANGUAGE target_language=config.SOURCE_LANGUAGE target_country=config.SOURCE_COUNTRY - 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_success_flag = False - while True: - translation = self.translator.translate( - translator_name="CTranslate2", - source_language=source_language, - target_language=target_language, - target_country=target_country, - message=message - ) - if translation is not False: - break - sleep(0.1) - return translation, translation_success_flag + translation, success_flag = self.getTranslate( + translator_name, + source_language, + target_language, + target_country, + message + ) + return translation, success_flag def addKeywords(self): for f in config.INPUT_MIC_WORD_FILTER: diff --git a/models/translation/translation_translator.py b/models/translation/translation_translator.py index 0ef71b88..56c5cf64 100644 --- a/models/translation/translation_translator.py +++ b/models/translation/translation_translator.py @@ -1,4 +1,3 @@ -import gc import os from deepl import Translator as deepl_Translator from translators import translate_text as other_web_Translator @@ -27,6 +26,7 @@ class Translator(): return result def changeCTranslate2Model(self, path, model_type): + self.is_loaded_ctranslate2_model = False directory_name = ctranslate2_weights[model_type]["directory_name"] tokenizer = ctranslate2_weights[model_type]["tokenizer"] weight_path = os.path.join(path, "weights", "ctranslate2", directory_name) @@ -50,13 +50,6 @@ class Translator(): def isLoadedCTranslate2Model(self): return self.is_loaded_ctranslate2_model - # def clearCTranslate2Model(self): - # del self.ctranslate2_translator - # del self.ctranslate2_tokenizer - # gc.collect() - # self.ctranslate2_translator = None - # self.ctranslate2_tokenizer = None - def translateCTranslate2(self, message, source_language, target_language): result = False if self.is_loaded_ctranslate2_model is True: