From 11ba04379d820ae1646602beb04748887d28acb8 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 19 Sep 2024 10:32:11 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model:=20?= =?UTF-8?q?=E7=BF=BB=E8=A8=B3=E8=A8=80=E8=AA=9E=E3=81=AEset=E9=96=A2?= =?UTF-8?q?=E6=95=B0=E3=81=AE=E5=BC=95=E6=95=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/webui_controller.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index b78b92e5..b4dd2eca 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -466,17 +466,13 @@ def setTargetTranslateEngine(select): def setYourLanguageAndCountry(select:dict, *args, **kwargs) -> dict: printLog("setYourLanguageAndCountry", select) - languages = config.SELECTED_TAB_YOUR_LANGUAGES - languages[config.SELECTED_TAB_NO] = select - config.SELECTED_TAB_YOUR_LANGUAGES = languages + config.SELECTED_TAB_YOUR_LANGUAGES = select updateTranslationEngineAndEngineList() return {"status":200, "result":config.SELECTED_TAB_YOUR_LANGUAGES} def setTargetLanguageAndCountry(select:dict, *args, **kwargs) -> dict: printLog("setTargetLanguageAndCountry", select) - languages = config.SELECTED_TAB_TARGET_LANGUAGES - languages[config.SELECTED_TAB_NO] = select - config.SELECTED_TAB_TARGET_LANGUAGES = languages + config.SELECTED_TAB_TARGET_LANGUAGES = select updateTranslationEngineAndEngineList() return {"status":200, "result":config.SELECTED_TAB_TARGET_LANGUAGES} From c752196a1c6daf27e712c05c20f22e258dcc9ca5 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 19 Sep 2024 10:55:58 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model:=20?= =?UTF-8?q?=E7=BF=BB=E8=A8=B3=E8=A8=80=E8=AA=9E=E3=81=AEset=E9=96=A2?= =?UTF-8?q?=E6=95=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/config.py | 30 +++++++----------------------- src-python/model.py | 4 ++-- src-python/webui_controller.py | 33 +++++++-------------------------- src-python/webui_mainloop.py | 5 ++--- 4 files changed, 18 insertions(+), 54 deletions(-) diff --git a/src-python/config.py b/src-python/config.py index 18d0e432..576ff20b 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -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", diff --git a/src-python/model.py b/src-python/model.py index 73f11a52..cee10773 100644 --- a/src-python/model.py +++ b/src-python/model.py @@ -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"] diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index b4dd2eca..49067713 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -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: diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 0e4b11f3..62b6c0d3 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -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}, From ae18c92a5a9955e166b0db741ad7b528af32862b Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 19 Sep 2024 11:43:24 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model:=20?= =?UTF-8?q?=E8=A8=80=E8=AA=9E=E3=82=B9=E3=83=AF=E3=83=83=E3=83=97=E3=81=AE?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E4=BF=AE=E6=AD=A3/=E5=BC=95?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=AD=A3=E3=81=AB=E4=BC=B4=E3=81=84=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=AE=E5=86=85=E5=AE=B9=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/webui_controller.py | 18 ++++---- src-python/webui_mainloop.py | 80 +++++++++++++++++++++++++++------- 2 files changed, 74 insertions(+), 24 deletions(-) diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index 49067713..ee7b0815 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -466,15 +466,17 @@ def setTargetLanguageAndCountry(select:dict, *args, **kwargs) -> dict: def swapYourLanguageAndTargetLanguage(*args, **kwargs) -> dict: printLog("swapYourLanguageAndTargetLanguage") - your_language = config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO] - your_language_primary = your_language["primary"] - target_language = config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO] - target_language_primary = target_language["primary"] + your_languages = config.SELECTED_TAB_YOUR_LANGUAGES + your_language_primary = your_languages[config.SELECTED_TAB_NO]["primary"] - your_language["primary"] = target_language_primary - target_language["primary"] = your_language_primary - setYourLanguageAndCountry(your_language) - setTargetLanguageAndCountry(target_language) + target_languages = config.SELECTED_TAB_TARGET_LANGUAGES + target_language_primary = target_languages[config.SELECTED_TAB_NO]["primary"] + + 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 { "status":200, "result":{ diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 62b6c0d3..35c352e1 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -398,7 +398,7 @@ if __name__ == "__main__": for key in controller_mapping.keys(): controller_mapping[key]["status"] = True - process = "main" + process = "test_all" match process: case "main": main.loop() @@ -425,29 +425,77 @@ if __name__ == "__main__": # handleControllerRequest("/controller/callback_enable_translation") # handleControllerRequest("/controller/callback_enable_convert_message_to_romaji") data = {"id":"123456", "message":"ใƒ†ใ‚นใƒˆ"} - case "/controller/callback_selected_translation_engine": - data = "DeepL" + case "/controller/callback_set_translation_engines": + data = { + "1":"CTranslate2", + "2":"CTranslate2", + "3":"CTranslate2", + } case "/controller/set_your_language_and_country": data = { - "primary": { + "1":{ + "primary":{ "language": "English", "country": "Hong Kong" - } + }, + }, + "2":{ + "primary":{ + "language":"Japanese", + "country":"Japan" + }, + }, + "3":{ + "primary":{ + "language":"Japanese", + "country":"Japan" + }, + }, } case "/controller/set_target_language_and_country": - data = { - "primary": { - "language": "Japanese", - "country": "Japan" + data ={ + "1":{ + "primary": { + "language": "Japanese", + "country": "Japan" + }, + "secondary": { + "language": "English", + "country": "United States" + }, + "tertiary": { + "language": "Chinese Simplified", + "country": "China" + } }, - "secondary": { - "language": "English", - "country": "United States" + "2":{ + "primary":{ + "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": data = 0.5 From 52fcd2bc29d343dbac713681982e02a632ed1176 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 19 Sep 2024 12:27:52 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Model=20:=20test=5Fa?= =?UTF-8?q?ll=20->=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/webui_mainloop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 35c352e1..491c4e80 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -398,7 +398,7 @@ if __name__ == "__main__": for key in controller_mapping.keys(): controller_mapping[key]["status"] = True - process = "test_all" + process = "main" match process: case "main": main.loop()