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

👍️[Update] Model: 翻訳言語のset関数を修正

Browse Source
This commit is contained in:
misyaguziya
2024-09-19 10:55:58 +09:00
parent 11ba04379d
commit c752196a1c
4 changed files with 18 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src-python/config.py
View File

@@ -229,25 +229,14 @@ class Config:
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property
@json_serializable('SELECTED_TAB_YOUR_TRANSLATOR_ENGINES')
def SELECTED_TAB_YOUR_TRANSLATOR_ENGINES(self):
return self._SELECTED_TAB_YOUR_TRANSLATOR_ENGINES
@json_serializable('SELECTED_TRANSLATOR_ENGINES')
def SELECTED_TRANSLATOR_ENGINES(self):
return self._SELECTED_TRANSLATOR_ENGINES
@SELECTED_TAB_YOUR_TRANSLATOR_ENGINES.setter
def SELECTED_TAB_YOUR_TRANSLATOR_ENGINES(self, value):
@SELECTED_TRANSLATOR_ENGINES.setter
def SELECTED_TRANSLATOR_ENGINES(self, value):
if isinstance(value, dict):
self._SELECTED_TAB_YOUR_TRANSLATOR_ENGINES = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property
@json_serializable('SELECTED_TAB_TARGET_TRANSLATOR_ENGINES')
def SELECTED_TAB_TARGET_TRANSLATOR_ENGINES(self):
return self._SELECTED_TAB_TARGET_TRANSLATOR_ENGINES
@SELECTED_TAB_TARGET_TRANSLATOR_ENGINES.setter
def SELECTED_TAB_TARGET_TRANSLATOR_ENGINES(self, value):
if isinstance(value, dict):
self._SELECTED_TAB_TARGET_TRANSLATOR_ENGINES = value
self._SELECTED_TRANSLATOR_ENGINES = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property
@@ -1021,12 +1010,7 @@ class Config:
# Save Json Data
## Main Window
self._SELECTED_TAB_NO = "1"
self._SELECTED_TAB_YOUR_TRANSLATOR_ENGINES = {
"1":"CTranslate2",
"2":"CTranslate2",
"3":"CTranslate2",
}
self._SELECTED_TAB_TARGET_TRANSLATOR_ENGINES = {
self._SELECTED_TRANSLATOR_ENGINES= {
"1":"CTranslate2",
"2":"CTranslate2",
"3":"CTranslate2",

4
src-python/model.py
View File

@@ -213,7 +213,7 @@ class Model:
return translation, success_flag
def getInputTranslate(self, message):
translator_name=config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
translator_name=config.SELECTED_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
source_language=config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
target_languages=config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO]
@@ -237,7 +237,7 @@ class Model:
return translations, success_flags
def getOutputTranslate(self, message):
translator_name=config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
translator_name=config.SELECTED_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
source_language=config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
target_language=config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
target_country=config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["country"]

33
src-python/webui_controller.py
View File

@@ -81,8 +81,7 @@ def messageFormatter(format_type:str, translation:list, message:list):
return osc_message
def changeToCTranslate2Process():
config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = "CTranslate2"
config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = "CTranslate2"
config.SELECTED_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = "CTranslate2"
# func transcription send message
class MicMessage:
@@ -447,22 +446,11 @@ def getTranslationEngines(*args, **kwargs) -> dict:
return {"status":200, "result":engines}
def updateTranslationEngineAndEngineList():
engine = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
engine = config.SELECTED_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO]
engines = getTranslationEngines()["result"]
if engine not in engines:
engine = engines[0]
config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = engine
config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = engine
def setYourTranslateEngine(select):
engines = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES
engines[config.SELECTED_TAB_NO] = select
config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES = engines
def setTargetTranslateEngine(select):
engines = config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES
engines[config.SELECTED_TAB_NO] = select
config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES = engines
config.SELECTED_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = engine
def setYourLanguageAndCountry(select:dict, *args, **kwargs) -> dict:
printLog("setYourLanguageAndCountry", select)
@@ -501,17 +489,10 @@ def callbackSelectedLanguagePresetTab(selected_tab_no:str, *args, **kwargs) -> d
updateTranslationEngineAndEngineList()
return {"status":200, "result":config.SELECTED_TAB_NO}
def callbackSelectedTranslationEngine(selected_translation_engine:str, *args, **kwargs) -> dict:
printLog("callbackSelectedTranslationEngine", selected_translation_engine)
setYourTranslateEngine(selected_translation_engine)
setTargetTranslateEngine(selected_translation_engine)
return {
"status":200,
"result":{
"your":config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES,
"target":config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES
}
}
def callbackSetSelectedTranslationEngines(engines:dict, *args, **kwargs) -> dict:
printLog("callbackSelectedTranslationEngine", engines)
config.SELECTED_TRANSLATOR_ENGINES = engines
return {"status":200,"result":{config.SELECTED_TRANSLATOR_ENGINES}}
# command func
def callbackEnableTranslation(*args, **kwargs) -> dict:

5
src-python/webui_mainloop.py
View File

@@ -25,8 +25,7 @@ config_mapping = {
# "/config/is_reset_button_displayed_for_translation": {"status": True, "variable":"IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION"},
# "/config/is_reset_button_displayed_for_whisper": {"status": True, "variable":"IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER"},
"/config/selected_tab_no": {"status": True, "variable":"SELECTED_TAB_NO"},
"/config/selected_tab_your_translator_engines": {"status": False, "variable":"SELECTED_TAB_YOUR_TRANSLATOR_ENGINES"},
"/config/selected_tab_target_translator_engines": {"status": False, "variable":"SELECTED_TAB_TARGET_TRANSLATOR_ENGINES"},
"/config/selected_translator_engines": {"status": False, "variable":"SELECTED_TRANSLATOR_ENGINES"},
"/config/selected_tab_your_languages": {"status": True, "variable":"SELECTED_TAB_YOUR_LANGUAGES"},
"/config/selected_tab_target_languages": {"status": True, "variable":"SELECTED_TAB_TARGET_LANGUAGES"},
"/config/selected_transcription_engine": {"status": False, "variable":"SELECTED_TRANSCRIPTION_ENGINE"},
@@ -124,7 +123,7 @@ controller_mapping = {
"/controller/swap_your_language_and_target_language": {"status": True, "variable":controller.swapYourLanguageAndTargetLanguage},
"/controller/callback_selected_language_preset_tab": {"status": True, "variable":controller.callbackSelectedLanguagePresetTab},
"/controller/list_translation_engines": {"status": True, "variable":controller.getTranslationEngines},
"/controller/callback_selected_translation_engine": {"status": True, "variable":controller.callbackSelectedTranslationEngine},
"/controller/callback_set_translation_engines": {"status": True, "variable":controller.callbackSetSelectedTranslationEngines},
"/controller/callback_set_transparency": {"status": True, "variable":controller.callbackSetTransparency},
"/controller/callback_set_appearance": {"status": True, "variable":controller.callbackSetAppearance},
"/controller/callback_set_ui_scaling": {"status": True, "variable":controller.callbackSetUiScaling},