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

[Update] Config: Add model revalidation logic to ensure selected models are valid based on available options.

Browse Source
This commit is contained in:
misyaguziya
2025-11-23 00:59:09 +09:00
parent add96c1fda
commit 5ca809c8dd
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src-python/config.py
View File

@@ -527,6 +527,19 @@ def _compute_device_validator(val, inst):
return copy.deepcopy(val)
return None
def _allowed_in_populated(list_attr_name: str):
def _inner(value, inst):
try:
lst = getattr(inst, list_attr_name)
except Exception:
return True # インスタンス状態取得失敗時も弾かない
if not lst: # 空/未初期化
return True
if value is None:
return True
return value in lst
return _inner
class Config:
"""Application configuration singleton.
@@ -719,11 +732,11 @@ class Config:
USE_EXCLUDE_WORDS = ManagedProperty('USE_EXCLUDE_WORDS', type_=bool)
CTRANSLATE2_WEIGHT_TYPE = ManagedProperty('CTRANSLATE2_WEIGHT_TYPE', type_=str, allowed=lambda v, inst: v in inst.SELECTABLE_CTRANSLATE2_WEIGHT_TYPE_LIST)
WHISPER_WEIGHT_TYPE = ManagedProperty('WHISPER_WEIGHT_TYPE', type_=str, allowed=lambda v, inst: v in inst.SELECTABLE_WHISPER_WEIGHT_TYPE_LIST)
SELECTED_PLAMO_MODEL = ManagedProperty('SELECTED_PLAMO_MODEL', type_=str, allowed=lambda v, inst: v in inst.SELECTABLE_PLAMO_MODEL_LIST)
SELECTED_GEMINI_MODEL = ManagedProperty('SELECTED_GEMINI_MODEL', type_=str, allowed=lambda v, inst: v in inst.SELECTABLE_GEMINI_MODEL_LIST)
SELECTED_OPENAI_MODEL = ManagedProperty('SELECTED_OPENAI_MODEL', type_=str, allowed=lambda v, inst: v in inst.SELECTABLE_OPENAI_MODEL_LIST)
SELECTED_LMSTUDIO_MODEL = ManagedProperty('SELECTED_LMSTUDIO_MODEL', type_=str, allowed=lambda v, inst: v in inst.SELECTABLE_LMSTUDIO_MODEL_LIST)
SELECTED_OLLAMA_MODEL = ManagedProperty('SELECTED_OLLAMA_MODEL', type_=str, allowed=lambda v, inst: v in inst.SELECTABLE_OLLAMA_MODEL_LIST)
SELECTED_PLAMO_MODEL = ManagedProperty('SELECTED_PLAMO_MODEL', type_=str, allowed=_allowed_in_populated('SELECTABLE_PLAMO_MODEL_LIST'))
SELECTED_GEMINI_MODEL = ManagedProperty('SELECTED_GEMINI_MODEL', type_=str, allowed=_allowed_in_populated('SELECTABLE_GEMINI_MODEL_LIST'))
SELECTED_OPENAI_MODEL = ManagedProperty('SELECTED_OPENAI_MODEL', type_=str, allowed=_allowed_in_populated('SELECTABLE_OPENAI_MODEL_LIST'))
SELECTED_LMSTUDIO_MODEL = ManagedProperty('SELECTED_LMSTUDIO_MODEL', type_=str, allowed=_allowed_in_populated('SELECTABLE_LMSTUDIO_MODEL_LIST'))
SELECTED_OLLAMA_MODEL = ManagedProperty('SELECTED_OLLAMA_MODEL', type_=str, allowed=_allowed_in_populated('SELECTABLE_OLLAMA_MODEL_LIST'))
# --- Translation and language settings ---
MIC_WORD_FILTER = ValidatedProperty('MIC_WORD_FILTER', _mic_word_filter_validator)
@@ -1033,6 +1046,26 @@ class Config:
errorLogging()
self.saveConfigToFile()
def revalidate_selected_models(self):
pairs = [
('SELECTED_PLAMO_MODEL', 'SELECTABLE_PLAMO_MODEL_LIST'),
('SELECTED_GEMINI_MODEL', 'SELECTABLE_GEMINI_MODEL_LIST'),
('SELECTED_OPENAI_MODEL', 'SELECTABLE_OPENAI_MODEL_LIST'),
('SELECTED_LMSTUDIO_MODEL', 'SELECTABLE_LMSTUDIO_MODEL_LIST'),
('SELECTED_OLLAMA_MODEL', 'SELECTABLE_OLLAMA_MODEL_LIST'),
]
for sel_attr, list_attr in pairs:
try:
current = getattr(self, sel_attr)
lst = getattr(self, list_attr)
if lst and current is not None and current not in lst:
if len(lst) > 0:
setattr(self, sel_attr, lst[0])
else:
setattr(self, sel_attr, None)
except Exception:
errorLogging()
# Auto-register all descriptors after Config class definition
_auto_register_descriptors()

3
src-python/controller.py
View File

@@ -3138,6 +3138,9 @@ class Controller:
model.stopWebSocketServer()
printLog("WebSocket server host or port is not available")
printLog("Revalidate Selected Models")
config.revalidate_selected_models()
printLog("Update settings")
self.updateConfigSettings()