diff --git a/src-python/config.py b/src-python/config.py index 047ec968..870f4640 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -99,8 +99,8 @@ class Config: return self._SELECTABLE_WHISPER_WEIGHT_TYPE_DICT @property - def MAX_MIC_ENERGY_THRESHOLD(self): - return self._MAX_MIC_ENERGY_THRESHOLD + def MAX_MIC_THRESHOLD(self): + return self._MAX_MIC_THRESHOLD @property def MAX_SPEAKER_ENERGY_THRESHOLD(self): @@ -229,14 +229,14 @@ class Config: saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @property - @json_serializable('SELECTED_TRANSLATOR_ENGINES') - def SELECTED_TRANSLATOR_ENGINES(self): - return self._SELECTED_TRANSLATOR_ENGINES + @json_serializable('SELECTED_TRANSLATION_ENGINES') + def SELECTED_TRANSLATION_ENGINES(self): + return self._SELECTED_TRANSLATION_ENGINES - @SELECTED_TRANSLATOR_ENGINES.setter - def SELECTED_TRANSLATOR_ENGINES(self, value): + @SELECTED_TRANSLATION_ENGINES.setter + def SELECTED_TRANSLATION_ENGINES(self, value): if isinstance(value, dict): - self._SELECTED_TRANSLATOR_ENGINES = value + self._SELECTED_TRANSLATION_ENGINES = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @property @@ -475,25 +475,25 @@ class Config: saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @property - @json_serializable('MIC_ENERGY_THRESHOLD') - def MIC_ENERGY_THRESHOLD(self): - return self._MIC_ENERGY_THRESHOLD + @json_serializable('MIC_THRESHOLD') + def MIC_THRESHOLD(self): + return self._MIC_THRESHOLD - @MIC_ENERGY_THRESHOLD.setter - def MIC_ENERGY_THRESHOLD(self, value): + @MIC_THRESHOLD.setter + def MIC_THRESHOLD(self, value): if isinstance(value, int): - self._MIC_ENERGY_THRESHOLD = value + self._MIC_THRESHOLD = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @property - @json_serializable('MIC_DYNAMIC_ENERGY_THRESHOLD') - def MIC_DYNAMIC_ENERGY_THRESHOLD(self): - return self._MIC_DYNAMIC_ENERGY_THRESHOLD + @json_serializable('MIC_AUTOMATIC_THRESHOLD') + def MIC_AUTOMATIC_THRESHOLD(self): + return self._MIC_AUTOMATIC_THRESHOLD - @MIC_DYNAMIC_ENERGY_THRESHOLD.setter - def MIC_DYNAMIC_ENERGY_THRESHOLD(self, value): + @MIC_AUTOMATIC_THRESHOLD.setter + def MIC_AUTOMATIC_THRESHOLD(self, value): if isinstance(value, bool): - self._MIC_DYNAMIC_ENERGY_THRESHOLD = value + self._MIC_AUTOMATIC_THRESHOLD = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @property @@ -596,14 +596,14 @@ class Config: saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @property - @json_serializable('SPEAKER_DYNAMIC_ENERGY_THRESHOLD') - def SPEAKER_DYNAMIC_ENERGY_THRESHOLD(self): - return self._SPEAKER_DYNAMIC_ENERGY_THRESHOLD + @json_serializable('SPEAKER_AUTOMATIC_THRESHOLD') + def SPEAKER_AUTOMATIC_THRESHOLD(self): + return self._SPEAKER_AUTOMATIC_THRESHOLD - @SPEAKER_DYNAMIC_ENERGY_THRESHOLD.setter - def SPEAKER_DYNAMIC_ENERGY_THRESHOLD(self, value): + @SPEAKER_AUTOMATIC_THRESHOLD.setter + def SPEAKER_AUTOMATIC_THRESHOLD(self, value): if isinstance(value, bool): - self._SPEAKER_DYNAMIC_ENERGY_THRESHOLD = value + self._SPEAKER_AUTOMATIC_THRESHOLD = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @property @@ -931,14 +931,14 @@ class Config: @property - @json_serializable('LOGGER') - def LOGGER(self): - return self._LOGGER + @json_serializable('LOGGER_FEATURE') + def LOGGER_FEATURE(self): + return self._LOGGER_FEATURE - @LOGGER.setter - def LOGGER(self, value): + @LOGGER_FEATURE.setter + def LOGGER_FEATURE(self, value): if isinstance(value, bool): - self._LOGGER = value + self._LOGGER_FEATURE = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @property @@ -990,7 +990,7 @@ class Config: "large-v3": "large-v3", } - self._MAX_MIC_ENERGY_THRESHOLD = 2000 + self._MAX_MIC_THRESHOLD = 2000 self._MAX_SPEAKER_ENERGY_THRESHOLD = 4000 # Read Write @@ -1010,7 +1010,7 @@ class Config: # Save Json Data ## Main Window self._SELECTED_TAB_NO = "1" - self._SELECTED_TRANSLATOR_ENGINES= { + self._SELECTED_TRANSLATION_ENGINES= { "1":"CTranslate2", "2":"CTranslate2", "3":"CTranslate2", @@ -1103,8 +1103,8 @@ class Config: self._AUTO_MIC_SELECT = True self._SELECTED_MIC_HOST = device_manager.getDefaultInputDevice()["host"]["name"] self._SELECTED_MIC_DEVICE = device_manager.getDefaultInputDevice()["device"]["name"] - self._MIC_ENERGY_THRESHOLD = 300 - self._MIC_DYNAMIC_ENERGY_THRESHOLD = False + self._MIC_THRESHOLD = 300 + self._MIC_AUTOMATIC_THRESHOLD = False self._MIC_RECORD_TIMEOUT = 3 self._MIC_PHRASE_TIMEOUT = 3 self._MIC_MAX_PHRASES = 10 @@ -1114,7 +1114,7 @@ class Config: self._AUTO_SPEAKER_SELECT = True self._SELECTED_SPEAKER_DEVICE = device_manager.getDefaultOutputDevice()["device"]["name"] self._SPEAKER_ENERGY_THRESHOLD = 300 - self._SPEAKER_DYNAMIC_ENERGY_THRESHOLD = False + self._SPEAKER_AUTOMATIC_THRESHOLD = False self._SPEAKER_RECORD_TIMEOUT = 3 self._SPEAKER_PHRASE_TIMEOUT = 3 self._SPEAKER_MAX_PHRASES = 10 @@ -1156,7 +1156,7 @@ class Config: self._SEND_MESSAGE_TO_VRC = True self._SEND_RECEIVED_MESSAGE_TO_VRC = False # Speaker2Chatbox self._SPEAKER2CHATBOX_PASS = "000000000" - self._LOGGER = False + self._LOGGER_FEATURE = False self._VRC_MIC_MUTE_SYNC = False def load_config(self): diff --git a/src-python/controller.py b/src-python/controller.py index ec46dbbe..36aa0c4b 100644 --- a/src-python/controller.py +++ b/src-python/controller.py @@ -97,7 +97,7 @@ def sendMicMessage(message): view.printToTextbox_SentMessage(message, translation) - if config.ENABLE_LOGGER is True: + if config.ENABLE_LOGGER_FEATURE is True: if len(translation) > 0: translation = f" ({translation})" model.logger.info(f"[SENT] {message}{translation}") @@ -179,7 +179,7 @@ def receiveSpeakerMessage(message): # update textbox message log (Received) view.printToTextbox_ReceivedMessage(message, translation) - if config.ENABLE_LOGGER is True: + if config.ENABLE_LOGGER_FEATURE is True: if len(translation) > 0: translation = f" ({translation})" model.logger.info(f"[RECEIVED] {message}{translation}") @@ -252,7 +252,7 @@ def sendChatMessage(message): # update textbox message log (Sent) view.printToTextbox_SentMessage(message, translation) - if config.ENABLE_LOGGER is True: + if config.ENABLE_LOGGER_FEATURE is True: if len(translation) > 0: translation = f" ({translation})" model.logger.info(f"[SENT] {message}{translation}") @@ -627,10 +627,10 @@ def callbackSetMicEnergyThreshold(value): return try: value = int(value) - if 0 <= value and value <= config.MAX_MIC_ENERGY_THRESHOLD: + if 0 <= value and value <= config.MAX_MIC_THRESHOLD: view.clearNotificationMessage() - config.INPUT_MIC_ENERGY_THRESHOLD = value - view.setGuiVariable_MicEnergyThreshold(config.INPUT_MIC_ENERGY_THRESHOLD) + config.INPUT_MIC_THRESHOLD = value + view.setGuiVariable_MicEnergyThreshold(config.INPUT_MIC_THRESHOLD) else: raise ValueError() except Exception: @@ -638,8 +638,8 @@ def callbackSetMicEnergyThreshold(value): def callbackSetMicDynamicEnergyThreshold(value): print("callbackSetMicDynamicEnergyThreshold", value) - config.INPUT_MIC_DYNAMIC_ENERGY_THRESHOLD = value - if config.INPUT_MIC_DYNAMIC_ENERGY_THRESHOLD is True: + config.INPUT_MIC_AUTOMATIC_THRESHOLD = value + if config.INPUT_MIC_AUTOMATIC_THRESHOLD is True: view.closeMicEnergyThresholdWidget() else: view.openMicEnergyThresholdWidget() @@ -763,8 +763,8 @@ def callbackSetSpeakerEnergyThreshold(value): def callbackSetSpeakerDynamicEnergyThreshold(value): print("callbackSetSpeakerDynamicEnergyThreshold", value) - config.INPUT_SPEAKER_DYNAMIC_ENERGY_THRESHOLD = value - if config.INPUT_SPEAKER_DYNAMIC_ENERGY_THRESHOLD is True: + config.INPUT_SPEAKER_AUTOMATIC_THRESHOLD = value + if config.INPUT_SPEAKER_AUTOMATIC_THRESHOLD is True: view.closeSpeakerEnergyThresholdWidget() else: view.openSpeakerEnergyThresholdWidget() @@ -922,9 +922,9 @@ def callbackSetEnableNoticeXsoverlay(value): def callbackSetEnableAutoExportMessageLogs(value): print("callbackSetEnableAutoExportMessageLogs", value) - config.ENABLE_LOGGER = value + config.ENABLE_LOGGER_FEATURE = value - if config.ENABLE_LOGGER is True: + if config.ENABLE_LOGGER_FEATURE is True: model.startLogger() else: model.stopLogger() @@ -1057,7 +1057,7 @@ def createMainWindow(splash): view.showUpdateAvailableButton() # init logger - if config.ENABLE_LOGGER is True: + if config.ENABLE_LOGGER_FEATURE is True: model.startLogger() # init OSC receive diff --git a/src-python/model.py b/src-python/model.py index f652b170..0b9d504e 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_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] + translator_name=config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO] source_language=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] target_languages=config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO] @@ -237,7 +237,7 @@ class Model: return translations, success_flags def getOutputTranslate(self, message): - translator_name=config.SELECTED_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] + translator_name=config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO] source_language=config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] target_language=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] target_country=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["country"] @@ -449,8 +449,8 @@ class Model: self.mic_audio_recorder = SelectedMicEnergyAndAudioRecorder( device=mic_device, - energy_threshold=config.MIC_ENERGY_THRESHOLD, - dynamic_energy_threshold=config.MIC_DYNAMIC_ENERGY_THRESHOLD, + energy_threshold=config.MIC_THRESHOLD, + dynamic_energy_threshold=config.MIC_AUTOMATIC_THRESHOLD, record_timeout=record_timeout, ) # self.mic_audio_recorder.recordIntoQueue(self.mic_audio_queue, mic_energy_queue) @@ -623,7 +623,7 @@ class Model: self.speaker_audio_recorder = SelectedSpeakerEnergyAndAudioRecorder( device=speaker_device, energy_threshold=config.SPEAKER_ENERGY_THRESHOLD, - dynamic_energy_threshold=config.SPEAKER_DYNAMIC_ENERGY_THRESHOLD, + dynamic_energy_threshold=config.SPEAKER_AUTOMATIC_THRESHOLD, record_timeout=record_timeout, ) # self.speaker_audio_recorder.recordIntoQueue(speaker_audio_queue, speaker_energy_queue) diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index bda7956f..836407a0 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -155,7 +155,7 @@ class MicMessage: "transliteration":transliteration } }) - if config.LOGGER is True: + if config.LOGGER_FEATURE is True: if len(translation) > 0: translation = " (" + "/".join(translation) + ")" model.logger.info(f"[SENT] {message}{translation}") @@ -225,7 +225,7 @@ class SpeakerMessage: "transliteration":transliteration, } }) - if config.LOGGER is True: + if config.LOGGER_FEATURE is True: if len(translation) > 0: translation = " (" + "/".join(translation) + ")" model.logger.info(f"[RECEIVED] {message}{translation}") @@ -285,7 +285,7 @@ class ChatMessage: # model.updateOverlay(overlay_image) # update textbox message log (Sent) - if config.LOGGER is True: + if config.LOGGER_FEATURE is True: if len(translation) > 0: translation_text = " (" + "/".join(translation) + ")" model.logger.info(f"[SENT] {message}{translation_text}") @@ -339,7 +339,7 @@ def getSelectableWhisperModelTypeDict(*args, **kwargs) -> dict: return {"status":200, "result":config.SELECTABLE_WHISPER_WEIGHT_TYPE_DICT} def getMaxMicEnergyThreshold(*args, **kwargs) -> dict: - return {"status":200, "result":config.MAX_MIC_ENERGY_THRESHOLD} + return {"status":200, "result":config.MAX_MIC_THRESHOLD} def getMaxSpeakerEnergyThreshold(*args, **kwargs) -> dict: return {"status":200, "result":config.MAX_SPEAKER_ENERGY_THRESHOLD} @@ -401,22 +401,22 @@ def getTranslationEngines(*args, **kwargs) -> dict: def getListLanguageAndCountry(*args, **kwargs) -> dict: return {"status":200, "result": model.getListLanguageAndCountry()} -def getListInputHost(*args, **kwargs) -> dict: +def getMicHostList(*args, **kwargs) -> dict: return {"status":200, "result": model.getListInputHost()} -def getListInputDevice(*args, **kwargs) -> dict: +def getMicDeviceList(*args, **kwargs) -> dict: return {"status":200, "result": model.getListInputDevice()} -def getListOutputDevice(*args, **kwargs) -> dict: +def getSpeakerDeviceList(*args, **kwargs) -> dict: return {"status":200, "result": model.getListOutputDevice()} -def getSelectedTranslatorEngines(*args, **kwargs) -> dict: - return {"status":200, "result":config.SELECTED_TRANSLATOR_ENGINES} +def getSelectedTranslationEngines(*args, **kwargs) -> dict: + return {"status":200, "result":config.SELECTED_TRANSLATION_ENGINES} def setSelectedTranslatorEngines(engines:dict, *args, **kwargs) -> dict: printLog("setSelectedTranslatorEngines", engines) - config.SELECTED_TRANSLATOR_ENGINES = engines - return {"status":200,"result":config.SELECTED_TRANSLATOR_ENGINES} + config.SELECTED_TRANSLATION_ENGINES = engines + return {"status":200,"result":config.SELECTED_TRANSLATION_ENGINES} def getSelectedYourLanguages(*args, **kwargs) -> dict: return {"status":200, "result":config.SELECTED_YOUR_LANGUAGES} @@ -589,27 +589,27 @@ def setSelectedMicDevice(data, *args, **kwargs) -> dict: model.startCheckMicEnergy() return {"status":200, "result": config.SELECTED_MIC_DEVICE} -def getMicEnergyThreshold(*args, **kwargs) -> dict: - return {"status":200, "result":config.MIC_ENERGY_THRESHOLD} +def getMicThreshold(*args, **kwargs) -> dict: + return {"status":200, "result":config.MIC_THRESHOLD} -def setMicEnergyThreshold(data, *args, **kwargs) -> dict: +def setMicThreshold(data, *args, **kwargs) -> dict: status = 400 data = int(data) - if 0 <= data <= config.MAX_MIC_ENERGY_THRESHOLD: - config.MIC_ENERGY_THRESHOLD = data + if 0 <= data <= config.MAX_MIC_THRESHOLD: + config.MIC_THRESHOLD = data status = 200 - return {"status": status, "result": config.MIC_ENERGY_THRESHOLD} + return {"status": status, "result": config.MIC_THRESHOLD} -def getMicDynamicEnergyThreshold(*args, **kwargs) -> dict: - return {"status":200, "result":config.MIC_DYNAMIC_ENERGY_THRESHOLD} +def getMicAutomaticThreshold(*args, **kwargs) -> dict: + return {"status":200, "result":config.MIC_AUTOMATIC_THRESHOLD} -def setEnableMicDynamicEnergyThreshold(*args, **kwargs) -> dict: - config.MIC_DYNAMIC_ENERGY_THRESHOLD = True - return {"status":200, "result":config.MIC_DYNAMIC_ENERGY_THRESHOLD} +def setEnableMicAutomaticThreshold(*args, **kwargs) -> dict: + config.MIC_AUTOMATIC_THRESHOLD = True + return {"status":200, "result":config.MIC_AUTOMATIC_THRESHOLD} -def setDisableMicDynamicEnergyThreshold(*args, **kwargs) -> dict: - config.MIC_DYNAMIC_ENERGY_THRESHOLD = False - return {"status":200, "result":config.MIC_DYNAMIC_ENERGY_THRESHOLD} +def setDisableMicAutomaticThreshold(*args, **kwargs) -> dict: + config.MIC_AUTOMATIC_THRESHOLD = False + return {"status":200, "result":config.MIC_AUTOMATIC_THRESHOLD} def getMicRecordTimeout(*args, **kwargs) -> dict: return {"status":200, "result":config.MIC_RECORD_TIMEOUT} @@ -749,16 +749,16 @@ def setSpeakerEnergyThreshold(data, *args, **kwargs) -> dict: response = {"status":200, "result":config.SPEAKER_ENERGY_THRESHOLD} return response -def getSpeakerDynamicEnergyThreshold(*args, **kwargs) -> dict: - return {"status":200, "result":config.SPEAKER_DYNAMIC_ENERGY_THRESHOLD} +def getSpeakerAutomaticThreshold(*args, **kwargs) -> dict: + return {"status":200, "result":config.SPEAKER_AUTOMATIC_THRESHOLD} -def setEnableSpeakerDynamicEnergyThreshold(*args, **kwargs) -> dict: - config.SPEAKER_DYNAMIC_ENERGY_THRESHOLD = True - return {"status":200, "result":config.SPEAKER_DYNAMIC_ENERGY_THRESHOLD} +def setEnableSpeakerAutomaticThreshold(*args, **kwargs) -> dict: + config.SPEAKER_AUTOMATIC_THRESHOLD = True + return {"status":200, "result":config.SPEAKER_AUTOMATIC_THRESHOLD} -def setDisableSpeakerDynamicEnergyThreshold(*args, **kwargs) -> dict: - config.SPEAKER_DYNAMIC_ENERGY_THRESHOLD = False - return {"status":200, "result":config.SPEAKER_DYNAMIC_ENERGY_THRESHOLD} +def setDisableSpeakerAutomaticThreshold(*args, **kwargs) -> dict: + config.SPEAKER_AUTOMATIC_THRESHOLD = False + return {"status":200, "result":config.SPEAKER_AUTOMATIC_THRESHOLD} def getSpeakerRecordTimeout(*args, **kwargs) -> dict: return {"status":200, "result":config.SPEAKER_RECORD_TIMEOUT} @@ -1091,18 +1091,18 @@ def setDisableSendReceivedMessageToVrc(*args, **kwargs) -> dict: config.SEND_RECEIVED_MESSAGE_TO_VRC = False return {"status":200, "result":config.SEND_RECEIVED_MESSAGE_TO_VRC} -def getLogger(*args, **kwargs) -> dict: - return {"status":200, "result":config.LOGGER} +def getLoggerFeature(*args, **kwargs) -> dict: + return {"status":200, "result":config.LOGGER_FEATURE} -def setEnableLogger(*args, **kwargs) -> dict: - config.LOGGER = True +def setEnableLoggerFeature(*args, **kwargs) -> dict: + config.LOGGER_FEATURE = True model.startLogger() - return {"status":200, "result":config.LOGGER} + return {"status":200, "result":config.LOGGER_FEATURE} -def setDisableLogger(*args, **kwargs) -> dict: +def setDisableLoggerFeature(*args, **kwargs) -> dict: model.stopLogger() - config.LOGGER = False - return {"status":200, "result":config.LOGGER} + config.LOGGER_FEATURE = False + return {"status":200, "result":config.LOGGER_FEATURE} def getVrcMicMuteSync(*args, **kwargs) -> dict: return {"status":200, "result":config.VRC_MIC_MUTE_SYNC} @@ -1252,7 +1252,7 @@ def messageFormatter(format_type:str, translation:list, message:list) -> str: return osc_message def changeToCTranslate2Process() -> None: - config.SELECTED_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = "CTranslate2" + config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO] = "CTranslate2" def startTranscriptionSendMessage(action:Callable[[dict], None]) -> None: mic_message = MicMessage(action) @@ -1362,11 +1362,11 @@ def removeExclamations(text): return cleaned_text def updateTranslationEngineAndEngineList(): - engine = config.SELECTED_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] + engine = config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO] engines = getTranslationEngines()["result"] if engine not in engines: engine = engines[0] - config.SELECTED_TRANSLATOR_ENGINES[config.SELECTED_TAB_NO] = engine + config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO] = engine def startThreadingDownloadCtranslate2Weight(callback:Callable[[float], None]) -> None: th_download = Thread(target=model.downloadCTranslate2ModelWeight, args=(callback,)) @@ -1423,7 +1423,7 @@ def init(actions:dict, *args, **kwargs) -> None: # init logger printLog("Init Logger") - if config.LOGGER is True: + if config.LOGGER_FEATURE is True: model.startLogger() # init OSC receive diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index d24cc28f..708f56df 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -8,41 +8,41 @@ from utils import printLog, printResponse, encodeBase64 mapping = { # Main Window - "/set/enable_translation": {"status": False, "variable":controller.setEnableTranslation}, - "/set/disable_translation": {"status": False, "variable":controller.setDisableTranslation}, + "/set/enable/translation": {"status": False, "variable":controller.setEnableTranslation}, + "/set/disable/translation": {"status": False, "variable":controller.setDisableTranslation}, - "/set/enable_transcription_send": {"status": False, "variable":controller.setEnableTranscriptionSend}, - "/set/disable_transcription_send": {"status": False, "variable":controller.setDisableTranscriptionSend}, + "/set/enable/transcription_send": {"status": False, "variable":controller.setEnableTranscriptionSend}, + "/set/disable/transcription_send": {"status": False, "variable":controller.setDisableTranscriptionSend}, - "/set/enable_transcription_receive": {"status": False, "variable":controller.setEnableTranscriptionReceive}, - "/set/disable_transcription_receive": {"status": False, "variable":controller.setDisableTranscriptionReceive}, + "/set/enable/transcription_receive": {"status": False, "variable":controller.setEnableTranscriptionReceive}, + "/set/disable/transcription_receive": {"status": False, "variable":controller.setDisableTranscriptionReceive}, - "/set/enable_foreground": {"status": True, "variable":controller.setEnableForeground}, - "/set/disable_foreground": {"status": True, "variable":controller.setDisableForeground}, + "/set/enable/foreground": {"status": True, "variable":controller.setEnableForeground}, + "/set/disable/foreground": {"status": True, "variable":controller.setDisableForeground}, - "/set/enable_config_window": {"status": True, "variable":controller.setEnableConfigWindow}, - "/set/disable_config_window": {"status": True, "variable":controller.setDisableConfigWindow}, + "/set/enable/config_window": {"status": True, "variable":controller.setEnableConfigWindow}, + "/set/disable/config_window": {"status": True, "variable":controller.setDisableConfigWindow}, - "/get/selected_tab_no": {"status": True, "variable":controller.getSelectedTabNo}, - "/set/selected_tab_no": {"status": True, "variable":controller.setSelectedTabNo}, + "/get/data/selected_tab_no": {"status": True, "variable":controller.getSelectedTabNo}, + "/set/data/selected_tab_no": {"status": True, "variable":controller.setSelectedTabNo}, - "/get/main_window_sidebar_compact_mode": {"status": True, "variable":controller.getMainWindowSidebarCompactMode}, - "/set/enable_main_window_sidebar_compact_mode": {"status": True, "variable":controller.setEnableMainWindowSidebarCompactMode}, - "/set/disable_main_window_sidebar_compact_mode": {"status": True, "variable":controller.setDisableMainWindowSidebarCompactMode}, + "/get/data/main_window_sidebar_compact_mode": {"status": True, "variable":controller.getMainWindowSidebarCompactMode}, + "/set/enable/main_window_sidebar_compact_mode": {"status": True, "variable":controller.setEnableMainWindowSidebarCompactMode}, + "/set/disable/main_window_sidebar_compact_mode": {"status": True, "variable":controller.setDisableMainWindowSidebarCompactMode}, - "/get/list_translation_engines": {"status": True, "variable":controller.getTranslationEngines}, - "/get/list_languages": {"status": True, "variable":controller.getListLanguageAndCountry}, + "/get/data/translation_engines": {"status": True, "variable":controller.getTranslationEngines}, + "/get/data/selectable_language_list": {"status": True, "variable":controller.getListLanguageAndCountry}, - "/get/selected_translator_engines": {"status": False, "variable":controller.getSelectedTranslatorEngines}, - "/set/selected_translator_engines": {"status": True, "variable":controller.setSelectedTranslatorEngines}, + "/get/data/selected_translation_engines": {"status": False, "variable":controller.getSelectedTranslationEngines}, + "/set/data/selected_translator_engines": {"status": True, "variable":controller.setSelectedTranslatorEngines}, - "/get/selected_your_languages": {"status": True, "variable":controller.getSelectedYourLanguages}, - "/set/selected_your_languages": {"status": True, "variable":controller.setSelectedYourLanguages}, + "/get/data/selected_your_languages": {"status": True, "variable":controller.getSelectedYourLanguages}, + "/set/data/selected_your_languages": {"status": True, "variable":controller.setSelectedYourLanguages}, - "/get/selected_target_languages": {"status": True, "variable":controller.getSelectedTargetLanguages}, - "/set/selected_target_languages": {"status": True, "variable":controller.setSelectedTargetLanguages}, + "/get/data/selected_target_languages": {"status": True, "variable":controller.getSelectedTargetLanguages}, + "/set/data/selected_target_languages": {"status": True, "variable":controller.setSelectedTargetLanguages}, - "/get/selected_transcription_engine": {"status": False, "variable":controller.getSelectedTranscriptionEngine}, + "/get/data/selected_transcription_engine": {"status": False, "variable":controller.getSelectedTranscriptionEngine}, "/run/send_message_box": {"status": False, "variable":controller.sendMessageBox}, "/run/typing_message_box": {"status": False, "variable":controller.typingMessageBox}, @@ -52,221 +52,221 @@ mapping = { # Config Window # Appearance - "/get/version": {"status": True, "variable":controller.getVersion}, + "/get/data/version": {"status": True, "variable":controller.getVersion}, - "/get/transparency_range": {"status": True, "variable":controller.getTransparencyRange}, - "/get/transparency": {"status": True, "variable":controller.getTransparency}, - "/set/transparency": {"status": True, "variable":controller.setTransparency}, + "/get/data/transparency_range": {"status": True, "variable":controller.getTransparencyRange}, + "/get/data/transparency": {"status": True, "variable":controller.getTransparency}, + "/set/data/transparency": {"status": True, "variable":controller.setTransparency}, - "/get/appearance_theme_list": {"status": True, "variable":controller.getAppearanceThemesList}, - "/get/appearance_theme": {"status": True, "variable":controller.getAppearanceTheme}, - "/set/appearance_theme": {"status": True, "variable":controller.setAppearanceTheme}, + "/get/data/appearance_theme_list": {"status": True, "variable":controller.getAppearanceThemesList}, + "/get/data/appearance_theme": {"status": True, "variable":controller.getAppearanceTheme}, + "/set/data/appearance_theme": {"status": True, "variable":controller.setAppearanceTheme}, - "/get/ui_scaling_list": {"status": True, "variable":controller.getUiScalingList}, - "/get/ui_scaling": {"status": True, "variable":controller.getUiScaling}, - "/set/ui_scaling": {"status": True, "variable":controller.setUiScaling}, + "/get/data/ui_scaling_list": {"status": True, "variable":controller.getUiScalingList}, + "/get/data/ui_scaling": {"status": True, "variable":controller.getUiScaling}, + "/set/data/ui_scaling": {"status": True, "variable":controller.setUiScaling}, - "/get/textbox_ui_scaling_range": {"status": True, "variable":controller.getTextboxUiScalingRange}, - "/get/textbox_ui_scaling": {"status": True, "variable":controller.getTextboxUiScaling}, - "/set/textbox_ui_scaling": {"status": True, "variable":controller.setTextboxUiScaling}, + "/get/data/textbox_ui_scaling_range": {"status": True, "variable":controller.getTextboxUiScalingRange}, + "/get/data/textbox_ui_scaling": {"status": True, "variable":controller.getTextboxUiScaling}, + "/set/data/textbox_ui_scaling": {"status": True, "variable":controller.setTextboxUiScaling}, - "/get/message_box_ratio_range": {"status": True, "variable":controller.getMessageBoxRatioRange}, - "/get/message_box_ratio": {"status": True, "variable":controller.getMessageBoxRatio}, - "/set/message_box_ratio": {"status": True, "variable":controller.setMessageBoxRatio}, + "/get/data/message_box_ratio_range": {"status": True, "variable":controller.getMessageBoxRatioRange}, + "/get/data/message_box_ratio": {"status": True, "variable":controller.getMessageBoxRatio}, + "/set/data/message_box_ratio": {"status": True, "variable":controller.setMessageBoxRatio}, - "/get/font_family": {"status": True, "variable":controller.getFontFamily}, - "/set/font_family": {"status": True, "variable":controller.setFontFamily}, + "/get/data/font_family": {"status": True, "variable":controller.getFontFamily}, + "/set/data/font_family": {"status": True, "variable":controller.setFontFamily}, - "/get/ui_language": {"status": True, "variable":controller.getUiLanguage}, - "/set/ui_language": {"status": True, "variable":controller.setUiLanguage}, + "/get/data/ui_language": {"status": True, "variable":controller.getUiLanguage}, + "/set/data/ui_language": {"status": True, "variable":controller.setUiLanguage}, - "/get/restore_main_window_geometry": {"status": True, "variable":controller.getRestoreMainWindowGeometry}, - "/set/enable_restore_main_window_geometry": {"status": True, "variable":controller.setEnableRestoreMainWindowGeometry}, - "/set/disable_restore_main_window_geometry": {"status": True, "variable":controller.setDisableRestoreMainWindowGeometry}, + "/get/data/restore_main_window_geometry": {"status": True, "variable":controller.getRestoreMainWindowGeometry}, + "/set/enable/restore_main_window_geometry": {"status": True, "variable":controller.setEnableRestoreMainWindowGeometry}, + "/set/disable/restore_main_window_geometry": {"status": True, "variable":controller.setDisableRestoreMainWindowGeometry}, - "/get/main_window_geometry": {"status": True, "variable":controller.getMainWindowGeometry}, - "/set/main_window_geometry": {"status": True, "variable":controller.setMainWindowGeometry}, + "/get/data/main_window_geometry": {"status": True, "variable":controller.getMainWindowGeometry}, + "/set/data/main_window_geometry": {"status": True, "variable":controller.setMainWindowGeometry}, # Translation - "/get/use_translation_feature": {"status": True, "variable":controller.getUseTranslationFeature}, - "/set/enable_use_translation_feature": {"status": True, "variable":controller.setEnableUseTranslationFeature}, - "/set/disable_use_translation_feature": {"status": True, "variable":controller.setDisableUseTranslationFeature}, + "/get/data/use_translation_feature": {"status": True, "variable":controller.getUseTranslationFeature}, + "/set/enable/use_translation_feature": {"status": True, "variable":controller.setEnableUseTranslationFeature}, + "/set/disable/use_translation_feature": {"status": True, "variable":controller.setDisableUseTranslationFeature}, - "/get/selectable_ctranslate2_weight_type_dict": {"status": True, "variable":controller.getSelectableCtranslate2WeightTypeDict}, + "/get/data/selectable_ctranslate2_weight_type_dict": {"status": True, "variable":controller.getSelectableCtranslate2WeightTypeDict}, - "/get/ctranslate2_weight_type": {"status": True, "variable":controller.getCtranslate2WeightType}, - "/set/ctranslate2_weight_type": {"status": True, "variable":controller.setCtranslate2WeightType}, + "/get/data/ctranslate2_weight_type": {"status": True, "variable":controller.getCtranslate2WeightType}, + "/set/data/ctranslate2_weight_type": {"status": True, "variable":controller.setCtranslate2WeightType}, "/run/download_ctranslate2_weight": {"status": True, "variable":controller.downloadCtranslate2Weight}, - "/get/deepl_auth_key": {"status": False, "variable":controller.getDeepLAuthKey}, - "/set/deepl_auth_key": {"status": False, "variable":controller.setDeeplAuthKey}, - "/del/deepl_auth_key": {"status": False, "variable":controller.delDeeplAuthKey}, + "/get/data/deepl_auth_key": {"status": False, "variable":controller.getDeepLAuthKey}, + "/set/data/deepl_auth_key": {"status": False, "variable":controller.setDeeplAuthKey}, + "/delete/data/deepl_auth_key": {"status": False, "variable":controller.delDeeplAuthKey}, - "/get/multi_language_translation": {"status": True, "variable":controller.getMultiLanguageTranslation}, - "/set/enable_multi_language_translation": {"status": True, "variable":controller.setEnableMultiLanguageTranslation}, - "/set/disable_multi_language_translation": {"status": True, "variable":controller.setDisableMultiLanguageTranslation}, + "/get/data/multi_language_translation": {"status": True, "variable":controller.getMultiLanguageTranslation}, + "/set/enable/multi_language_translation": {"status": True, "variable":controller.setEnableMultiLanguageTranslation}, + "/set/disable/multi_language_translation": {"status": True, "variable":controller.setDisableMultiLanguageTranslation}, - "/get/convert_message_to_romaji": {"status": True, "variable":controller.getConvertMessageToRomaji}, - "/set/enable_convert_message_to_romaji": {"status": True, "variable":controller.setEnableConvertMessageToRomaji}, - "/set/disable_convert_message_to_romaji": {"status": True, "variable":controller.setDisableConvertMessageToRomaji}, + "/get/data/convert_message_to_romaji": {"status": True, "variable":controller.getConvertMessageToRomaji}, + "/set/enable/convert_message_to_romaji": {"status": True, "variable":controller.setEnableConvertMessageToRomaji}, + "/set/disable/convert_message_to_romaji": {"status": True, "variable":controller.setDisableConvertMessageToRomaji}, - "/get/convert_message_to_hiragana": {"status": True, "variable":controller.getConvertMessageToHiragana}, - "/set/enable_convert_message_to_hiragana": {"status": True, "variable":controller.setEnableConvertMessageToHiragana}, - "/set/disable_convert_message_to_hiragana": {"status": True, "variable":controller.setDisableConvertMessageToHiragana}, + "/get/data/convert_message_to_hiragana": {"status": True, "variable":controller.getConvertMessageToHiragana}, + "/set/enable/convert_message_to_hiragana": {"status": True, "variable":controller.setEnableConvertMessageToHiragana}, + "/set/disable/convert_message_to_hiragana": {"status": True, "variable":controller.setDisableConvertMessageToHiragana}, # Transcription - "/get/list_mic_host": {"status": True, "variable":controller.getListInputHost}, - "/get/list_mic_device": {"status": True, "variable":controller.getListInputDevice}, - "/get/list_speaker_device": {"status": True, "variable":controller.getListOutputDevice}, + "/get/data/mic_host_list": {"status": True, "variable":controller.getMicHostList}, + "/get/data/mic_device_list": {"status": True, "variable":controller.getMicDeviceList}, + "/get/data/speaker_device_list": {"status": True, "variable":controller.getSpeakerDeviceList}, - "/get/max_mic_energy_threshold": {"status": True, "variable":controller.getMaxMicEnergyThreshold}, - "/get/max_speaker_energy_threshold": {"status": True, "variable":controller.getMaxSpeakerEnergyThreshold}, + "/get/data/max_mic_energy_threshold": {"status": True, "variable":controller.getMaxMicEnergyThreshold}, + "/get/data/max_speaker_energy_threshold": {"status": True, "variable":controller.getMaxSpeakerEnergyThreshold}, - "/get/auto_mic_select": {"status": True, "variable":controller.getAutoMicSelect}, - "/set/enable_auto_mic_select": {"status": True, "variable":controller.setEnableAutoMicSelect}, - "/set/disable_auto_mic_select": {"status": True, "variable":controller.setDisableAutoMicSelect}, + "/get/data/auto_mic_select": {"status": True, "variable":controller.getAutoMicSelect}, + "/set/enable/auto_mic_select": {"status": True, "variable":controller.setEnableAutoMicSelect}, + "/set/disable/auto_mic_select": {"status": True, "variable":controller.setDisableAutoMicSelect}, - "/get/selected_mic_host": {"status": True, "variable":controller.getSelectedMicHost}, - "/set/selected_mic_host": {"status": True, "variable":controller.setSelectedMicHost}, + "/get/data/selected_mic_host": {"status": True, "variable":controller.getSelectedMicHost}, + "/set/data/selected_mic_host": {"status": True, "variable":controller.setSelectedMicHost}, - "/get/selected_mic_device": {"status": True, "variable":controller.getSelectedMicDevice}, - "/set/selected_mic_device": {"status": True, "variable":controller.setSelectedMicDevice}, + "/get/data/selected_mic_device": {"status": True, "variable":controller.getSelectedMicDevice}, + "/set/data/selected_mic_device": {"status": True, "variable":controller.setSelectedMicDevice}, - "/get/mic_energy_threshold": {"status": True, "variable":controller.getMicEnergyThreshold}, - "/set/mic_energy_threshold": {"status": True, "variable":controller.setMicEnergyThreshold}, + "/get/data/mic_threshold": {"status": True, "variable":controller.getMicThreshold}, + "/set/data/mic_threshold": {"status": True, "variable":controller.setMicThreshold}, - "/get/mic_dynamic_energy_threshold": {"status": True, "variable":controller.getMicDynamicEnergyThreshold}, - "/set/enable_mic_dynamic_energy_threshold": {"status": True, "variable":controller.setEnableMicDynamicEnergyThreshold}, - "/set/disable_mic_dynamic_energy_threshold": {"status": True, "variable":controller.setDisableMicDynamicEnergyThreshold}, + "/get/data/mic_automatic_threshold": {"status": True, "variable":controller.getMicAutomaticThreshold}, + "/set/enable/mic_automatic_threshold": {"status": True, "variable":controller.setEnableMicAutomaticThreshold}, + "/set/disable/mic_automatic_threshold": {"status": True, "variable":controller.setDisableMicAutomaticThreshold}, - "/get/mic_record_timeout": {"status": True, "variable":controller.getMicRecordTimeout}, - "/set/mic_record_timeout": {"status": True, "variable":controller.setMicRecordTimeout}, + "/get/data/mic_record_timeout": {"status": True, "variable":controller.getMicRecordTimeout}, + "/set/data/mic_record_timeout": {"status": True, "variable":controller.setMicRecordTimeout}, - "/get/mic_phrase_timeout": {"status": True, "variable":controller.getMicPhraseTimeout}, - "/set/mic_phrase_timeout": {"status": True, "variable":controller.setMicPhraseTimeout}, + "/get/data/mic_phrase_timeout": {"status": True, "variable":controller.getMicPhraseTimeout}, + "/set/data/mic_phrase_timeout": {"status": True, "variable":controller.setMicPhraseTimeout}, - "/get/mic_max_phrases": {"status": True, "variable":controller.getMicMaxPhrases}, - "/set/mic_max_phrases": {"status": True, "variable":controller.setMicMaxPhrases}, + "/get/data/mic_max_phrases": {"status": True, "variable":controller.getMicMaxPhrases}, + "/set/data/mic_max_phrases": {"status": True, "variable":controller.setMicMaxPhrases}, - "/get/mic_avg_logprob": {"status": True, "variable":controller.getMicAvgLogprob}, - "/set/mic_avg_logprob": {"status": True, "variable":controller.setMicAvgLogprob}, + "/get/data/mic_avg_logprob": {"status": True, "variable":controller.getMicAvgLogprob}, + "/set/data/mic_avg_logprob": {"status": True, "variable":controller.setMicAvgLogprob}, - "/get/mic_no_speech_prob": {"status": True, "variable":controller.getMicNoSpeechProb}, - "/set/mic_no_speech_prob": {"status": True, "variable":controller.setMicNoSpeechProb}, + "/get/data/mic_no_speech_prob": {"status": True, "variable":controller.getMicNoSpeechProb}, + "/set/data/mic_no_speech_prob": {"status": True, "variable":controller.setMicNoSpeechProb}, - "/set/enable_check_mic_threshold": {"status": True, "variable":controller.setEnableCheckMicThreshold}, - "/set/disable_check_mic_threshold": {"status": True, "variable":controller.setDisableCheckMicThreshold}, + "/set/enable/check_mic_threshold": {"status": True, "variable":controller.setEnableCheckMicThreshold}, + "/set/disable/check_mic_threshold": {"status": True, "variable":controller.setDisableCheckMicThreshold}, - "/get/mic_word_filter": {"status": True, "variable":controller.getMicWordFilter}, - "/set/mic_word_filter": {"status": True, "variable":controller.setMicWordFilter}, - "/del/mic_word_filter": {"status": True, "variable":controller.delMicWordFilter}, + "/get/data/mic_word_filter": {"status": True, "variable":controller.getMicWordFilter}, + "/set/data/mic_word_filter": {"status": True, "variable":controller.setMicWordFilter}, + "/delete/data/mic_word_filter": {"status": True, "variable":controller.delMicWordFilter}, - "/get/auto_speaker_select": {"status": True, "variable":controller.getAutoSpeakerSelect}, - "/set/enable_auto_speaker_select": {"status": True, "variable":controller.setEnableAutoSpeakerSelect}, - "/set/disable_auto_speaker_select": {"status": True, "variable":controller.setDisableAutoSpeakerSelect}, + "/get/data/auto_speaker_select": {"status": True, "variable":controller.getAutoSpeakerSelect}, + "/set/enable/auto_speaker_select": {"status": True, "variable":controller.setEnableAutoSpeakerSelect}, + "/set/disable/auto_speaker_select": {"status": True, "variable":controller.setDisableAutoSpeakerSelect}, - "/get/selected_speaker_device": {"status": True, "variable":controller.getSelectedSpeakerDevice}, - "/set/selected_speaker_device": {"status": True, "variable":controller.setSelectedSpeakerDevice}, + "/get/data/selected_speaker_device": {"status": True, "variable":controller.getSelectedSpeakerDevice}, + "/set/data/selected_speaker_device": {"status": True, "variable":controller.setSelectedSpeakerDevice}, - "/get/speaker_energy_threshold": {"status": True, "variable":controller.getSpeakerEnergyThreshold}, - "/set/speaker_energy_threshold": {"status": True, "variable":controller.setSpeakerEnergyThreshold}, + "/get/data/speaker_energy_threshold": {"status": True, "variable":controller.getSpeakerEnergyThreshold}, + "/set/data/speaker_energy_threshold": {"status": True, "variable":controller.setSpeakerEnergyThreshold}, - "/get/speaker_dynamic_energy_threshold": {"status": True, "variable":controller.getSpeakerDynamicEnergyThreshold}, - "/set/enable_speaker_dynamic_energy_threshold": {"status": True, "variable":controller.setEnableSpeakerDynamicEnergyThreshold}, - "/set/disable_speaker_dynamic_energy_threshold": {"status": True, "variable":controller.setDisableSpeakerDynamicEnergyThreshold}, + "/get/data/speaker_automatic_threshold": {"status": True, "variable":controller.getSpeakerAutomaticThreshold}, + "/set/enable/speaker_automatic_threshold": {"status": True, "variable":controller.setEnableSpeakerAutomaticThreshold}, + "/set/disable/speaker_automatic_threshold": {"status": True, "variable":controller.setDisableSpeakerAutomaticThreshold}, - "/get/speaker_record_timeout": {"status": True, "variable":controller.getSpeakerRecordTimeout}, - "/set/speaker_record_timeout": {"status": True, "variable":controller.setSpeakerRecordTimeout}, + "/get/data/speaker_record_timeout": {"status": True, "variable":controller.getSpeakerRecordTimeout}, + "/set/data/speaker_record_timeout": {"status": True, "variable":controller.setSpeakerRecordTimeout}, - "/get/speaker_phrase_timeout": {"status": True, "variable":controller.getSpeakerPhraseTimeout}, - "/set/speaker_phrase_timeout": {"status": True, "variable":controller.setSpeakerPhraseTimeout}, + "/get/data/speaker_phrase_timeout": {"status": True, "variable":controller.getSpeakerPhraseTimeout}, + "/set/data/speaker_phrase_timeout": {"status": True, "variable":controller.setSpeakerPhraseTimeout}, - "/get/speaker_max_phrases": {"status": True, "variable":controller.getSpeakerMaxPhrases}, - "/set/speaker_max_phrases": {"status": True, "variable":controller.setSpeakerMaxPhrases}, + "/get/data/speaker_max_phrases": {"status": True, "variable":controller.getSpeakerMaxPhrases}, + "/set/data/speaker_max_phrases": {"status": True, "variable":controller.setSpeakerMaxPhrases}, - "/get/speaker_avg_logprob": {"status": True, "variable":controller.getSpeakerAvgLogprob}, - "/set/speaker_avg_logprob": {"status": True, "variable":controller.setSpeakerAvgLogprob}, + "/get/data/speaker_avg_logprob": {"status": True, "variable":controller.getSpeakerAvgLogprob}, + "/set/data/speaker_avg_logprob": {"status": True, "variable":controller.setSpeakerAvgLogprob}, - "/get/speaker_no_speech_prob": {"status": True, "variable":controller.getSpeakerNoSpeechProb}, - "/set/speaker_no_speech_prob": {"status": True, "variable":controller.setSpeakerNoSpeechProb}, + "/get/data/speaker_no_speech_prob": {"status": True, "variable":controller.getSpeakerNoSpeechProb}, + "/set/data/speaker_no_speech_prob": {"status": True, "variable":controller.setSpeakerNoSpeechProb}, - "/set/enable_check_speaker_threshold": {"status": True, "variable":controller.setEnableCheckSpeakerThreshold}, - "/set/disable_check_speaker_threshold": {"status": True, "variable":controller.setDisableCheckSpeakerThreshold}, + "/set/enable/check_speaker_threshold": {"status": True, "variable":controller.setEnableCheckSpeakerThreshold}, + "/set/disable/check_speaker_threshold": {"status": True, "variable":controller.setDisableCheckSpeakerThreshold}, - "/get/selectable_whisper_weight_type_dict": {"status": True, "variable":controller.getSelectableWhisperModelTypeDict}, + "/get/data/selectable_whisper_weight_type_dict": {"status": True, "variable":controller.getSelectableWhisperModelTypeDict}, - "/get/whisper_weight_type": {"status": True, "variable":controller.getWhisperWeightType}, - "/set/whisper_weight_type": {"status": True, "variable":controller.setWhisperWeightType}, + "/get/data/whisper_weight_type": {"status": True, "variable":controller.getWhisperWeightType}, + "/set/data/whisper_weight_type": {"status": True, "variable":controller.setWhisperWeightType}, - "/get/use_whisper_feature": {"status": True, "variable":controller.getUseWhisperFeature}, - "/set/enable_use_whisper_feature": {"status": True, "variable":controller.setEnableUseWhisperFeature}, - "/set/disable_use_whisper_feature": {"status": True, "variable":controller.setDisableUseWhisperFeature}, + "/get/data/use_whisper_feature": {"status": True, "variable":controller.getUseWhisperFeature}, + "/set/enable/use_whisper_feature": {"status": True, "variable":controller.setEnableUseWhisperFeature}, + "/set/disable/use_whisper_feature": {"status": True, "variable":controller.setDisableUseWhisperFeature}, "/run/download_whisper_weight": {"status": True, "variable":controller.downloadWhisperWeight}, # VR - "/get/overlay_settings": {"status": True, "variable":controller.getOverlaySettings}, - "/set/overlay_settings": {"status": True, "variable":controller.setOverlaySettings}, + "/get/data/overlay_settings": {"status": True, "variable":controller.getOverlaySettings}, + "/set/data/overlay_settings": {"status": True, "variable":controller.setOverlaySettings}, - "/get/overlay_small_log_settings": {"status": True, "variable":controller.getOverlaySmallLogSettings}, - "/set/overlay_small_log_settings": {"status": True, "variable":controller.setOverlaySmallLogSettings}, + "/get/data/overlay_small_log_settings": {"status": True, "variable":controller.getOverlaySmallLogSettings}, + "/set/data/overlay_small_log_settings": {"status": True, "variable":controller.setOverlaySmallLogSettings}, - "/get/overlay_small_log": {"status": True, "variable":controller.getOverlaySmallLog}, - "/set/enable_overlay_small_log": {"status": True, "variable":controller.setEnableOverlaySmallLog}, - "/set/disable_overlay_small_log": {"status": True, "variable":controller.setDisableOverlaySmallLog}, + "/get/data/overlay_small_log": {"status": True, "variable":controller.getOverlaySmallLog}, + "/set/enable/overlay_small_log": {"status": True, "variable":controller.setEnableOverlaySmallLog}, + "/set/disable/overlay_small_log": {"status": True, "variable":controller.setDisableOverlaySmallLog}, # Others - "/get/auto_clear_message_box": {"status": True, "variable":controller.getAutoClearMessageBox}, - "/set/enable_auto_clear_message_box": {"status": True, "variable":controller.setEnableAutoClearMessageBox}, - "/set/disable_auto_clear_message_box": {"status": True, "variable":controller.setDisableAutoClearMessageBox}, + "/get/data/auto_clear_message_box": {"status": True, "variable":controller.getAutoClearMessageBox}, + "/set/enable/auto_clear_message_box": {"status": True, "variable":controller.setEnableAutoClearMessageBox}, + "/set/disable/auto_clear_message_box": {"status": True, "variable":controller.setDisableAutoClearMessageBox}, - "/get/send_only_translated_messages": {"status": True, "variable":controller.getSendOnlyTranslatedMessages}, - "/set/enable_send_only_translated_messages": {"status": True, "variable":controller.setEnableSendOnlyTranslatedMessages}, - "/set/disable_send_only_translated_messages": {"status": True, "variable":controller.setDisableSendOnlyTranslatedMessages}, + "/get/data/send_only_translated_messages": {"status": True, "variable":controller.getSendOnlyTranslatedMessages}, + "/set/enable/send_only_translated_messages": {"status": True, "variable":controller.setEnableSendOnlyTranslatedMessages}, + "/set/disable/send_only_translated_messages": {"status": True, "variable":controller.setDisableSendOnlyTranslatedMessages}, - "/get/send_message_button_type": {"status": True, "variable":controller.getSendMessageButtonType}, - "/set/send_message_button_type": {"status": True, "variable":controller.setSendMessageButtonType}, + "/get/data/send_message_button_type": {"status": True, "variable":controller.getSendMessageButtonType}, + "/set/data/send_message_button_type": {"status": True, "variable":controller.setSendMessageButtonType}, - "/get/logger": {"status": True, "variable":controller.getLogger}, - "/set/enable_logger": {"status": True, "variable":controller.setEnableLogger}, - "/set/disable_logger": {"status": True, "variable":controller.setDisableLogger}, + "/get/data/logger_feature": {"status": True, "variable":controller.getLoggerFeature}, + "/set/enable/logger_feature": {"status": True, "variable":controller.setEnableLoggerFeature}, + "/set/disable/logger_feature": {"status": True, "variable":controller.setDisableLoggerFeature}, "/run/open_filepath_logs": {"status": True, "variable":controller.openFilepathLogs}, - "/get/vrc_mic_mute_sync": {"status": True, "variable":controller.getVrcMicMuteSync}, - "/set/enable_vrc_mic_mute_sync": {"status": True, "variable":controller.setEnableVrcMicMuteSync}, - "/set/disable_vrc_mic_mute_sync": {"status": True, "variable":controller.setDisableVrcMicMuteSync}, + "/get/data/vrc_mic_mute_sync": {"status": True, "variable":controller.getVrcMicMuteSync}, + "/set/enable/vrc_mic_mute_sync": {"status": True, "variable":controller.setEnableVrcMicMuteSync}, + "/set/disable/vrc_mic_mute_sync": {"status": True, "variable":controller.setDisableVrcMicMuteSync}, - "/get/send_message_to_vrc": {"status": True, "variable":controller.getSendMessageToVrc}, - "/set/enable_send_message_to_vrc": {"status": True, "variable":controller.setEnableSendMessageToVrc}, - "/set/disable_send_message_to_vrc": {"status": True, "variable":controller.setDisableSendMessageToVrc}, + "/get/data/send_message_to_vrc": {"status": True, "variable":controller.getSendMessageToVrc}, + "/set/enable/send_message_to_vrc": {"status": True, "variable":controller.setEnableSendMessageToVrc}, + "/set/disable/send_message_to_vrc": {"status": True, "variable":controller.setDisableSendMessageToVrc}, - "/get/send_message_format": {"status": True, "variable":controller.getSendMessageFormat}, - "/set/send_message_format": {"status": True, "variable":controller.setSendMessageFormat}, + "/get/data/send_message_format": {"status": True, "variable":controller.getSendMessageFormat}, + "/set/data/send_message_format": {"status": True, "variable":controller.setSendMessageFormat}, - "/get/send_message_format_with_t": {"status": True, "variable":controller.getSendMessageFormatWithT}, - "/set/send_message_format_with_t": {"status": True, "variable":controller.setSendMessageFormatWithT}, + "/get/data/send_message_format_with_t": {"status": True, "variable":controller.getSendMessageFormatWithT}, + "/set/data/send_message_format_with_t": {"status": True, "variable":controller.setSendMessageFormatWithT}, - "/get/received_message_format": {"status": True, "variable":controller.getReceivedMessageFormat}, - "/set/received_message_format": {"status": True, "variable":controller.setReceivedMessageFormat}, + "/get/data/received_message_format": {"status": True, "variable":controller.getReceivedMessageFormat}, + "/set/data/received_message_format": {"status": True, "variable":controller.setReceivedMessageFormat}, - "/get/received_message_format_with_t": {"status": True, "variable":controller.getReceivedMessageFormatWithT}, - "/set/received_message_format_with_t": {"status": True, "variable":controller.setReceivedMessageFormatWithT}, + "/get/data/received_message_format_with_t": {"status": True, "variable":controller.getReceivedMessageFormatWithT}, + "/set/data/received_message_format_with_t": {"status": True, "variable":controller.setReceivedMessageFormatWithT}, - "/get/speaker2chatbox_pass": {"status": True, "variable":controller.getSpeaker2ChatboxPass}, - "/set/speaker2chatbox_pass": {"status": True, "variable":controller.setSpeaker2ChatboxPass}, + "/get/data/speaker2chatbox_pass": {"status": True, "variable":controller.getSpeaker2ChatboxPass}, + "/set/data/speaker2chatbox_pass": {"status": True, "variable":controller.setSpeaker2ChatboxPass}, - "/get/send_received_message_to_vrc": {"status": True, "variable":controller.getSendReceivedMessageToVrc}, - "/set/enable_send_received_message_to_vrc": {"status": True, "variable":controller.setEnableSendReceivedMessageToVrc}, - "/set/disable_send_received_message_to_vrc": {"status": True, "variable":controller.setDisableSendReceivedMessageToVrc}, + "/get/data/send_received_message_to_vrc": {"status": True, "variable":controller.getSendReceivedMessageToVrc}, + "/set/enable/send_received_message_to_vrc": {"status": True, "variable":controller.setEnableSendReceivedMessageToVrc}, + "/set/disable/send_received_message_to_vrc": {"status": True, "variable":controller.setDisableSendReceivedMessageToVrc}, # Advanced Settings - "/get/osc_ip_address": {"status": True, "variable":controller.getOscIpAddress}, - "/set/osc_ip_address": {"status": True, "variable":controller.setOscIpAddress}, + "/get/data/osc_ip_address": {"status": True, "variable":controller.getOscIpAddress}, + "/set/data/osc_ip_address": {"status": True, "variable":controller.setOscIpAddress}, - "/get/osc_port": {"status": True, "variable":controller.getOscPort}, - "/set/osc_port": {"status": True, "variable":controller.setOscPort}, + "/get/data/osc_port": {"status": True, "variable":controller.getOscPort}, + "/set/data/osc_port": {"status": True, "variable":controller.setOscPort}, "/run/open_filepath_config_file": {"status": True, "variable":controller.openFilepathConfigFile}, @@ -274,55 +274,55 @@ mapping = { # "/run/restart_software": {"status": True, "variable":controller.restartSoftware}, } -action_mapping = { +run_mapping = { "/run/update_software": { - "download":"/action/download_software", - "update":"/action/update_software" + "download":"/run/download_software", + "update":"/run/update_software" }, - "/set/disable_config_window": { - "mic":"/action/transcription_send_mic_message", - "speaker":"/action/transcription_receive_speaker_message", - "error_device":"/action/error_device", - "error_translation_engine":"/action/error_translation_engine", - "word_filter":"/action/word_filter", + "/set/disable/config_window": { + "mic":"/run/transcription_send_mic_message", + "speaker":"/run/transcription_receive_speaker_message", + "error_device":"/run/error_device", + "error_translation_engine":"/run/error_translation_engine", + "word_filter":"/run/word_filter", }, - "/set/enable_transcription_send": { - "mic":"/action/transcription_send_mic_message", - "error_device":"/action/error_device", - "error_translation_engine":"/action/error_translation_engine", - "word_filter":"/action/word_filter", + "/set/enable/transcription_send": { + "mic":"/run/transcription_send_mic_message", + "error_device":"/run/error_device", + "error_translation_engine":"/run/error_translation_engine", + "word_filter":"/run/word_filter", }, - "/set/enable_transcription_receive": { - "speaker":"/action/transcription_receive_speaker_message", - "error_device":"/action/error_device", - "error_translation_engine":"/action/error_translation_engine", + "/set/enable/transcription_receive": { + "speaker":"/run/transcription_receive_speaker_message", + "error_device":"/run/error_device", + "error_translation_engine":"/run/error_translation_engine", }, - "/set/enable_check_mic_threshold": { - "mic":"/action/check_mic_threshold_energy", - "error_device":"/action/error_device", + "/set/enable/check_mic_threshold": { + "mic":"/run/check_mic_volume", + "error_device":"/run/error_device", }, - "/set/enable_check_speaker_threshold": { - "speaker":"/action/check_speaker_threshold_energy", - "error_device":"/action/error_device", + "/set/enable/check_speaker_threshold": { + "speaker":"/run/check_speaker_volume", + "error_device":"/run/error_device", }, "/run/send_message_box": { - "error_translation_engine":"/action/error_translation_engine" + "error_translation_engine":"/run/error_translation_engine" }, "/run/download_ctranslate2_weight": { - "download":"/action/download_ctranslate2_weight" + "download":"/run/download_ctranslate2_weight" }, "/run/download_whisper_weight": { - "download":"/action/download_whisper_weight" + "download":"/run/download_whisper_weight" }, - "/set/enable_auto_mic_select": { - "mic":"/set/selected_mic_host", + "/set/enable/auto_mic_select": { + "mic":"/set/data/selected_mic_host", }, - "/set/enable_auto_speaker_select": { - "speaker":"/set/selected_speaker_device", + "/set/enable/auto_speaker_select": { + "speaker":"/set/data/selected_speaker_device", } } -class Action: +class Run: def __init__(self, endpoints:dict) -> None: self.endpoints = endpoints @@ -364,10 +364,10 @@ class Main: response = "Locked endpoint" status = 423 else: - action_endpoint = action_mapping.get(endpoint, None) + run_endpoint = run_mapping.get(endpoint, None) try: - if action_endpoint is not None: - response = handler["variable"](data, Action(action_endpoint).transmit) + if run_endpoint is not None: + response = handler["variable"](data, Run(run_endpoint).transmit) else: response = handler["variable"](data) status = response.get("status", None) @@ -412,10 +412,10 @@ if __name__ == "__main__": main.startHandler() controller.init({ - "download_ctranslate2": Action(action_mapping["/run/download_ctranslate2_weight"]).transmit, - "download_whisper": Action(action_mapping["/run/download_whisper_weight"]).transmit, - "update_selected_mic_device": Action(action_mapping["/set/enable_auto_mic_select"]).transmit, - "update_selected_speaker_device": Action(action_mapping["/set/enable_auto_speaker_select"]).transmit, + "download_ctranslate2": Run(run_mapping["/run/download_ctranslate2_weight"]).transmit, + "download_whisper": Run(run_mapping["/run/download_whisper_weight"]).transmit, + "update_selected_mic_device": Run(run_mapping["/set/enable/auto_mic_select"]).transmit, + "update_selected_speaker_device": Run(run_mapping["/set/enable/auto_speaker_select"]).transmit, }) # mappingのすべてのstatusをTrueにする @@ -430,7 +430,7 @@ if __name__ == "__main__": case "test": for _ in range(100): time.sleep(0.5) - endpoint = "/get/list_mic_host" + endpoint = "/get/data/mic_host_list" result, status = main.handleRequest(endpoint) printResponse(status, endpoint, result) @@ -441,16 +441,16 @@ if __name__ == "__main__": match endpoint: case "/run/send_message_box": - # handleRequest("/set/enable_translation") - # handleRequest("/set/enable_convert_message_to_romaji") + # handleRequest("/set/enable/translation") + # handleRequest("/set/enable/convert_message_to_romaji") data = {"id":"123456", "message":"テスト"} - case "/set/selected_translator_engines": + case "/set/data/selected_translator_engines": data = { "1":"CTranslate2", "2":"CTranslate2", "3":"CTranslate2", } - case "/set/selected_your_languages": + case "/set/data/selected_your_languages": data = { "1":{ "primary":{ @@ -471,7 +471,7 @@ if __name__ == "__main__": }, }, } - case "/set/selected_target_languages": + case "/set/data/selected_target_languages": data ={ "1":{ "primary": { @@ -516,58 +516,60 @@ if __name__ == "__main__": }, }, } - case "/set/transparency": + case "/set/data/transparency": data = 0.5 case "/set/appearance": data = "Dark" - case "/set/ui_scaling": + case "/set/data/ui_scaling": data = 1.5 - case "/set/textbox_ui_scaling": + case "/set/data/appearance_theme": + data = "Dark" + case "/set/data/textbox_ui_scaling": data = 1.5 - case "/set/message_box_ratio": + case "/set/data/message_box_ratio": data = 0.5 - case "/set/font_family": + case "/set/data/font_family": data = "Yu Gothic UI" - case "/set/ui_language": + case "/set/data/ui_language": data = "ja" - case "/set/ctranslate2_weight_type": + case "/set/data/ctranslate2_weight_type": data = "Small" - case "/set/deepl_auth_key": + case "/set/data/deepl_auth_key": data = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee:fx" - case "/set/selected_mic_host": + case "/set/data/selected_mic_host": data = "MME" - case "/set/selected_mic_device": + case "/set/data/selected_mic_device": data = "マイク (Realtek High Definition Audio)" - case "/set/mic_energy_threshold": + case "/set/data/mic_threshold": data = 0.5 - case "/set/mic_record_timeout": + case "/set/data/mic_record_timeout": data = 1 - case "/set/mic_phrase_timeout": + case "/set/data/mic_phrase_timeout": data = 5 case "/set/input_set_mic_max_phrases": data = 5 - case "/set/mic_word_filter": + case "/set//data/mic_word_filter": data = "test0, test1, test2" - case "/del/mic_word_filter": + case "/delete/data/mic_word_filter": data = "test1" - case "/set/selected_speaker_device": + case "/set/data/selected_speaker_device": data = "スピーカー (Realtek High Definition Audio)" - case "/set/speaker_energy_threshold": + case "/set/data/speaker_energy_threshold": data = 0.5 - case "/set/speaker_record_timeout": + case "/set/data/speaker_record_timeout": data = 5 - case "/set/speaker_phrase_timeout": + case "/set/data/speaker_phrase_timeout": data = 5 - case "/set/speaker_max_phrases": + case "/set/data/speaker_max_phrases": data = 5 - case "/set/whisper_weight_type": + case "/set/data/whisper_weight_type": data = "base" - case "/set/overlay_settings": + case "/set/data/overlay_settings": data = { "opacity": 0.5, "ui_scaling": 1.5, } - case "/set/overlay_small_log_settings": + case "/set/data/overlay_small_log_settings": data = { "x_pos": 0, "y_pos": 0, @@ -578,29 +580,29 @@ if __name__ == "__main__": "display_duration": 5, "fadeout_duration": 0.5, } - case "/set/send_message_button_type": + case "/set/data/send_message_button_type": data = "show" - case "/set/send_message_format": + case "/set/data/send_message_format": data = "[message]" - case "/set/send_message_format_with_t": + case "/set/data/send_message_format_with_t": data = "[message]([translation])" - case "/set/received_message_format": + case "/set/data/received_message_format": data = "[message]" - case "/set/received_message_format_with_t": + case "/set/data/received_message_format_with_t": data = "[message]([translation])" - case "/set/osc_ip_address": + case "/set/data/osc_ip_address": data = "127.0.0.1" - case "/set/osc_port": + case "/set/data/osc_port": data = 8000 - case "/set/speaker_no_speech_prob": + case "/set/data/speaker_no_speech_prob": data = 0.5 - case "/set/speaker_avg_logprob": + case "/set/data/speaker_avg_logprob": data = 0.5 - case "/set/mic_no_speech_prob": + case "/set/data/mic_no_speech_prob": data = 0.5 - case "/set/mic_avg_logprob": + case "/set/data/mic_avg_logprob": data = 0.5 - case "/set/mic_max_phrases": + case "/set/data/mic_max_phrases": data = 5 case _: data = None diff --git a/src-ui/logics/common/useVolume.js b/src-ui/logics/common/useVolume.js index 3ed45538..b3e2165b 100644 --- a/src-ui/logics/common/useVolume.js +++ b/src-ui/logics/common/useVolume.js @@ -25,11 +25,11 @@ export const useVolume = () => { return { volumeCheckStart_Mic: () => { pendingMicThresholdCheckStatus(); - asyncStdoutToPython("/set/enable_check_mic_threshold"); + asyncStdoutToPython("/set/enable/check_mic_threshold"); }, volumeCheckStop_Mic: () => { pendingMicThresholdCheckStatus(); - asyncStdoutToPython("/set/disable_check_mic_threshold"); + asyncStdoutToPython("/set/disable/check_mic_threshold"); }, updateVolumeVariable_Mic: (payload) => { updateMicVolume(payload); @@ -43,11 +43,11 @@ export const useVolume = () => { volumeCheckStart_Speaker: () => { updateSpeakerVolume("0"); pendingSpeakerThresholdCheckStatus(); - asyncStdoutToPython("/set/enable_check_speaker_threshold"); + asyncStdoutToPython("/set/enable/check_speaker_threshold"); }, volumeCheckStop_Speaker: () => { pendingSpeakerThresholdCheckStatus(); - asyncStdoutToPython("/set/disable_check_speaker_threshold"); + asyncStdoutToPython("/set/disable/check_speaker_threshold"); }, updateVolumeVariable_Speaker: (payload) => { updateSpeakerVolume(payload); diff --git a/src-ui/logics/configs/useEnableAutoClearMessageBox.js b/src-ui/logics/configs/useEnableAutoClearMessageBox.js index eddee3f9..3b6de175 100644 --- a/src-ui/logics/configs/useEnableAutoClearMessageBox.js +++ b/src-ui/logics/configs/useEnableAutoClearMessageBox.js @@ -7,15 +7,15 @@ export const useEnableAutoClearMessageBox = () => { const getEnableAutoClearMessageBox = () => { pendingEnableAutoClearMessageBox(); - asyncStdoutToPython("/get/auto_clear_message_box"); + asyncStdoutToPython("/get/data/auto_clear_message_box"); }; const toggleEnableAutoClearMessageBox = () => { pendingEnableAutoClearMessageBox(); if (currentEnableAutoClearMessageBox.data) { - asyncStdoutToPython("/set/disable_auto_clear_message_box"); + asyncStdoutToPython("/set/disable/auto_clear_message_box"); } else { - asyncStdoutToPython("/set/enable_auto_clear_message_box"); + asyncStdoutToPython("/set/enable/auto_clear_message_box"); } }; diff --git a/src-ui/logics/configs/useEnableAutoMicSelect.js b/src-ui/logics/configs/useEnableAutoMicSelect.js index 6a87eed0..1370d055 100644 --- a/src-ui/logics/configs/useEnableAutoMicSelect.js +++ b/src-ui/logics/configs/useEnableAutoMicSelect.js @@ -7,15 +7,15 @@ export const useEnableAutoMicSelect = () => { const getEnableAutoMicSelect = () => { pendingEnableAutoMicSelect(); - asyncStdoutToPython("/get/auto_mic_select"); + asyncStdoutToPython("/get/data/auto_mic_select"); }; const toggleEnableAutoMicSelect = () => { pendingEnableAutoMicSelect(); if (currentEnableAutoMicSelect.data) { - asyncStdoutToPython("/set/disable_auto_mic_select"); + asyncStdoutToPython("/set/disable/auto_mic_select"); } else { - asyncStdoutToPython("/set/enable_auto_mic_select"); + asyncStdoutToPython("/set/enable/auto_mic_select"); } }; diff --git a/src-ui/logics/configs/useEnableAutoSpeakerSelect.js b/src-ui/logics/configs/useEnableAutoSpeakerSelect.js index 59dfdcfa..d43184de 100644 --- a/src-ui/logics/configs/useEnableAutoSpeakerSelect.js +++ b/src-ui/logics/configs/useEnableAutoSpeakerSelect.js @@ -7,15 +7,15 @@ export const useEnableAutoSpeakerSelect = () => { const getEnableAutoSpeakerSelect = () => { pendingEnableAutoSpeakerSelect(); - asyncStdoutToPython("/get/auto_speaker_select"); + asyncStdoutToPython("/get/data/auto_speaker_select"); }; const toggleEnableAutoSpeakerSelect = () => { pendingEnableAutoSpeakerSelect(); if (currentEnableAutoSpeakerSelect.data) { - asyncStdoutToPython("/set/disable_auto_speaker_select"); + asyncStdoutToPython("/set/disable/auto_speaker_select"); } else { - asyncStdoutToPython("/set/enable_auto_speaker_select"); + asyncStdoutToPython("/set/enable/auto_speaker_select"); } }; diff --git a/src-ui/logics/configs/useMicDeviceList.js b/src-ui/logics/configs/useMicDeviceList.js index 93a8c196..196b32cf 100644 --- a/src-ui/logics/configs/useMicDeviceList.js +++ b/src-ui/logics/configs/useMicDeviceList.js @@ -7,7 +7,7 @@ export const useMicDeviceList = () => { const getMicDeviceList = () => { pendingMicDeviceList(); - asyncStdoutToPython("/get/list_mic_device"); + asyncStdoutToPython("/get/data/mic_device_list"); }; return { diff --git a/src-ui/logics/configs/useMicHostList.js b/src-ui/logics/configs/useMicHostList.js index 6d15eb49..ed61f80a 100644 --- a/src-ui/logics/configs/useMicHostList.js +++ b/src-ui/logics/configs/useMicHostList.js @@ -7,7 +7,7 @@ export const useMicHostList = () => { const getMicHostList = () => { pendingMicHostList(); - asyncStdoutToPython("/get/list_mic_host"); + asyncStdoutToPython("/get/data/mic_host_list"); }; return { diff --git a/src-ui/logics/configs/useMicThreshold.js b/src-ui/logics/configs/useMicThreshold.js index a8e2ceec..ab6bda6c 100644 --- a/src-ui/logics/configs/useMicThreshold.js +++ b/src-ui/logics/configs/useMicThreshold.js @@ -7,24 +7,24 @@ export const useMicThreshold = () => { const { updateEnableAutomaticMicThreshold, currentEnableAutomaticMicThreshold, pendingEnableAutomaticMicThreshold } = useStore_EnableAutomaticMicThreshold(); const getMicThreshold = () => { - asyncStdoutToPython("/get/mic_energy_threshold"); + asyncStdoutToPython("/get/data/mic_threshold"); }; const setMicThreshold = (mic_threshold) => { - asyncStdoutToPython("/set/mic_energy_threshold", mic_threshold); + asyncStdoutToPython("/set/data/mic_threshold", mic_threshold); }; const getEnableAutomaticMicThreshold = () => { pendingEnableAutomaticMicThreshold(); - asyncStdoutToPython("/get/mic_dynamic_energy_threshold"); + asyncStdoutToPython("/get/data/mic_automatic_threshold"); }; const toggleEnableAutomaticMicThreshold = () => { pendingEnableAutomaticMicThreshold(); if (currentEnableAutomaticMicThreshold.data) { - asyncStdoutToPython("/set/disable_mic_dynamic_energy_threshold"); + asyncStdoutToPython("/set/disable/mic_automatic_threshold"); } else { - asyncStdoutToPython("/set/enable_mic_dynamic_energy_threshold"); + asyncStdoutToPython("/set/enable/mic_automatic_threshold"); } }; diff --git a/src-ui/logics/configs/useSelectedMicDevice.js b/src-ui/logics/configs/useSelectedMicDevice.js index c4df9a13..a9e93372 100644 --- a/src-ui/logics/configs/useSelectedMicDevice.js +++ b/src-ui/logics/configs/useSelectedMicDevice.js @@ -12,7 +12,7 @@ export const useSelectedMicDevice = () => { const setSelectedMicDevice = (selected_mic_device) => { pendingSelectedMicDevice(); - asyncStdoutToPython("/set/selected_mic_device", selected_mic_device); + asyncStdoutToPython("/set/data/selected_mic_device", selected_mic_device); }; return { diff --git a/src-ui/logics/configs/useSelectedMicHost.js b/src-ui/logics/configs/useSelectedMicHost.js index 4016e68b..0ef9c882 100644 --- a/src-ui/logics/configs/useSelectedMicHost.js +++ b/src-ui/logics/configs/useSelectedMicHost.js @@ -7,12 +7,12 @@ export const useSelectedMicHost = () => { const getSelectedMicHost = () => { pendingSelectedMicHost(); - asyncStdoutToPython("/get/selected_mic_host"); + asyncStdoutToPython("/get/data/selected_mic_host"); }; const setSelectedMicHost = (selected_mic_host) => { pendingSelectedMicHost(); - asyncStdoutToPython("/set/selected_mic_host", selected_mic_host); + asyncStdoutToPython("/set/data/selected_mic_host", selected_mic_host); }; return { diff --git a/src-ui/logics/configs/useSelectedSpeakerDevice.js b/src-ui/logics/configs/useSelectedSpeakerDevice.js index 3b733f17..b8d85693 100644 --- a/src-ui/logics/configs/useSelectedSpeakerDevice.js +++ b/src-ui/logics/configs/useSelectedSpeakerDevice.js @@ -7,12 +7,12 @@ export const useSelectedSpeakerDevice = () => { const getSelectedSpeakerDevice = () => { pendingSelectedSpeakerDevice(); - asyncStdoutToPython("/get/selected_speaker_device"); + asyncStdoutToPython("/get/data/selected_speaker_device"); }; const setSelectedSpeakerDevice = (selected_speaker_device) => { pendingSelectedSpeakerDevice(); - asyncStdoutToPython("/set/selected_speaker_device", selected_speaker_device); + asyncStdoutToPython("/set/data/selected_speaker_device", selected_speaker_device); }; return { diff --git a/src-ui/logics/configs/useSendMessageButtonType.js b/src-ui/logics/configs/useSendMessageButtonType.js index 8d873254..f69a51f2 100644 --- a/src-ui/logics/configs/useSendMessageButtonType.js +++ b/src-ui/logics/configs/useSendMessageButtonType.js @@ -7,12 +7,12 @@ export const useSendMessageButtonType = () => { const getSendMessageButtonType = () => { pendingSendMessageButtonType(); - asyncStdoutToPython("/get/send_message_button_type"); + asyncStdoutToPython("/get/data/send_message_button_type"); }; const setSendMessageButtonType = (selected_type) => { pendingSendMessageButtonType(); - asyncStdoutToPython("/set/send_message_button_type", selected_type); + asyncStdoutToPython("/set/data/send_message_button_type", selected_type); }; return { diff --git a/src-ui/logics/configs/useSoftwareVersion.js b/src-ui/logics/configs/useSoftwareVersion.js index 91812be9..c81b81c2 100644 --- a/src-ui/logics/configs/useSoftwareVersion.js +++ b/src-ui/logics/configs/useSoftwareVersion.js @@ -7,7 +7,7 @@ export const useSoftwareVersion = () => { const getSoftwareVersion = () => { pendingSoftwareVersion(); - asyncStdoutToPython("/get/version"); + asyncStdoutToPython("/get/data/version"); }; return { diff --git a/src-ui/logics/configs/useSpeakerDeviceList.js b/src-ui/logics/configs/useSpeakerDeviceList.js index d3d8f140..2848111c 100644 --- a/src-ui/logics/configs/useSpeakerDeviceList.js +++ b/src-ui/logics/configs/useSpeakerDeviceList.js @@ -7,7 +7,7 @@ export const useSpeakerDeviceList = () => { const getSpeakerDeviceList = () => { pendingSpeakerDeviceList(); - asyncStdoutToPython("/get/list_speaker_device"); + asyncStdoutToPython("/get/data/speaker_device_list"); }; return { diff --git a/src-ui/logics/configs/useSpeakerThreshold.js b/src-ui/logics/configs/useSpeakerThreshold.js index 4049b817..9b98cad9 100644 --- a/src-ui/logics/configs/useSpeakerThreshold.js +++ b/src-ui/logics/configs/useSpeakerThreshold.js @@ -7,24 +7,24 @@ export const useSpeakerThreshold = () => { const { updateEnableAutomaticSpeakerThreshold, currentEnableAutomaticSpeakerThreshold, pendingEnableAutomaticSpeakerThreshold } = useStore_EnableAutomaticSpeakerThreshold(); const getSpeakerThreshold = () => { - asyncStdoutToPython("/get/speaker_energy_threshold"); + asyncStdoutToPython("/get/data/speaker_energy_threshold"); }; const setSpeakerThreshold = (speaker_threshold) => { - asyncStdoutToPython("/set/speaker_energy_threshold", speaker_threshold); + asyncStdoutToPython("/set/data/speaker_energy_threshold", speaker_threshold); }; const getEnableAutomaticSpeakerThreshold = () => { pendingEnableAutomaticSpeakerThreshold(); - asyncStdoutToPython("/get/speaker_dynamic_energy_threshold"); + asyncStdoutToPython("/get/data/speaker_automatic_threshold"); }; const toggleEnableAutomaticSpeakerThreshold = () => { pendingEnableAutomaticSpeakerThreshold(); if (currentEnableAutomaticSpeakerThreshold.data) { - asyncStdoutToPython("/set/disable_speaker_dynamic_energy_threshold"); + asyncStdoutToPython("/set/disable/speaker_automatic_threshold"); } else { - asyncStdoutToPython("/set/enable_speaker_dynamic_energy_threshold"); + asyncStdoutToPython("/set/enable/speaker_automatic_threshold"); } }; diff --git a/src-ui/logics/configs/useUiLanguage.js b/src-ui/logics/configs/useUiLanguage.js index cd45e6e1..149a8fb3 100644 --- a/src-ui/logics/configs/useUiLanguage.js +++ b/src-ui/logics/configs/useUiLanguage.js @@ -7,12 +7,12 @@ export const useUiLanguage = () => { const getUiLanguage = () => { pendingUiLanguage(); - asyncStdoutToPython("/get/ui_language"); + asyncStdoutToPython("/get/data/ui_language"); }; const setUiLanguage = (selected_ui_language) => { pendingUiLanguage(); - asyncStdoutToPython("/set/ui_language", selected_ui_language); + asyncStdoutToPython("/set/data/ui_language", selected_ui_language); }; return { diff --git a/src-ui/logics/main/useLanguageSettings.js b/src-ui/logics/main/useLanguageSettings.js index 64d3213c..003275fc 100644 --- a/src-ui/logics/main/useLanguageSettings.js +++ b/src-ui/logics/main/useLanguageSettings.js @@ -36,24 +36,24 @@ export const useLanguageSettings = () => { const getEnableMultiTranslation = () => { pendingEnableMultiTranslation(); - asyncStdoutToPython("/get/multi_language_translation"); + asyncStdoutToPython("/get/data/multi_language_translation"); }; const getSelectedPresetTabNumber = () => { pendingSelectedPresetTabNumber(); - asyncStdoutToPython("/get/selected_tab_no"); + asyncStdoutToPython("/get/data/selected_tab_no"); }; const setSelectedPresetTabNumber = (preset_number) => { pendingSelectedPresetTabNumber(); - asyncStdoutToPython("/set/selected_tab_no", preset_number); + asyncStdoutToPython("/set/data/selected_tab_no", preset_number); }; const getSelectedYourLanguages = () => { pendingSelectedPresetTabNumber(); - asyncStdoutToPython("/get/selected_your_languages"); + asyncStdoutToPython("/get/data/selected_your_languages"); }; const setSelectedYourLanguages = (selected_language_data) => { @@ -67,13 +67,13 @@ export const useLanguageSettings = () => { } } }; - asyncStdoutToPython("/set/selected_your_languages", send_obj); + asyncStdoutToPython("/set/data/selected_your_languages", send_obj); }; const getSelectedTargetLanguages = () => { pendingSelectedTargetLanguages(); - asyncStdoutToPython("/get/selected_target_languages"); + asyncStdoutToPython("/get/data/selected_target_languages"); }; const setSelectedTargetLanguages = (selected_language_data) => { @@ -83,25 +83,25 @@ export const useLanguageSettings = () => { send_obj[currentSelectedPresetTabNumber.data].primary.language = selected_language_data.language, send_obj[currentSelectedPresetTabNumber.data].primary.country = selected_language_data.country, - asyncStdoutToPython("/set/selected_target_languages", send_obj); + asyncStdoutToPython("/set/data/selected_target_languages", send_obj); }; const getTranslationEngines = () => { pendingTranslationEngines(); - asyncStdoutToPython("/get/list_translation_engines"); + asyncStdoutToPython("/get/data/translation_engines"); }; const getSelectedTranslationEngines = () => { pendingSelectedTranslationEngines(); - asyncStdoutToPython("/get/selected_translator_engines"); + asyncStdoutToPython("/get/data/selected_translation_engines"); }; const setSelectedTranslationEngines = (selected_translator) => { pendingSelectedTranslationEngines(); let send_obj = currentSelectedTranslationEngines.data; send_obj[currentSelectedPresetTabNumber.data] = selected_translator; - asyncStdoutToPython("/set/selected_translator_engines", send_obj); + asyncStdoutToPython("/set/data/selected_translator_engines", send_obj); }; diff --git a/src-ui/logics/main/useMainFunction.js b/src-ui/logics/main/useMainFunction.js index ffcc8607..4135c82b 100644 --- a/src-ui/logics/main/useMainFunction.js +++ b/src-ui/logics/main/useMainFunction.js @@ -35,27 +35,27 @@ export const useMainFunction = () => { const toggleTranslation = () => { pendingTranslationStatus(); if (currentTranslationStatus.data) { - asyncStdoutToPython("/set/disable_translation"); + asyncStdoutToPython("/set/disable/translation"); } else { - asyncStdoutToPython("/set/enable_translation"); + asyncStdoutToPython("/set/enable/translation"); } }; const toggleTranscriptionSend = () => { pendingTranscriptionSendStatus(); if (currentTranscriptionSendStatus.data) { - asyncStdoutToPython("/set/disable_transcription_send"); + asyncStdoutToPython("/set/disable/transcription_send"); } else { - asyncStdoutToPython("/set/enable_transcription_send"); + asyncStdoutToPython("/set/enable/transcription_send"); } }; const toggleTranscriptionReceive = () => { pendingTranscriptionReceiveStatus(); if (currentTranscriptionReceiveStatus.data) { - asyncStdoutToPython("/set/disable_transcription_receive"); + asyncStdoutToPython("/set/disable/transcription_receive"); } else { - asyncStdoutToPython("/set/enable_transcription_receive"); + asyncStdoutToPython("/set/enable/transcription_receive"); } }; diff --git a/src-ui/logics/main/useSelectableLanguageList.js b/src-ui/logics/main/useSelectableLanguageList.js index c2ad71cf..ef771d7f 100644 --- a/src-ui/logics/main/useSelectableLanguageList.js +++ b/src-ui/logics/main/useSelectableLanguageList.js @@ -6,7 +6,7 @@ export const useSelectableLanguageList = () => { const { currentSelectableLanguageList, updateSelectableLanguageList } = useStore_SelectableLanguageList(); const getSelectableLanguageList = () => { - asyncStdoutToPython("/get/list_languages"); + asyncStdoutToPython("/get/data/selectable_language_list"); }; return { diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index 2b8c7eeb..5eb3b574 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -67,22 +67,22 @@ export const useReceiveRoutes = () => { const routes = { // Main Page // Main Functions - "/set/enable_translation": updateTranslationStatus, - "/set/disable_translation": updateTranslationStatus, - "/set/enable_transcription_send": updateTranscriptionSendStatus, - "/set/disable_transcription_send": updateTranscriptionSendStatus, - "/set/enable_transcription_receive": updateTranscriptionReceiveStatus, - "/set/disable_transcription_receive": updateTranscriptionReceiveStatus, + "/set/enable/translation": updateTranslationStatus, + "/set/disable/translation": updateTranslationStatus, + "/set/enable/transcription_send": updateTranscriptionSendStatus, + "/set/disable/transcription_send": updateTranscriptionSendStatus, + "/set/enable/transcription_receive": updateTranscriptionReceiveStatus, + "/set/disable/transcription_receive": updateTranscriptionReceiveStatus, // Language Settings - "/get/selected_tab_no": updateSelectedPresetTabNumber, - "/set/selected_tab_no": updateSelectedPresetTabNumber, - "/get/multi_language_translation": updateEnableMultiTranslation, - "/get/selected_your_languages": updateSelectedYourLanguages, - "/set/selected_your_languages": updateSelectedYourLanguages, - "/get/selected_target_languages": updateSelectedTargetLanguages, - "/set/selected_target_languages": updateSelectedTargetLanguages, - "/get/list_translation_engines": (payload) => { + "/get/data/selected_tab_no": updateSelectedPresetTabNumber, + "/set/data/selected_tab_no": updateSelectedPresetTabNumber, + "/get/data/multi_language_translation": updateEnableMultiTranslation, + "/get/data/selected_your_languages": updateSelectedYourLanguages, + "/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 => ({ ...translator, @@ -94,76 +94,76 @@ export const useReceiveRoutes = () => { updateTranslationEngines(updated_list); }, - "/get/selected_translator_engines": updateSelectedTranslationEngines, - "/set/selected_translator_engines": updateSelectedTranslationEngines, + "/get/data/selected_translation_engines": updateSelectedTranslationEngines, + "/set/data/selected_translator_engines": updateSelectedTranslationEngines, // Language Selector - "/get/list_languages": updateSelectableLanguageList, + "/get/data/selectable_language_list": updateSelectableLanguageList, // Message "/run/send_message_box": updateSentMessageLogById, - "/action/transcription_send_mic_message": addSentMessageLog, - "/action/transcription_receive_speaker_message": addReceivedMessageLog, + "/run/transcription_send_mic_message": addSentMessageLog, + "/run/transcription_receive_speaker_message": addReceivedMessageLog, // Config Page // Common - "/get/version": updateSoftwareVersion, + "/get/data/version": updateSoftwareVersion, // Device Tab - "/get/auto_mic_select": updateEnableAutoMicSelect, - "/set/enable_auto_mic_select": updateEnableAutoMicSelect, - "/set/disable_auto_mic_select": updateEnableAutoMicSelect, - "/get/auto_speaker_select": updateEnableAutoSpeakerSelect, - "/set/enable_auto_speaker_select": updateEnableAutoSpeakerSelect, - "/set/disable_auto_speaker_select": updateEnableAutoSpeakerSelect, + "/get/data/auto_mic_select": updateEnableAutoMicSelect, + "/set/enable/auto_mic_select": updateEnableAutoMicSelect, + "/set/disable/auto_mic_select": updateEnableAutoMicSelect, + "/get/data/auto_speaker_select": updateEnableAutoSpeakerSelect, + "/set/enable/auto_speaker_select": updateEnableAutoSpeakerSelect, + "/set/disable/auto_speaker_select": updateEnableAutoSpeakerSelect, - "/get/list_mic_host": (payload) => updateMicHostList(arrayToObject(payload)), - "/get/selected_mic_host": updateSelectedMicHost, - "/set/selected_mic_host": (payload) => { + "/get/data/mic_host_list": (payload) => updateMicHostList(arrayToObject(payload)), + "/get/data/selected_mic_host": updateSelectedMicHost, + "/set/data/selected_mic_host": (payload) => { updateSelectedMicHost(payload.host); updateSelectedMicDevice(payload.device); }, - "/get/list_mic_device": (payload) => updateMicDeviceList(arrayToObject(payload)), - "/get/selected_mic_device": updateSelectedMicDevice, - "/set/selected_mic_device": updateSelectedMicDevice, + "/get/data/mic_device_list": (payload) => updateMicDeviceList(arrayToObject(payload)), + "/get/data/selected_mic_device": updateSelectedMicDevice, + "/set/data/selected_mic_device": updateSelectedMicDevice, - "/get/list_speaker_device": (payload) => updateSpeakerDeviceList(arrayToObject(payload)), - "/get/selected_speaker_device": updateSelectedSpeakerDevice, - "/set/selected_speaker_device": updateSelectedSpeakerDevice, + "/get/data/speaker_device_list": (payload) => updateSpeakerDeviceList(arrayToObject(payload)), + "/get/data/selected_speaker_device": updateSelectedSpeakerDevice, + "/set/data/selected_speaker_device": updateSelectedSpeakerDevice, - "/action/check_mic_threshold_energy": updateVolumeVariable_Mic, - "/action/check_speaker_threshold_energy": updateVolumeVariable_Speaker, - "/set/enable_check_mic_threshold": updateMicThresholdCheckStatus, - "/set/disable_check_mic_threshold": updateMicThresholdCheckStatus, - "/set/enable_check_speaker_threshold": updateSpeakerThresholdCheckStatus, - "/set/disable_check_speaker_threshold": updateSpeakerThresholdCheckStatus, + "/run/check_mic_volume": updateVolumeVariable_Mic, + "/run/check_speaker_volume": updateVolumeVariable_Speaker, + "/set/enable/check_mic_threshold": updateMicThresholdCheckStatus, + "/set/disable/check_mic_threshold": updateMicThresholdCheckStatus, + "/set/enable/check_speaker_threshold": updateSpeakerThresholdCheckStatus, + "/set/disable/check_speaker_threshold": updateSpeakerThresholdCheckStatus, - "/get/mic_energy_threshold": updateMicThreshold, - "/set/mic_energy_threshold": updateMicThreshold, - "/get/speaker_energy_threshold": updateSpeakerThreshold, - "/set/speaker_energy_threshold": updateSpeakerThreshold, + "/get/data/mic_threshold": updateMicThreshold, + "/set/data/mic_threshold": updateMicThreshold, + "/get/data/speaker_energy_threshold": updateSpeakerThreshold, + "/set/data/speaker_energy_threshold": updateSpeakerThreshold, - "/get/mic_dynamic_energy_threshold": updateEnableAutomaticMicThreshold, - "/set/enable_mic_dynamic_energy_threshold": updateEnableAutomaticMicThreshold, - "/set/disable_mic_dynamic_energy_threshold": updateEnableAutomaticMicThreshold, - "/get/speaker_dynamic_energy_threshold": updateEnableAutomaticSpeakerThreshold, - "/set/enable_speaker_dynamic_energy_threshold": updateEnableAutomaticSpeakerThreshold, - "/set/disable_speaker_dynamic_energy_threshold": updateEnableAutomaticSpeakerThreshold, + "/get/data/mic_automatic_threshold": updateEnableAutomaticMicThreshold, + "/set/enable/mic_automatic_threshold": updateEnableAutomaticMicThreshold, + "/set/disable/mic_automatic_threshold": updateEnableAutomaticMicThreshold, + "/get/data/speaker_automatic_threshold": updateEnableAutomaticSpeakerThreshold, + "/set/enable/speaker_automatic_threshold": updateEnableAutomaticSpeakerThreshold, + "/set/disable/speaker_automatic_threshold": updateEnableAutomaticSpeakerThreshold, // Appearance - "/get/ui_language": updateUiLanguage, - "/set/ui_language": updateUiLanguage, + "/get/data/ui_language": updateUiLanguage, + "/set/data/ui_language": updateUiLanguage, // Others Tab - "/get/auto_clear_message_box": updateEnableAutoClearMessageBox, - "/set/enable_auto_clear_message_box": updateEnableAutoClearMessageBox, - "/set/disable_auto_clear_message_box": updateEnableAutoClearMessageBox, + "/get/data/auto_clear_message_box": updateEnableAutoClearMessageBox, + "/set/enable/auto_clear_message_box": updateEnableAutoClearMessageBox, + "/set/disable/auto_clear_message_box": updateEnableAutoClearMessageBox, - "/get/send_message_button_type": updateSendMessageButtonType, - "/set/send_message_button_type": updateSendMessageButtonType, + "/get/data/send_message_button_type": updateSendMessageButtonType, + "/set/data/send_message_button_type": updateSendMessageButtonType, }; const receiveRoutes = (parsed_data) => {