From 08c79d8ed82f88aa0e5802647112f8c950edd8cd Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 26 Sep 2024 07:35:09 +0900 Subject: [PATCH] =?UTF-8?q?[Update/Refactor]=20=E7=BF=BB=E8=A8=B3=E3=82=A8?= =?UTF-8?q?=E3=83=B3=E3=82=B8=E3=83=B3=E5=91=A8=E3=82=8A:=20=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E4=B8=AD=E3=81=AE=E7=BF=BB=E8=A8=B3=E3=82=A8=E3=83=B3?= =?UTF-8?q?=E3=82=B8=E3=83=B3=E7=B3=BB=E3=81=AEendpoint=E5=90=8D=E3=82=92?= =?UTF-8?q?=E7=B5=B1=E4=B8=80=E3=80=82=20=E8=A8=80=E8=AA=9E=E5=88=87?= =?UTF-8?q?=E6=9B=BF=E6=99=82=E3=80=81=E9=81=B8=E6=8A=9E=E4=B8=AD=E3=81=AE?= =?UTF-8?q?=E3=83=97=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E7=95=AA=E5=8F=B7?= =?UTF-8?q?=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=81=A7=E3=81=AF=E3=81=AA=E3=81=8F?= =?UTF-8?q?=E3=80=81=E5=85=A8=E3=81=A6=E3=81=AE=E3=83=97=E3=83=AA=E3=82=BB?= =?UTF-8?q?=E3=83=83=E3=83=88=E7=95=AA=E5=8F=B7=E5=88=86=E3=81=AE=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=82=82=E9=80=81=E3=82=8B=E3=81=93=E3=81=A8=E3=81=A7?= =?UTF-8?q?=E4=BB=96=E3=81=A8=E7=B5=B1=E4=B8=80=E3=80=82=20=E4=BB=A5?= =?UTF-8?q?=E4=B8=8A=E3=81=AB=E4=BC=B4=E3=81=84=E3=80=81UI=E5=81=B4?= =?UTF-8?q?=E3=81=A7endpoint=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=82=84=E3=80=81?= =?UTF-8?q?=E7=BF=BB=E8=A8=B3=E3=82=A8=E3=83=B3=E3=82=B8=E3=83=B3=E3=83=AA?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=82=92=E9=96=8B=E3=81=8F=E5=BA=A6=E3=81=AB?= =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E9=83=A8=E5=88=86=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/webui_controller.py | 6 +++--- src-python/webui_mainloop.py | 6 +++--- .../TranslatorSelectorOpenButton.jsx | 2 -- .../translator_selector/TranslatorSelector.jsx | 2 +- src-ui/logics/main/useLanguageSettings.js | 2 +- src-ui/logics/useReceiveRoutes.js | 16 +++++++++++++--- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index 49433bea..6c6bd299 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -426,8 +426,8 @@ class Controller: return {"status":200, "result":config.SELECTED_TRANSLATION_ENGINES} @staticmethod - def setSelectedTranslatorEngines(engines:dict, *args, **kwargs) -> dict: - printLog("setSelectedTranslatorEngines", engines) + def setSelectedTranslationEngines(engines:dict, *args, **kwargs) -> dict: + printLog("setSelectedTranslationEngines", engines) config.SELECTED_TRANSLATION_ENGINES = engines return {"status":200,"result":config.SELECTED_TRANSLATION_ENGINES} @@ -1512,7 +1512,7 @@ class Controller: if engine not in engines: engine = engines[0] config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO] = engine - self.run(200, self.run_mapping["selected_translation_engine"], engine) + self.run(200, self.run_mapping["selected_translation_engines"], config.SELECTED_TRANSLATION_ENGINES) self.run(200, self.run_mapping["translation_engines"], engines) @staticmethod diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 57da7aa2..25ff20cc 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -29,7 +29,7 @@ run_mapping = { "selected_mic_device":"/run/selected_mic_device", "selected_speaker_device":"/run/selected_speaker_device", - "selected_translation_engine":"/run/selected_translation_engine", + "selected_translation_engines":"/run/selected_translation_engines", "translation_engines":"/run/translation_engines", "mic_host_list":"/run/mic_host_list", @@ -72,7 +72,7 @@ mapping = { "/get/data/selectable_language_list": {"status": True, "variable":controller.getListLanguageAndCountry}, "/get/data/selected_translation_engines": {"status": False, "variable":controller.getSelectedTranslationEngines}, - "/set/data/selected_translator_engines": {"status": True, "variable":controller.setSelectedTranslatorEngines}, + "/set/data/selected_translation_engines": {"status": True, "variable":controller.setSelectedTranslationEngines}, "/get/data/selected_your_languages": {"status": True, "variable":controller.getSelectedYourLanguages}, "/set/data/selected_your_languages": {"status": True, "variable":controller.setSelectedYourLanguages}, @@ -413,7 +413,7 @@ if __name__ == "__main__": # handleRequest("/set/enable/translation") # handleRequest("/set/enable/convert_message_to_romaji") data = {"id":"123456", "message":"ใƒ†ใ‚นใƒˆ"} - case "/set/data/selected_translator_engines": + case "/set/data/selected_translation_engines": data = { "1":"CTranslate2", "2":"CTranslate2", diff --git a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx index 8647c58a..ff063cbf 100644 --- a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx +++ b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx @@ -10,7 +10,6 @@ export const TranslatorSelectorOpenButton = () => { const { currentSelectedPresetTabNumber, currentTranslationEngines, - getTranslationEngines, currentSelectedTranslationEngines, } = useLanguageSettings(); @@ -24,7 +23,6 @@ export const TranslatorSelectorOpenButton = () => { const { currentIsOpenedTranslatorSelector, updateIsOpenedTranslatorSelector} = useStore_IsOpenedTranslatorSelector(); const openTranslatorSelector = () => { - getTranslationEngines(); updateIsOpenedTranslatorSelector(!currentIsOpenedTranslatorSelector.data); }; diff --git a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx index b47561b5..5368f988 100644 --- a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx +++ b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx @@ -35,7 +35,7 @@ const TranslatorBox = (props) => { const box_class_name = clsx( styles.box, - { [styles["is_selected"]]: (currentSelectedTranslationEngines[currentSelectedPresetTabNumber.data] === props.translator_id) ? true : false }, + { [styles["is_selected"]]: (currentSelectedTranslationEngines.data[currentSelectedPresetTabNumber.data] === props.translator_id) ? true : false }, { [styles["is_available"]]: (props.is_available === true) ? true : false } ); diff --git a/src-ui/logics/main/useLanguageSettings.js b/src-ui/logics/main/useLanguageSettings.js index fdd3b668..067fdcf4 100644 --- a/src-ui/logics/main/useLanguageSettings.js +++ b/src-ui/logics/main/useLanguageSettings.js @@ -101,7 +101,7 @@ export const useLanguageSettings = () => { pendingSelectedTranslationEngines(); let send_obj = currentSelectedTranslationEngines.data; send_obj[currentSelectedPresetTabNumber.data] = selected_translator; - asyncStdoutToPython("/set/data/selected_translator_engines", send_obj); + asyncStdoutToPython("/set/data/selected_translation_engines", send_obj); }; const runLanguageSwap = () => { diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index 406a7b31..7d529eb3 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -95,6 +95,7 @@ export const useReceiveRoutes = () => { "/set/data/selected_your_languages": updateSelectedYourLanguages, "/get/data/selected_target_languages": updateSelectedTargetLanguages, "/set/data/selected_target_languages": updateSelectedTargetLanguages, + "/get/data/translation_engines": (payload) => { const updateTranslatorAvailability = (keys) => { return translator_status.map(translator => ({ @@ -102,13 +103,22 @@ export const useReceiveRoutes = () => { is_available: keys.includes(translator.translator_id), })); }; - const updated_list = updateTranslatorAvailability(payload); - + updateTranslationEngines(updated_list); + }, + "/run/translation_engines": (payload) => { + const updateTranslatorAvailability = (keys) => { + return translator_status.map(translator => ({ + ...translator, + is_available: keys.includes(translator.translator_id), + })); + }; + const updated_list = updateTranslatorAvailability(payload); updateTranslationEngines(updated_list); }, "/get/data/selected_translation_engines": updateSelectedTranslationEngines, - "/set/data/selected_translator_engines": updateSelectedTranslationEngines, + "/set/data/selected_translation_engines": updateSelectedTranslationEngines, + "/run/selected_translation_engines": updateSelectedTranslationEngines, "/run/swap_your_language_and_target_language": (payload) => { updateSelectedYourLanguages(payload.your);