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

[Update] Model : deepl_translateを削除

Browse Source
This commit is contained in:
misyaguziya
2023-12-27 22:37:38 +09:00
parent 8463ccda69
commit a82435dc29
3 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
install.bat
View File

@@ -1,5 +1,4 @@
python.exe -m pip install --upgrade pip python.exe -m pip install --upgrade pip
pip install -r requirements.txt pip install -r requirements.txt
pip install git+https://github.com/misyaguziya/translators pip install git+https://github.com/misyaguziya/translators
pip install git+https://github.com/misyaguziya/deepl-translate
pip install git+https://github.com/misyaguziya/custom_speech_recognition pip install git+https://github.com/misyaguziya/custom_speech_recognition

17
model.py
View File

@@ -163,7 +163,14 @@ class Model:
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( # translation = self.translator.translate_ctranslate2(
# translator_name=translator_name,
# source_language=source_language,
# target_language=target_language,
# message=message
# )
translation = self.translator.translate(
translator_name=translator_name, translator_name=translator_name,
source_language=source_language, source_language=source_language,
target_language=target_language, target_language=target_language,
@@ -194,7 +201,13 @@ class Model:
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( # translation = self.translator.translate_ctranslate2(
# translator_name=translator_name,
# source_language=source_language,
# target_language=target_language,
# message=message
# )
translation = self.translator.translate(
translator_name=translator_name, translator_name=translator_name,
source_language=source_language, source_language=source_language,
target_language=target_language, target_language=target_language,

44
models/translation/translation_translator.py
View File

@@ -1,6 +1,5 @@
import os import os
from deepl import Translator as deepl_Translator from deepl import Translator as deepl_Translator
from deepl_translate import translate as deepl_web_Translator
from translators import translate_text as other_web_Translator from translators import translate_text as other_web_Translator
from .translation_languages import translation_lang from .translation_languages import translation_lang
@@ -40,10 +39,11 @@ class Translator():
target_language=translation_lang[translator_name]["target"][target_language] target_language=translation_lang[translator_name]["target"][target_language]
match translator_name: match translator_name:
case "DeepL": case "DeepL":
result = deepl_web_Translator( result = other_web_Translator(
source_language=source_language, query_text=message,
target_language=target_language, translator="deepl",
text=message from_language=source_language,
to_language=target_language,
) )
case "DeepL_API": case "DeepL_API":
result = self.deepl_client.translate_text( result = self.deepl_client.translate_text(
@@ -65,6 +65,20 @@ class Translator():
from_language=source_language, from_language=source_language,
to_language=target_language, to_language=target_language,
) )
case "Papago":
result = other_web_Translator(
query_text=message,
translator="papago",
from_language=source_language,
to_language=target_language,
)
case "CTranslate2":
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))
except Exception: except Exception:
import traceback import traceback
with open('error.log', 'a') as f: with open('error.log', 'a') as f:
@@ -72,16 +86,16 @@ class Translator():
result = False result = False
return result return result
def translate_ctranslate2(self, translator_name, source_language, target_language, message): # def translate_ctranslate2(self, translator_name, source_language, target_language, message):
source_language=translation_lang["ctranslate2"]["source"][source_language] # source_language=translation_lang["ctranslate2"]["source"][source_language]
target_language=translation_lang["ctranslate2"]["target"][target_language] # target_language=translation_lang["ctranslate2"]["target"][target_language]
self.tokenizer.src_lang = source_language # self.tokenizer.src_lang = source_language
source = self.tokenizer.convert_ids_to_tokens(self.tokenizer.encode(message)) # source = self.tokenizer.convert_ids_to_tokens(self.tokenizer.encode(message))
target_prefix = [self.tokenizer.lang_code_to_token[target_language]] # target_prefix = [self.tokenizer.lang_code_to_token[target_language]]
results = self.translator.translate_batch([source], target_prefix=[target_prefix]) # results = self.translator.translate_batch([source], target_prefix=[target_prefix])
target = results[0].hypotheses[0][1:] # target = results[0].hypotheses[0][1:]
result = self.tokenizer.decode(self.tokenizer.convert_tokens_to_ids(target)) # result = self.tokenizer.decode(self.tokenizer.convert_tokens_to_ids(target))
return result # return result