🐛[bugfix] Model : 翻訳処理のマスク処理

This commit is contained in:
misyaguziya
2024-05-09 20:46:38 +09:00
parent 23c2fa1119
commit bbde617414
3 changed files with 30 additions and 19 deletions

View File

@@ -400,10 +400,11 @@ def callbackSelectedTranslationEngine(selected_translation_engine):
def callbackToggleTranslation(is_turned_on): def callbackToggleTranslation(is_turned_on):
config.ENABLE_TRANSLATION = is_turned_on config.ENABLE_TRANSLATION = is_turned_on
if config.ENABLE_TRANSLATION is True: if config.ENABLE_TRANSLATION is True:
if model.isLoadedCTranslate2Model() is False:
model.changeTranslatorCTranslate2Model() model.changeTranslatorCTranslate2Model()
view.printToTextbox_enableTranslation() view.printToTextbox_enableTranslation()
else: else:
model.clearTranslatorCTranslate2Model() # model.clearTranslatorCTranslate2Model()
view.printToTextbox_disableTranslation() view.printToTextbox_disableTranslation()
def callbackToggleTranscriptionSend(is_turned_on): def callbackToggleTranscriptionSend(is_turned_on):

View File

@@ -103,8 +103,11 @@ class Model:
def changeTranslatorCTranslate2Model(self): def changeTranslatorCTranslate2Model(self):
self.translator.changeCTranslate2Model(config.PATH_LOCAL, config.CTRANSLATE2_WEIGHT_TYPE) self.translator.changeCTranslate2Model(config.PATH_LOCAL, config.CTRANSLATE2_WEIGHT_TYPE)
def clearTranslatorCTranslate2Model(self): def isLoadedCTranslate2Model(self):
self.translator.clearCTranslate2Model() return self.translator.isLoadedCTranslate2Model()
# def clearTranslatorCTranslate2Model(self):
# self.translator.clearCTranslate2Model()
def checkTranscriptionWhisperModelWeight(self): def checkTranscriptionWhisperModelWeight(self):
return checkWhisperWeight(config.PATH_LOCAL, config.WHISPER_WEIGHT_TYPE) return checkWhisperWeight(config.PATH_LOCAL, config.WHISPER_WEIGHT_TYPE)

View File

@@ -14,6 +14,7 @@ class Translator():
self.deepl_client = None self.deepl_client = None
self.ctranslate2_translator = None self.ctranslate2_translator = None
self.ctranslate2_tokenizer = None self.ctranslate2_tokenizer = None
self.is_loaded_ctranslate2_model = False
def authenticationDeepLAuthKey(self, authkey): def authenticationDeepLAuthKey(self, authkey):
result = True result = True
@@ -44,15 +45,21 @@ class Translator():
print("Error: changeCTranslate2Model()", e) print("Error: changeCTranslate2Model()", e)
tokenizer_path = os.path.join("./weights", "ctranslate2", directory_name, "tokenizer") tokenizer_path = os.path.join("./weights", "ctranslate2", directory_name, "tokenizer")
self.ctranslate2_tokenizer = transformers.AutoTokenizer.from_pretrained(tokenizer, cache_dir=tokenizer_path) self.ctranslate2_tokenizer = transformers.AutoTokenizer.from_pretrained(tokenizer, cache_dir=tokenizer_path)
self.is_loaded_ctranslate2_model = True
def clearCTranslate2Model(self): def isLoadedCTranslate2Model(self):
del self.ctranslate2_translator return self.is_loaded_ctranslate2_model
del self.ctranslate2_tokenizer
gc.collect() # def clearCTranslate2Model(self):
self.ctranslate2_translator = None # del self.ctranslate2_translator
self.ctranslate2_tokenizer = None # del self.ctranslate2_tokenizer
# gc.collect()
# self.ctranslate2_translator = None
# self.ctranslate2_tokenizer = None
def translateCTranslate2(self, message, source_language, target_language): def translateCTranslate2(self, message, source_language, target_language):
result = False
if self.is_loaded_ctranslate2_model is True:
try: try:
self.ctranslate2_tokenizer.src_lang = source_language self.ctranslate2_tokenizer.src_lang = source_language
source = self.ctranslate2_tokenizer.convert_ids_to_tokens(self.ctranslate2_tokenizer.encode(message)) source = self.ctranslate2_tokenizer.convert_ids_to_tokens(self.ctranslate2_tokenizer.encode(message))
@@ -61,7 +68,7 @@ class Translator():
target = results[0].hypotheses[0][1:] target = results[0].hypotheses[0][1:]
result = self.ctranslate2_tokenizer.decode(self.ctranslate2_tokenizer.convert_tokens_to_ids(target)) result = self.ctranslate2_tokenizer.decode(self.ctranslate2_tokenizer.convert_tokens_to_ids(target))
except Exception: except Exception:
result = False pass
return result return result
@staticmethod @staticmethod