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

[Update] Refactor compute type management: rename properties to 'SELECTED_TRANSLATION_COMPUTE_TYPE' and 'SELECTED_TRANSCRIPTION_COMPUTE_TYPE'

Browse Source
This commit is contained in:
misyaguziya
2025-09-27 07:07:54 +09:00
parent 5366622fca
commit 6effedcce2
4 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src-python/config.py
View File

@@ -815,15 +815,15 @@ class Config:
self.saveConfig(inspect.currentframe().f_code.co_name, value) self.saveConfig(inspect.currentframe().f_code.co_name, value)
@property @property
@json_serializable('TRANSLATION_COMPUTE_TYPE') @json_serializable('SELECTED_TRANSLATION_COMPUTE_TYPE')
def TRANSLATION_COMPUTE_TYPE(self): def SELECTED_TRANSLATION_COMPUTE_TYPE(self):
return self._TRANSLATION_COMPUTE_TYPE return self._SELECTED_TRANSLATION_COMPUTE_TYPE
@TRANSLATION_COMPUTE_TYPE.setter @SELECTED_TRANSLATION_COMPUTE_TYPE.setter
def TRANSLATION_COMPUTE_TYPE(self, value): def SELECTED_TRANSLATION_COMPUTE_TYPE(self, value):
if isinstance(value, str): if isinstance(value, str):
if value in self.SELECTED_TRANSLATION_COMPUTE_DEVICE["compute_types"]: if value in self.SELECTED_TRANSLATION_COMPUTE_DEVICE["compute_types"]:
self._TRANSLATION_COMPUTE_TYPE = value self._SELECTED_TRANSLATION_COMPUTE_TYPE = value
self.saveConfig(inspect.currentframe().f_code.co_name, value) self.saveConfig(inspect.currentframe().f_code.co_name, value)
@property @property
@@ -839,15 +839,15 @@ class Config:
self.saveConfig(inspect.currentframe().f_code.co_name, value) self.saveConfig(inspect.currentframe().f_code.co_name, value)
@property @property
@json_serializable('TRANSCRIPTION_COMPUTE_TYPE') @json_serializable('SELECTED_TRANSCRIPTION_COMPUTE_TYPE')
def TRANSCRIPTION_COMPUTE_TYPE(self): def SELECTED_TRANSCRIPTION_COMPUTE_TYPE(self):
return self._TRANSCRIPTION_COMPUTE_TYPE return self._SELECTED_TRANSCRIPTION_COMPUTE_TYPE
@TRANSCRIPTION_COMPUTE_TYPE.setter @SELECTED_TRANSCRIPTION_COMPUTE_TYPE.setter
def TRANSCRIPTION_COMPUTE_TYPE(self, value): def SELECTED_TRANSCRIPTION_COMPUTE_TYPE(self, value):
if isinstance(value, str): if isinstance(value, str):
if value in self.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["compute_types"]: if value in self.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["compute_types"]:
self._TRANSCRIPTION_COMPUTE_TYPE = value self._SELECTED_TRANSCRIPTION_COMPUTE_TYPE = value
self.saveConfig(inspect.currentframe().f_code.co_name, value) self.saveConfig(inspect.currentframe().f_code.co_name, value)
@property @property
@@ -1209,9 +1209,9 @@ class Config:
self._SELECTED_TRANSLATION_COMPUTE_DEVICE = copy.deepcopy(self.SELECTABLE_COMPUTE_DEVICE_LIST[0]) self._SELECTED_TRANSLATION_COMPUTE_DEVICE = copy.deepcopy(self.SELECTABLE_COMPUTE_DEVICE_LIST[0])
self._SELECTED_TRANSCRIPTION_COMPUTE_DEVICE = copy.deepcopy(self.SELECTABLE_COMPUTE_DEVICE_LIST[0]) self._SELECTED_TRANSCRIPTION_COMPUTE_DEVICE = copy.deepcopy(self.SELECTABLE_COMPUTE_DEVICE_LIST[0])
self._CTRANSLATE2_WEIGHT_TYPE = "small" self._CTRANSLATE2_WEIGHT_TYPE = "small"
self._TRANSLATION_COMPUTE_TYPE = "auto" self._SELECTED_TRANSLATION_COMPUTE_TYPE = "auto"
self._WHISPER_WEIGHT_TYPE = "base" self._WHISPER_WEIGHT_TYPE = "base"
self._TRANSCRIPTION_COMPUTE_TYPE = "auto" self._SELECTED_TRANSCRIPTION_COMPUTE_TYPE = "auto"
self._AUTO_CLEAR_MESSAGE_BOX = True self._AUTO_CLEAR_MESSAGE_BOX = True
self._SEND_ONLY_TRANSLATED_MESSAGES = False self._SEND_ONLY_TRANSLATED_MESSAGES = False
self._OVERLAY_SMALL_LOG = False self._OVERLAY_SMALL_LOG = False

