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

Merge branch 'update_translation_engines' into for_webui

Browse Source
This commit is contained in:
Sakamoto Shiina
2024-09-26 07:39:26 +09:00
parent 8f7300598c 08c79d8ed8
commit 321c9cbe45
6 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src-python/webui_controller.py
View File

@@ -426,8 +426,8 @@ class Controller:
return {"status":200, "result":config.SELECTED_TRANSLATION_ENGINES} return {"status":200, "result":config.SELECTED_TRANSLATION_ENGINES}
@staticmethod @staticmethod
def setSelectedTranslatorEngines(engines:dict, *args, **kwargs) -> dict: def setSelectedTranslationEngines(engines:dict, *args, **kwargs) -> dict:
printLog("setSelectedTranslatorEngines", engines) printLog("setSelectedTranslationEngines", engines)
config.SELECTED_TRANSLATION_ENGINES = engines config.SELECTED_TRANSLATION_ENGINES = engines
return {"status":200,"result":config.SELECTED_TRANSLATION_ENGINES} return {"status":200,"result":config.SELECTED_TRANSLATION_ENGINES}
@@ -1512,7 +1512,7 @@ class Controller:
if engine not in engines: if engine not in engines:
engine = engines[0] engine = engines[0]
config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO] = engine 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) self.run(200, self.run_mapping["translation_engines"], engines)
@staticmethod @staticmethod

6
src-python/webui_mainloop.py
View File

@@ -29,7 +29,7 @@ run_mapping = {
"selected_mic_device":"/run/selected_mic_device", "selected_mic_device":"/run/selected_mic_device",
"selected_speaker_device":"/run/selected_speaker_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", "translation_engines":"/run/translation_engines",
"mic_host_list":"/run/mic_host_list", "mic_host_list":"/run/mic_host_list",
@@ -72,7 +72,7 @@ mapping = {
"/get/data/selectable_language_list": {"status": True, "variable":controller.getListLanguageAndCountry}, "/get/data/selectable_language_list": {"status": True, "variable":controller.getListLanguageAndCountry},
"/get/data/selected_translation_engines": {"status": False, "variable":controller.getSelectedTranslationEngines}, "/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}, "/get/data/selected_your_languages": {"status": True, "variable":controller.getSelectedYourLanguages},
"/set/data/selected_your_languages": {"status": True, "variable":controller.setSelectedYourLanguages}, "/set/data/selected_your_languages": {"status": True, "variable":controller.setSelectedYourLanguages},
@@ -413,7 +413,7 @@ if __name__ == "__main__":
# handleRequest("/set/enable/translation") # handleRequest("/set/enable/translation")
# handleRequest("/set/enable/convert_message_to_romaji") # handleRequest("/set/enable/convert_message_to_romaji")
data = {"id":"123456", "message":"テスト"} data = {"id":"123456", "message":"テスト"}
case "/set/data/selected_translator_engines": case "/set/data/selected_translation_engines":
data = { data = {
"1":"CTranslate2", "1":"CTranslate2",
"2":"CTranslate2", "2":"CTranslate2",

2
src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx
View File

@@ -10,7 +10,6 @@ export const TranslatorSelectorOpenButton = () => {
const { const {
currentSelectedPresetTabNumber, currentSelectedPresetTabNumber,
currentTranslationEngines, currentTranslationEngines,
getTranslationEngines,
currentSelectedTranslationEngines, currentSelectedTranslationEngines,
} = useLanguageSettings(); } = useLanguageSettings();
@@ -24,7 +23,6 @@ export const TranslatorSelectorOpenButton = () => {
const { currentIsOpenedTranslatorSelector, updateIsOpenedTranslatorSelector} = useStore_IsOpenedTranslatorSelector(); const { currentIsOpenedTranslatorSelector, updateIsOpenedTranslatorSelector} = useStore_IsOpenedTranslatorSelector();
const openTranslatorSelector = () => { const openTranslatorSelector = () => {
getTranslationEngines();
updateIsOpenedTranslatorSelector(!currentIsOpenedTranslatorSelector.data); updateIsOpenedTranslatorSelector(!currentIsOpenedTranslatorSelector.data);
}; };

2
src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx
View File

@@ -35,7 +35,7 @@ const TranslatorBox = (props) => {
const box_class_name = clsx( const box_class_name = clsx(
styles.box, 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 } { [styles["is_available"]]: (props.is_available === true) ? true : false }
); );

2
src-ui/logics/main/useLanguageSettings.js
View File

@@ -101,7 +101,7 @@ export const useLanguageSettings = () => {
pendingSelectedTranslationEngines(); pendingSelectedTranslationEngines();
let send_obj = currentSelectedTranslationEngines.data; let send_obj = currentSelectedTranslationEngines.data;
send_obj[currentSelectedPresetTabNumber.data] = selected_translator; send_obj[currentSelectedPresetTabNumber.data] = selected_translator;
asyncStdoutToPython("/set/data/selected_translator_engines", send_obj); asyncStdoutToPython("/set/data/selected_translation_engines", send_obj);
}; };
const runLanguageSwap = () => { const runLanguageSwap = () => {

16
src-ui/logics/useReceiveRoutes.js
View File

@@ -95,6 +95,7 @@ export const useReceiveRoutes = () => {
"/set/data/selected_your_languages": updateSelectedYourLanguages, "/set/data/selected_your_languages": updateSelectedYourLanguages,
"/get/data/selected_target_languages": updateSelectedTargetLanguages, "/get/data/selected_target_languages": updateSelectedTargetLanguages,
"/set/data/selected_target_languages": updateSelectedTargetLanguages, "/set/data/selected_target_languages": updateSelectedTargetLanguages,
"/get/data/translation_engines": (payload) => { "/get/data/translation_engines": (payload) => {
const updateTranslatorAvailability = (keys) => { const updateTranslatorAvailability = (keys) => {
return translator_status.map(translator => ({ return translator_status.map(translator => ({
@@ -102,13 +103,22 @@ export const useReceiveRoutes = () => {
is_available: keys.includes(translator.translator_id), is_available: keys.includes(translator.translator_id),
})); }));
}; };
const updated_list = updateTranslatorAvailability(payload); 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); updateTranslationEngines(updated_list);
}, },
"/get/data/selected_translation_engines": updateSelectedTranslationEngines, "/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) => { "/run/swap_your_language_and_target_language": (payload) => {
updateSelectedYourLanguages(payload.your); updateSelectedYourLanguages(payload.your);