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

Merge branch 'model_getset' into for_webui

Browse Source
This commit is contained in:
misyaguziya
2024-09-19 12:28:08 +09:00
parent adfaed1eb1 52fcd2bc29
commit 16f63c3e20
4 changed files with 93 additions and 83 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) saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property @property
@json_serializable('SELECTED_TAB_YOUR_TRANSLATOR_ENGINES') @json_serializable('SELECTED_TRANSLATOR_ENGINES')
def SELECTED_TAB_YOUR_TRANSLATOR_ENGINES(self): def SELECTED_TRANSLATOR_ENGINES(self):
return self._SELECTED_TAB_YOUR_TRANSLATOR_ENGINES return self._SELECTED_TRANSLATOR_ENGINES
@SELECTED_TAB_YOUR_TRANSLATOR_ENGINES.setter @SELECTED_TRANSLATOR_ENGINES.setter
def SELECTED_TAB_YOUR_TRANSLATOR_ENGINES(self, value): def SELECTED_TRANSLATOR_ENGINES(self, value):
if isinstance(value, dict): if isinstance(value, dict):
self._SELECTED_TAB_YOUR_TRANSLATOR_ENGINES = value self._SELECTED_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
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property @property
@@ -1021,12 +1010,7 @@ class Config:
# Save Json Data # Save Json Data
## Main Window ## Main Window
self._SELECTED_TAB_NO = "1" self._SELECTED_TAB_NO = "1"
self._SELECTED_TAB_YOUR_TRANSLATOR_ENGINES = { self._SELECTED_TRANSLATOR_ENGINES= {
"1":"CTranslate2",
"2":"CTranslate2",
"3":"CTranslate2",
}
self._SELECTED_TAB_TARGET_TRANSLATOR_ENGINES = {
"1":"CTranslate2", "1":"CTranslate2",
"2":"CTranslate2", "2":"CTranslate2",
"3":"CTranslate2", "3":"CTranslate2",

4
src-python/model.py
View File

@@ -213,7 +213,7 @@ class Model:
return translation, success_flag return translation, success_flag
def getInputTranslate(self, message): 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"] source_language=config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
target_languages=config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO] target_languages=config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO]
@@ -237,7 +237,7 @@ class Model:
return translations, success_flags return translations, success_flags
def getOutputTranslate(self, message): 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"] 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_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"] target_country=config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["country"]

59
src-python/webui_controller.py
View File