36
src-python/controller.py
View File

@@ -659,12 +659,12 @@ class Controller:
def setSelectedTranslationComputeDevice(self, device:str, *args, **kwargs) -> dict: def setSelectedTranslationComputeDevice(self, device:str, *args, **kwargs) -> dict:
printLog("setSelectedTranslationComputeDevice", device) printLog("setSelectedTranslationComputeDevice", device)
pre_device = config.SELECTED_TRANSLATION_COMPUTE_DEVICE pre_device = config.SELECTED_TRANSLATION_COMPUTE_DEVICE
pre_compute_type = config.TRANSLATION_COMPUTE_TYPE pre_compute_type = config.SELECTED_TRANSLATION_COMPUTE_TYPE
config.SELECTED_TRANSLATION_COMPUTE_DEVICE = device config.SELECTED_TRANSLATION_COMPUTE_DEVICE = device
config.TRANSLATION_COMPUTE_TYPE = "auto" config.SELECTED_TRANSLATION_COMPUTE_TYPE = "auto"
try: try:
model.changeTranslatorCTranslate2Model() model.changeTranslatorCTranslate2Model()
self.run(200, self.run_mapping["translation_compute_type"], config.TRANSLATION_COMPUTE_TYPE) self.run(200, self.run_mapping["selected_translation_compute_type"], config.SELECTED_TRANSLATION_COMPUTE_TYPE)
except Exception as e: except Exception as e:
# VRAM不足エラーの検出（デバイス切り替え時） # VRAM不足エラーの検出（デバイス切り替え時）
is_vram_error, error_message = model.detectVRAMError(e) is_vram_error, error_message = model.detectVRAMError(e)
@@ -672,7 +672,7 @@ class Controller:
# 前のデバイス設定に戻す # 前のデバイス設定に戻す
printLog("VRAM error detected, reverting device setting") printLog("VRAM error detected, reverting device setting")
config.SELECTED_TRANSLATION_COMPUTE_DEVICE = pre_device config.SELECTED_TRANSLATION_COMPUTE_DEVICE = pre_device
config.TRANSLATION_COMPUTE_TYPE = pre_compute_type config.SELECTED_TRANSLATION_COMPUTE_TYPE = pre_compute_type
model.changeTranslatorCTranslate2Model() model.changeTranslatorCTranslate2Model()
else: else:
# その他のエラーは通常通り処理 # その他のエラーは通常通り処理
@@ -690,8 +690,8 @@ class Controller:
def setSelectedTranscriptionComputeDevice(self, device:str, *args, **kwargs) -> dict: def setSelectedTranscriptionComputeDevice(self, device:str, *args, **kwargs) -> dict:
printLog("setSelectedTranscriptionComputeDevice", device) printLog("setSelectedTranscriptionComputeDevice", device)
config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE = device config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE = device
config.TRANSCRIPTION_COMPUTE_TYPE = "auto" config.SELECTED_TRANSCRIPTION_COMPUTE_TYPE = "auto"
self.run(200, self.run_mapping["transcription_compute_type"], config.TRANSCRIPTION_COMPUTE_TYPE) self.run(200, self.run_mapping["selected_transcription_compute_type"], config.SELECTED_TRANSCRIPTION_COMPUTE_TYPE)
return {"status":200,"result":config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE} return {"status":200,"result":config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE}
@staticmethod @staticmethod
@@ -1455,13 +1455,13 @@ class Controller:
return {"status":200, "result":config.CTRANSLATE2_WEIGHT_TYPE} return {"status":200, "result":config.CTRANSLATE2_WEIGHT_TYPE}
@staticmethod @staticmethod
def getTranslationComputeType(*args, **kwargs) -> dict: def getSelectedTranslationComputeType(*args, **kwargs) -> dict:
return {"status":200, "result":config.TRANSLATION_COMPUTE_TYPE} return {"status":200, "result":config.SELECTED_TRANSLATION_COMPUTE_TYPE}
@staticmethod @staticmethod
def setTranslationComputeType(data, *args, **kwargs) -> dict: def setSelectedTranslationComputeType(data, *args, **kwargs) -> dict:
pre_compute_type = config.TRANSLATION_COMPUTE_TYPE pre_compute_type = config.SELECTED_TRANSLATION_COMPUTE_TYPE
config.TRANSLATION_COMPUTE_TYPE = str(data) config.SELECTED_TRANSLATION_COMPUTE_TYPE = str(data)
if model.checkTranslatorCTranslate2ModelWeight(config.CTRANSLATE2_WEIGHT_TYPE): if model.checkTranslatorCTranslate2ModelWeight(config.CTRANSLATE2_WEIGHT_TYPE):
def callback(): def callback():
model.changeTranslatorCTranslate2Model() model.changeTranslatorCTranslate2Model()
@@ -1470,8 +1470,8 @@ class Controller:
th_callback.start() th_callback.start()
th_callback.join() th_callback.join()
else: else:
config.TRANSLATION_COMPUTE_TYPE = pre_compute_type config.SELECTED_TRANSLATION_COMPUTE_TYPE = pre_compute_type
return {"status":200, "result":config.TRANSLATION_COMPUTE_TYPE} return {"status":200, "result":config.SELECTED_TRANSLATION_COMPUTE_TYPE}
@staticmethod @staticmethod
def getWhisperWeightType(*args, **kwargs) -> dict: def getWhisperWeightType(*args, **kwargs) -> dict:
@@ -1483,13 +1483,13 @@ class Controller:
return {"status":200, "result": config.WHISPER_WEIGHT_TYPE} return {"status":200, "result": config.WHISPER_WEIGHT_TYPE}
@staticmethod @staticmethod
def getTranscriptionComputeType(*args, **kwargs) -> dict: def getSelectedTranscriptionComputeType(*args, **kwargs) -> dict:
return {"status":200, "result":config.TRANSCRIPTION_COMPUTE_TYPE} return {"status":200, "result":config.SELECTED_TRANSCRIPTION_COMPUTE_TYPE}
@staticmethod @staticmethod
def setTranscriptionComputeType(data, *args, **kwargs) -> dict: def setSelectedTranscriptionComputeType(data, *args, **kwargs) -> dict:
config.TRANSCRIPTION_COMPUTE_TYPE = str(data) config.SELECTED_TRANSCRIPTION_COMPUTE_TYPE = str(data)
return {"status":200, "result":config.TRANSCRIPTION_COMPUTE_TYPE} return {"status":200, "result":config.SELECTED_TRANSCRIPTION_COMPUTE_TYPE}
@staticmethod @staticmethod
def getSendMessageFormatParts(*args, **kwargs) -> dict: def getSendMessageFormatParts(*args, **kwargs) -> dict:

