👍️[Update] Main : 以下のエンドポイントでEngineとweightを同時にセットするように変更

- /set/data/selected_translation_engines
- /set/data/selected_transcription_engine

src-python/config.py

@@ -937,7 +937,7 @@ class Config:
         # Save Json Data
         ## Main Window
         self._SELECTED_TAB_NO = "1"
-        self._SELECTED_TRANSLATION_ENGINES= {
+        self._SELECTED_TRANSLATION_ENGINES = {
             "1":"CTranslate2",
             "2":"CTranslate2",
             "3":"CTranslate2",

src-python/webui_controller.py

@@ -514,13 +514,33 @@ class Controller:
 
     @staticmethod
     def getSelectedTranslationEngines(*args, **kwargs) -> dict:
-        return {"status":200, "result":config.SELECTED_TRANSLATION_ENGINES}
+        data = {
+            "engines":config.SELECTED_TRANSLATION_ENGINES,
+            "weight_type":config.CTRANSLATE2_WEIGHT_TYPE,
+        }
+        return {"status":200, "result":data}
 
     @staticmethod
-    def setSelectedTranslationEngines(engines:dict, *args, **kwargs) -> dict:
+    def setSelectedTranslationEngines(data:dict, *args, **kwargs) -> dict:
-        printLog("setSelectedTranslationEngines", engines)
+        config.SELECTED_TRANSLATION_ENGINES = data.get("engines", {
-        config.SELECTED_TRANSLATION_ENGINES = engines
+            "1":"CTranslate2",
-        return {"status":200,"result":config.SELECTED_TRANSLATION_ENGINES}
+            "2":"CTranslate2",
+            "3":"CTranslate2",
+        })
+        config.CTRANSLATE2_WEIGHT_TYPE = data.get("weight_type", "small")
+
+        if model.checkTranslatorCTranslate2ModelWeight(config.CTRANSLATE2_WEIGHT_TYPE):
+            def callback():
+                model.changeTranslatorCTranslate2Model()
+            th_callback = Thread(target=callback)
+            th_callback.daemon = True
+            th_callback.start()
+
+        data = {
+            "engines":config.SELECTED_TRANSLATION_ENGINES,
+            "weight_type":config.CTRANSLATE2_WEIGHT_TYPE,
+        }
+        return {"status":200,"result":data}
 
     @staticmethod
     def getSelectedYourLanguages(*args, **kwargs) -> dict:
@@ -542,12 +562,21 @@ class Controller:
 
     @staticmethod
     def getSelectedTranscriptionEngine(*args, **kwargs) -> dict:
-        return {"status":200, "result":config.SELECTED_TRANSCRIPTION_ENGINE}
+        data = {
+            "engine":config.SELECTED_TRANSCRIPTION_ENGINE,
+            "weight_type":config.WHISPER_WEIGHT_TYPE,
+        }
+        return {"status":200, "result":data}
 
     @staticmethod
-    def setSelectedTranscriptionEngine(data, *args, **kwargs) -> dict:
+    def setSelectedTranscriptionEngine(data:dict, *args, **kwargs) -> dict:
-        config.SELECTED_TRANSCRIPTION_ENGINE = str(data)
+        config.SELECTED_TRANSCRIPTION_ENGINE = data.get("engine", "Google")
-        return {"status":200, "result":config.SELECTED_TRANSCRIPTION_ENGINE}
+        config.WHISPER_WEIGHT_TYPE = data.get("weight_type", "base")
+        data = {
+            "engine":config.SELECTED_TRANSCRIPTION_ENGINE,
+            "weight_type":config.WHISPER_WEIGHT_TYPE,
+        }
+        return {"status":200, "result":data}
 
     @staticmethod
     def getMultiLanguageTranslation(*args, **kwargs) -> dict:
@@ -1101,30 +1130,6 @@ class Controller:
         self.updateTranslationEngineAndEngineList()
         return {"status":200, "result":config.AUTH_KEYS["DeepL_API"]}
 
-    @staticmethod
-    def getCtranslate2WeightType(*args, **kwargs) -> dict:
-        return {"status":200, "result":config.CTRANSLATE2_WEIGHT_TYPE}
-
-    @staticmethod
-    def setCtranslate2WeightType(data, *args, **kwargs) -> dict:
-        config.CTRANSLATE2_WEIGHT_TYPE = str(data)
-        if model.checkTranslatorCTranslate2ModelWeight(config.CTRANSLATE2_WEIGHT_TYPE):
-            def callback():
-                model.changeTranslatorCTranslate2Model()
-            th_callback = Thread(target=callback)
-            th_callback.daemon = True
-            th_callback.start()
-        return {"status":200, "result":config.CTRANSLATE2_WEIGHT_TYPE}
-
-    @staticmethod
-    def getWhisperWeightType(*args, **kwargs) -> dict:
-        return {"status":200, "result":config.WHISPER_WEIGHT_TYPE}
-
-    @staticmethod
-    def setWhisperWeightType(data, *args, **kwargs) -> dict:
-        config.WHISPER_WEIGHT_TYPE = str(data)
-        return {"status":200, "result": config.WHISPER_WEIGHT_TYPE}
-
     @staticmethod
     def getAutoClearMessageBox(*args, **kwargs) -> dict:
         return {"status":200, "result":config.AUTO_CLEAR_MESSAGE_BOX}
@@ -1633,9 +1638,9 @@ class Controller:
     def updateComputeDeviceSettings() -> None:
         if torch.cuda.is_available() is False:
             if config.SELECTED_TRANSLATION_COMPUTE_DEVICE["device"] != "cpu":
-                config.SELECTED_TRANSLATION_COMPUTE_DEVICE = {"device":"cpu", "device_id":0, "device_name":"cpu"}
+                config.SELECTED_TRANSLATION_COMPUTE_DEVICE = {"device":"cpu", "device_index":0, "device_name":"cpu"}
             if config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device"] != "cpu":
-                config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE = {"device":"cpu", "device_id":0, "device_name":"cpu"}
+                config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE = {"device":"cpu", "device_index":0, "device_name":"cpu"}
 
     @staticmethod
     def startWatchdog(*args, **kwargs) -> dict:

src-python/webui_mainloop.py

@@ -136,10 +136,6 @@ mapping = {
     "/set/data/selected_translation_compute_device": {"status": True, "variable":controller.setSelectedTranslationComputeDevice},
 
     "/get/data/selectable_ctranslate2_weight_type_dict": {"status": True, "variable":controller.getSelectableCtranslate2WeightTypeDict},
-
-    "/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/data/deepl_auth_key": {"status": False, "variable":controller.getDeepLAuthKey},
@@ -241,10 +237,6 @@ mapping = {
     "/set/data/selected_transcription_compute_device": {"status": True, "variable":controller.setSelectedTranscriptionComputeDevice},
 
     "/get/data/selectable_whisper_weight_type_dict": {"status": True, "variable":controller.getSelectableWhisperWeightTypeDict},
-
-    "/get/data/whisper_weight_type": {"status": True, "variable":controller.getWhisperWeightType},
-    "/set/data/whisper_weight_type": {"status": True, "variable":controller.setWhisperWeightType},
-
     "/run/download_whisper_weight": {"status": True, "variable":controller.downloadWhisperWeight},
 
     # VR