@@ -81,8 +81,7 @@ def messageFormatter(format_type:str, translation:list, message:list):
return osc_message return osc_message
def changeToCTranslate2Process(): def changeToCTranslate2Process():
config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = "CTranslate2" config.SELECTED_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = "CTranslate2"
config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = "CTranslate2"
# func transcription send message # func transcription send message
class MicMessage: class MicMessage:
@@ -447,50 +446,37 @@ def getTranslationEngines(*args, **kwargs) -> dict:
return {"status":200, "result":engines} return {"status":200, "result":engines}
def updateTranslationEngineAndEngineList(): 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"] engines = getTranslationEngines()["result"]
if engine not in engines: if engine not in engines:
engine = engines[0] engine = engines[0]
config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = engine config.SELECTED_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
def setYourLanguageAndCountry(select:dict, *args, **kwargs) -> dict: def setYourLanguageAndCountry(select:dict, *args, **kwargs) -> dict:
printLog("setYourLanguageAndCountry", select) printLog("setYourLanguageAndCountry", select)
languages = config.SELECTED_TAB_YOUR_LANGUAGES config.SELECTED_TAB_YOUR_LANGUAGES = select
languages[config.SELECTED_TAB_NO] = select
config.SELECTED_TAB_YOUR_LANGUAGES = languages
updateTranslationEngineAndEngineList() updateTranslationEngineAndEngineList()
return {"status":200, "result":config.SELECTED_TAB_YOUR_LANGUAGES} return {"status":200, "result":config.SELECTED_TAB_YOUR_LANGUAGES}
def setTargetLanguageAndCountry(select:dict, *args, **kwargs) -> dict: def setTargetLanguageAndCountry(select:dict, *args, **kwargs) -> dict:
printLog("setTargetLanguageAndCountry", select) printLog("setTargetLanguageAndCountry", select)
languages = config.SELECTED_TAB_TARGET_LANGUAGES config.SELECTED_TAB_TARGET_LANGUAGES = select
languages[config.SELECTED_TAB_NO] = select
config.SELECTED_TAB_TARGET_LANGUAGES = languages
updateTranslationEngineAndEngineList() updateTranslationEngineAndEngineList()
return {"status":200, "result":config.SELECTED_TAB_TARGET_LANGUAGES} return {"status":200, "result":config.SELECTED_TAB_TARGET_LANGUAGES}
def swapYourLanguageAndTargetLanguage(*args, **kwargs) -> dict: def swapYourLanguageAndTargetLanguage(*args, **kwargs) -> dict:
printLog("swapYourLanguageAndTargetLanguage") printLog("swapYourLanguageAndTargetLanguage")
your_language = config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO] your_languages = config.SELECTED_TAB_YOUR_LANGUAGES
your_language_primary = your_language["primary"] your_language_primary = your_languages[config.SELECTED_TAB_NO]["primary"]
target_language = config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO]
target_language_primary = target_language["primary"]
your_language["primary"] = target_language_primary target_languages = config.SELECTED_TAB_TARGET_LANGUAGES
target_language["primary"] = your_language_primary target_language_primary = target_languages[config.SELECTED_TAB_NO]["primary"]
setYourLanguageAndCountry(your_language)
setTargetLanguageAndCountry(target_language) your_languages[config.SELECTED_TAB_NO]["primary"] = target_language_primary
target_languages[config.SELECTED_TAB_NO]["primary"] = your_language_primary
setYourLanguageAndCountry(your_languages)
setTargetLanguageAndCountry(target_languages)
return { return {
"status":200, "status":200,
"result":{ "result":{
@@ -505,17 +491,10 @@ def callbackSelectedLanguagePresetTab(selected_tab_no:str, *args, **kwargs) -> d
updateTranslationEngineAndEngineList() updateTranslationEngineAndEngineList()
return {"status":200, "result":config.SELECTED_TAB_NO} return {"status":200, "result":config.SELECTED_TAB_NO}
def callbackSelectedTranslationEngine(selected_translation_engine:str, *args, **kwargs) -> dict: def callbackSetSelectedTranslationEngines(engines:dict, *args, **kwargs) -> dict:
printLog("callbackSelectedTranslationEngine", selected_translation_engine) printLog("callbackSelectedTranslationEngine", engines)
setYourTranslateEngine(selected_translation_engine) config.SELECTED_TRANSLATOR_ENGINES = engines
setTargetTranslateEngine(selected_translation_engine) return {"status":200,"result":{config.SELECTED_TRANSLATOR_ENGINES}}
return {
"status":200,
"result":{
"your":config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES,
"target":config.SELECTED_TAB_TARGET_TRANSLATOR_ENGINES
}
}
# command func # command func
def callbackEnableTranslation(*args, **kwargs) -> dict: def callbackEnableTranslation(*args, **kwargs) -> dict:

83
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_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/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_no": {"status": True, "variable":"SELECTED_TAB_NO"},
"/config/selected_tab_your_translator_engines": {"status": False, "variable":"SELECTED_TAB_YOUR_TRANSLATOR_ENGINES"}, "/config/selected_translator_engines": {"status": False, "variable":"SELECTED_TRANSLATOR_ENGINES"},
"/config/selected_tab_target_translator_engines": {"status": False, "variable":"SELECTED_TAB_TARGET_TRANSLATOR_ENGINES"},
"/config/selected_tab_your_languages": {"status": True, "variable":"SELECTED_TAB_YOUR_LANGUAGES"}, "/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_tab_target_languages": {"status": True, "variable":"SELECTED_TAB_TARGET_LANGUAGES"},
"/config/selected_transcription_engine": {"status": False, "variable":"SELECTED_TRANSCRIPTION_ENGINE"}, "/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/swap_your_language_and_target_language": {"status": True, "variable":controller.swapYourLanguageAndTargetLanguage},
"/controller/callback_selected_language_preset_tab": {"status": True, "variable":controller.callbackSelectedLanguagePresetTab}, "/controller/callback_selected_language_preset_tab": {"status": True, "variable":controller.callbackSelectedLanguagePresetTab},
"/controller/list_translation_engines": {"status": True, "variable":controller.getTranslationEngines}, "/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_transparency": {"status": True, "variable":controller.callbackSetTransparency},
"/controller/callback_set_appearance": {"status": True, "variable":controller.callbackSetAppearance}, "/controller/callback_set_appearance": {"status": True, "variable":controller.callbackSetAppearance},
"/controller/callback_set_ui_scaling": {"status": True, "variable":controller.callbackSetUiScaling}, "/controller/callback_set_ui_scaling": {"status": True, "variable":controller.callbackSetUiScaling},
@@ -426,29 +425,77 @@ if __name__ == "__main__":
# handleControllerRequest("/controller/callback_enable_translation") # handleControllerRequest("/controller/callback_enable_translation")
# handleControllerRequest("/controller/callback_enable_convert_message_to_romaji") # handleControllerRequest("/controller/callback_enable_convert_message_to_romaji")
data = {"id":"123456", "message":"テスト"} data = {"id":"123456", "message":"テスト"}
case "/controller/callback_selected_translation_engine": case "/controller/callback_set_translation_engines":
data = "DeepL" data = {
"1":"CTranslate2",
"2":"CTranslate2",
"3":"CTranslate2",
}
case "/controller/set_your_language_and_country": case "/controller/set_your_language_and_country":
data = { data = {
"primary": { "1":{
"primary":{
"language": "English", "language": "English",
"country": "Hong Kong" "country": "Hong Kong"
} },
},
"2":{
"primary":{
"language":"Japanese",
"country":"Japan"
},
},
"3":{
"primary":{
"language":"Japanese",
"country":"Japan"
},
},
} }
case "/controller/set_target_language_and_country": case "/controller/set_target_language_and_country":
data = { data ={
"primary": { "1":{
"language": "Japanese", "primary": {
"country": "Japan" "language": "Japanese",
"country": "Japan"
},
"secondary": {
"language": "English",
"country": "United States"
},
"tertiary": {
"language": "Chinese Simplified",
"country": "China"
}
}, },
"secondary": { "2":{
"language": "English", "primary":{
"country": "United States" "language":"English",
"country":"United States",
},
"secondary":{
"language":"English",
"country":"United States"
},
"tertiary":{
"language":"English",
"country":"United States"
},
},
"3":{
"primary":{
"language":"English",
"country":"United States",
},
"secondary":{
"language":"English",
"country":"United States"
},
"tertiary":{
"language":"English",
"country":"United States"
},
}, },
"tertiary": {
"language": "Chinese Simplified",
"country": "China"
}
} }
case "/controller/callback_set_transparency": case "/controller/callback_set_transparency":
data = 0.5 data = 0.5