12
src-python/mainloop.py
View File

@@ -48,8 +48,8 @@ run_mapping = {
"selected_translation_engines":"/run/selected_translation_engines", "selected_translation_engines":"/run/selected_translation_engines",
"translation_engines":"/run/translation_engines", "translation_engines":"/run/translation_engines",
"translation_compute_type":"/run/translation_compute_type", "selected_translation_compute_type":"/run/selected_translation_compute_type",
"transcription_compute_type":"/run/transcription_compute_type", "selected_transcription_compute_type":"/run/selected_transcription_compute_type",
"mic_host_list":"/run/mic_host_list", "mic_host_list":"/run/mic_host_list",
"mic_device_list":"/run/mic_device_list", "mic_device_list":"/run/mic_device_list",
@@ -165,8 +165,8 @@ mapping = {
"/get/data/ctranslate2_weight_type": {"status": True, "variable":controller.getCtranslate2WeightType}, "/get/data/ctranslate2_weight_type": {"status": True, "variable":controller.getCtranslate2WeightType},
"/set/data/ctranslate2_weight_type": {"status": True, "variable":controller.setCtranslate2WeightType}, "/set/data/ctranslate2_weight_type": {"status": True, "variable":controller.setCtranslate2WeightType},
"/get/data/translation_compute_type": {"status": True, "variable":controller.getTranslationComputeType}, "/get/data/selected_translation_compute_type": {"status": True, "variable":controller.getSelectedTranslationComputeType},
"/set/data/translation_compute_type": {"status": True, "variable":controller.setTranslationComputeType}, "/set/data/selected_translation_compute_type": {"status": True, "variable":controller.setSelectedTranslationComputeType},
"/run/download_ctranslate2_weight": {"status": True, "variable":controller.downloadCtranslate2Weight}, "/run/download_ctranslate2_weight": {"status": True, "variable":controller.downloadCtranslate2Weight},
@@ -271,8 +271,8 @@ mapping = {
"/get/data/whisper_weight_type": {"status": True, "variable":controller.getWhisperWeightType}, "/get/data/whisper_weight_type": {"status": True, "variable":controller.getWhisperWeightType},
"/set/data/whisper_weight_type": {"status": True, "variable":controller.setWhisperWeightType}, "/set/data/whisper_weight_type": {"status": True, "variable":controller.setWhisperWeightType},
"/get/data/transcription_compute_type": {"status": True, "variable":controller.getTranscriptionComputeType}, "/get/data/selected_transcription_compute_type": {"status": True, "variable":controller.getSelectedTranscriptionComputeType},
"/set/data/transcription_compute_type": {"status": True, "variable":controller.setTranscriptionComputeType}, "/set/data/selected_transcription_compute_type": {"status": True, "variable":controller.setSelectedTranscriptionComputeType},
"/run/download_whisper_weight": {"status": True, "variable":controller.downloadWhisperWeight}, "/run/download_whisper_weight": {"status": True, "variable":controller.downloadWhisperWeight},

6
src-python/model.py
View File

@@ -116,7 +116,7 @@ class Model:
model_type=config.CTRANSLATE2_WEIGHT_TYPE, model_type=config.CTRANSLATE2_WEIGHT_TYPE,
device=config.SELECTED_TRANSLATION_COMPUTE_DEVICE["device"], device=config.SELECTED_TRANSLATION_COMPUTE_DEVICE["device"],
device_index=config.SELECTED_TRANSLATION_COMPUTE_DEVICE["device_index"], device_index=config.SELECTED_TRANSLATION_COMPUTE_DEVICE["device_index"],
compute_type=config.TRANSLATION_COMPUTE_TYPE compute_type=config.SELECTED_TRANSLATION_COMPUTE_TYPE
) )
def downloadCTranslate2ModelWeight(self, weight_type, callback=None, end_callback=None): def downloadCTranslate2ModelWeight(self, weight_type, callback=None, end_callback=None):
@@ -440,7 +440,7 @@ class Model:
whisper_weight_type=config.WHISPER_WEIGHT_TYPE, whisper_weight_type=config.WHISPER_WEIGHT_TYPE,
device=config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device"], device=config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device"],
device_index=config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device_index"], device_index=config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device_index"],
compute_type=config.TRANSCRIPTION_COMPUTE_TYPE, compute_type=config.SELECTED_TRANSCRIPTION_COMPUTE_TYPE,
) )
def sendMicTranscript(): def sendMicTranscript():
try: try:
@@ -624,7 +624,7 @@ class Model:
whisper_weight_type=config.WHISPER_WEIGHT_TYPE, whisper_weight_type=config.WHISPER_WEIGHT_TYPE,
device=config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device"], device=config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device"],
device_index=config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device_index"], device_index=config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device_index"],
compute_type=config.TRANSCRIPTION_COMPUTE_TYPE, compute_type=config.SELECTED_TRANSCRIPTION_COMPUTE_TYPE,
) )
def sendSpeakerTranscript(): def sendSpeakerTranscript():
try: try: