Merge branch 'ui_add_new_translation_engines' into develop
This commit is contained in:
@@ -527,6 +527,19 @@ def _compute_device_validator(val, inst):
|
|||||||
return copy.deepcopy(val)
|
return copy.deepcopy(val)
|
||||||
return None
|
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:
|
class Config:
|
||||||
"""Application configuration singleton.
|
"""Application configuration singleton.
|
||||||
@@ -558,8 +571,16 @@ class Config:
|
|||||||
return cls._instance
|
return cls._instance
|
||||||
|
|
||||||
def saveConfigToFile(self) -> None:
|
def saveConfigToFile(self) -> None:
|
||||||
|
# 永続化対象を descriptor 情報 (json_serializable_vars) から再構成
|
||||||
|
filtered = {}
|
||||||
|
for var_name, var_func in json_serializable_vars.items():
|
||||||
|
try:
|
||||||
|
filtered[var_name] = var_func(self)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
self._config_data = filtered
|
||||||
with open(self.PATH_CONFIG, "w", encoding="utf-8") as fp:
|
with open(self.PATH_CONFIG, "w", encoding="utf-8") as fp:
|
||||||
json_dump(self._config_data, fp, indent=4, ensure_ascii=False)
|
json_dump(filtered, fp, indent=4, ensure_ascii=False)
|
||||||
|
|
||||||
def saveConfig(self, key: str, value: Any, immediate_save: bool = False) -> None:
|
def saveConfig(self, key: str, value: Any, immediate_save: bool = False) -> None:
|
||||||
self._config_data[key] = value
|
self._config_data[key] = value
|
||||||
@@ -601,12 +622,12 @@ class Config:
|
|||||||
|
|
||||||
# Read Write
|
# Read Write
|
||||||
# --- Simple boolean flags (managed by descriptor) ---
|
# --- Simple boolean flags (managed by descriptor) ---
|
||||||
ENABLE_TRANSLATION = ManagedProperty('ENABLE_TRANSLATION', type_=bool)
|
ENABLE_TRANSLATION = ManagedProperty('ENABLE_TRANSLATION', type_=bool, serialize=False)
|
||||||
ENABLE_TRANSCRIPTION_SEND = ManagedProperty('ENABLE_TRANSCRIPTION_SEND', type_=bool)
|
ENABLE_TRANSCRIPTION_SEND = ManagedProperty('ENABLE_TRANSCRIPTION_SEND', type_=bool, serialize=False)
|
||||||
ENABLE_TRANSCRIPTION_RECEIVE = ManagedProperty('ENABLE_TRANSCRIPTION_RECEIVE', type_=bool)
|
ENABLE_TRANSCRIPTION_RECEIVE = ManagedProperty('ENABLE_TRANSCRIPTION_RECEIVE', type_=bool, serialize=False)
|
||||||
ENABLE_FOREGROUND = ManagedProperty('ENABLE_FOREGROUND', type_=bool)
|
ENABLE_FOREGROUND = ManagedProperty('ENABLE_FOREGROUND', type_=bool, serialize=False)
|
||||||
ENABLE_CHECK_ENERGY_SEND = ManagedProperty('ENABLE_CHECK_ENERGY_SEND', type_=bool)
|
ENABLE_CHECK_ENERGY_SEND = ManagedProperty('ENABLE_CHECK_ENERGY_SEND', type_=bool, serialize=False)
|
||||||
ENABLE_CHECK_ENERGY_RECEIVE = ManagedProperty('ENABLE_CHECK_ENERGY_RECEIVE', type_=bool)
|
ENABLE_CHECK_ENERGY_RECEIVE = ManagedProperty('ENABLE_CHECK_ENERGY_RECEIVE', type_=bool, serialize=False)
|
||||||
|
|
||||||
# --- Selectable dict/list properties (managed by descriptor, not serialized) ---
|
# --- Selectable dict/list properties (managed by descriptor, not serialized) ---
|
||||||
# These are dynamically generated in init_config() based on installed packages/APIs
|
# These are dynamically generated in init_config() based on installed packages/APIs
|
||||||
@@ -711,11 +732,11 @@ class Config:
|
|||||||
USE_EXCLUDE_WORDS = ManagedProperty('USE_EXCLUDE_WORDS', type_=bool)
|
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)
|
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)
|
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_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=lambda v, inst: v in inst.SELECTABLE_GEMINI_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=lambda v, inst: v in inst.SELECTABLE_OPENAI_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=lambda v, inst: v in inst.SELECTABLE_LMSTUDIO_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=lambda v, inst: v in inst.SELECTABLE_OLLAMA_MODEL_LIST)
|
SELECTED_OLLAMA_MODEL = ManagedProperty('SELECTED_OLLAMA_MODEL', type_=str, allowed=_allowed_in_populated('SELECTABLE_OLLAMA_MODEL_LIST'))
|
||||||
|
|
||||||
# --- Translation and language settings ---
|
# --- Translation and language settings ---
|
||||||
MIC_WORD_FILTER = ValidatedProperty('MIC_WORD_FILTER', _mic_word_filter_validator)
|
MIC_WORD_FILTER = ValidatedProperty('MIC_WORD_FILTER', _mic_word_filter_validator)
|
||||||
@@ -1006,15 +1027,44 @@ class Config:
|
|||||||
self._config_data = json_load(fp)
|
self._config_data = json_load(fp)
|
||||||
|
|
||||||
for key, value in self._config_data.items():
|
for key, value in self._config_data.items():
|
||||||
|
# 読み込み時: serialize=True かつ readonlyでない Descriptor のみ反映。
|
||||||
|
# 未知キー(Descriptorなし)は無視して注入を防止。
|
||||||
try:
|
try:
|
||||||
setattr(self, key, value)
|
descriptor = getattr(type(self), key, None)
|
||||||
|
if isinstance(descriptor, ManagedProperty):
|
||||||
|
if descriptor.readonly or not descriptor.serialize:
|
||||||
|
continue
|
||||||
|
setattr(self, key, value)
|
||||||
|
elif isinstance(descriptor, ValidatedProperty):
|
||||||
|
if not descriptor.serialize:
|
||||||
|
continue
|
||||||
|
setattr(self, key, value)
|
||||||
|
else:
|
||||||
|
# 不明キーは破棄(古い/不要/改竄の可能性)
|
||||||
|
continue
|
||||||
except Exception:
|
except Exception:
|
||||||
errorLogging()
|
errorLogging()
|
||||||
|
self.saveConfigToFile()
|
||||||
|
|
||||||
with open(self.PATH_CONFIG, 'w', encoding="utf-8") as fp:
|
def revalidate_selected_models(self):
|
||||||
for var_name, var_func in json_serializable_vars.items():
|
pairs = [
|
||||||
self._config_data[var_name] = var_func(self)
|
('SELECTED_PLAMO_MODEL', 'SELECTABLE_PLAMO_MODEL_LIST'),
|
||||||
json_dump(self._config_data, fp, indent=4, ensure_ascii=False)
|
('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 all descriptors after Config class definition
|
||||||
_auto_register_descriptors()
|
_auto_register_descriptors()
|
||||||
|
|||||||
@@ -1900,6 +1900,9 @@ class Controller:
|
|||||||
}
|
}
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
def getTranslatorLMStudioConnection(self, *args, **kwargs) -> dict:
|
||||||
|
return {"status":200, "result":model.getTranslatorLMStudioConnected()}
|
||||||
|
|
||||||
def checkTranslatorLMStudioConnection(self, *args, **kwargs) -> dict:
|
def checkTranslatorLMStudioConnection(self, *args, **kwargs) -> dict:
|
||||||
printLog("Check Translator LMStudio Connection")
|
printLog("Check Translator LMStudio Connection")
|
||||||
translator_name = "LMStudio"
|
translator_name = "LMStudio"
|
||||||
@@ -1909,10 +1912,12 @@ class Controller:
|
|||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[translator_name] = True
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[translator_name] = True
|
||||||
config.SELECTABLE_LMSTUDIO_MODEL_LIST = model.getTranslatorLMStudioModelList()
|
config.SELECTABLE_LMSTUDIO_MODEL_LIST = model.getTranslatorLMStudioModelList()
|
||||||
self.run(200, self.run_mapping["selectable_lmstudio_model_list"], config.SELECTABLE_LMSTUDIO_MODEL_LIST)
|
self.run(200, self.run_mapping["selectable_lmstudio_model_list"], config.SELECTABLE_LMSTUDIO_MODEL_LIST)
|
||||||
|
if len(config.SELECTABLE_LMSTUDIO_MODEL_LIST) == 0:
|
||||||
|
raise Exception("No LMStudio models available")
|
||||||
if config.SELECTED_LMSTUDIO_MODEL not in config.SELECTABLE_LMSTUDIO_MODEL_LIST:
|
if config.SELECTED_LMSTUDIO_MODEL not in config.SELECTABLE_LMSTUDIO_MODEL_LIST:
|
||||||
config.SELECTED_LMSTUDIO_MODEL = config.SELECTABLE_LMSTUDIO_MODEL_LIST[0]
|
config.SELECTED_LMSTUDIO_MODEL = config.SELECTABLE_LMSTUDIO_MODEL_LIST[0]
|
||||||
model.setTranslatorLMStudioModel(model=config.SELECTED_LMSTUDIO_MODEL)
|
model.setTranslatorLMStudioModel(model=config.SELECTED_LMSTUDIO_MODEL)
|
||||||
self.run(200, self.run_mapping["selected_lmstudio_model"], config.SELECTED_LMSTUDIO_MODEL)
|
self.run(200, self.run_mapping["selected_lmstudio_model"], config.SELECTED_LMSTUDIO_MODEL)
|
||||||
model.updateTranslatorLMStudioClient()
|
model.updateTranslatorLMStudioClient()
|
||||||
self.updateTranslationEngineAndEngineList()
|
self.updateTranslationEngineAndEngineList()
|
||||||
response = {"status":200, "result":True}
|
response = {"status":200, "result":True}
|
||||||
@@ -1935,6 +1940,10 @@ class Controller:
|
|||||||
}
|
}
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
def getConnectedLMStudio(self, *args, **kwargs) -> dict:
|
||||||
|
is_connected = model.getTranslatorLMStudioConnectedStatus()
|
||||||
|
return {"status":200, "result": is_connected}
|
||||||
|
|
||||||
def getTranslatorLMStudioURL(self, *args, **kwargs) -> dict:
|
def getTranslatorLMStudioURL(self, *args, **kwargs) -> dict:
|
||||||
return {"status":200, "result":config.LMSTUDIO_URL}
|
return {"status":200, "result":config.LMSTUDIO_URL}
|
||||||
|
|
||||||
@@ -1949,10 +1958,12 @@ class Controller:
|
|||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[translator_name] = True
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[translator_name] = True
|
||||||
config.SELECTABLE_LMSTUDIO_MODEL_LIST = model.getTranslatorLMStudioModelList()
|
config.SELECTABLE_LMSTUDIO_MODEL_LIST = model.getTranslatorLMStudioModelList()
|
||||||
self.run(200, self.run_mapping["selectable_lmstudio_model_list"], config.SELECTABLE_LMSTUDIO_MODEL_LIST)
|
self.run(200, self.run_mapping["selectable_lmstudio_model_list"], config.SELECTABLE_LMSTUDIO_MODEL_LIST)
|
||||||
|
if len(config.SELECTABLE_LMSTUDIO_MODEL_LIST) == 0:
|
||||||
|
raise Exception("No LMStudio models available")
|
||||||
if config.SELECTED_LMSTUDIO_MODEL not in config.SELECTABLE_LMSTUDIO_MODEL_LIST:
|
if config.SELECTED_LMSTUDIO_MODEL not in config.SELECTABLE_LMSTUDIO_MODEL_LIST:
|
||||||
config.SELECTED_LMSTUDIO_MODEL = config.SELECTABLE_LMSTUDIO_MODEL_LIST[0]
|
config.SELECTED_LMSTUDIO_MODEL = config.SELECTABLE_LMSTUDIO_MODEL_LIST[0]
|
||||||
model.setTranslatorLMStudioModel(model=config.SELECTED_LMSTUDIO_MODEL)
|
model.setTranslatorLMStudioModel(model=config.SELECTED_LMSTUDIO_MODEL)
|
||||||
self.run(200, self.run_mapping["selected_lmstudio_model"], config.SELECTED_LMSTUDIO_MODEL)
|
self.run(200, self.run_mapping["selected_lmstudio_model"], config.SELECTED_LMSTUDIO_MODEL)
|
||||||
model.updateTranslatorLMStudioClient()
|
model.updateTranslatorLMStudioClient()
|
||||||
self.updateTranslationEngineAndEngineList()
|
self.updateTranslationEngineAndEngineList()
|
||||||
response = {"status":200, "result":config.LMSTUDIO_URL}
|
response = {"status":200, "result":config.LMSTUDIO_URL}
|
||||||
@@ -2011,6 +2022,9 @@ class Controller:
|
|||||||
}
|
}
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
def getTranslatorOllamaConnection(self, *args, **kwargs) -> dict:
|
||||||
|
return {"status":200, "result":model.getTranslatorOllamaConnected()}
|
||||||
|
|
||||||
def checkTranslatorOllamaConnection(self, *args, **kwargs) -> dict:
|
def checkTranslatorOllamaConnection(self, *args, **kwargs) -> dict:
|
||||||
printLog("Check Translator Ollama Connection")
|
printLog("Check Translator Ollama Connection")
|
||||||
translator_name = "Ollama"
|
translator_name = "Ollama"
|
||||||
@@ -2020,10 +2034,12 @@ class Controller:
|
|||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[translator_name] = True
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[translator_name] = True
|
||||||
config.SELECTABLE_OLLAMA_MODEL_LIST = model.getTranslatorOllamaModelList()
|
config.SELECTABLE_OLLAMA_MODEL_LIST = model.getTranslatorOllamaModelList()
|
||||||
self.run(200, self.run_mapping["selectable_ollama_model_list"], config.SELECTABLE_OLLAMA_MODEL_LIST)
|
self.run(200, self.run_mapping["selectable_ollama_model_list"], config.SELECTABLE_OLLAMA_MODEL_LIST)
|
||||||
|
if len(config.SELECTABLE_OLLAMA_MODEL_LIST) == 0:
|
||||||
|
raise Exception("No Ollama models available")
|
||||||
if config.SELECTED_OLLAMA_MODEL not in config.SELECTABLE_OLLAMA_MODEL_LIST:
|
if config.SELECTED_OLLAMA_MODEL not in config.SELECTABLE_OLLAMA_MODEL_LIST:
|
||||||
config.SELECTED_OLLAMA_MODEL = config.SELECTABLE_OLLAMA_MODEL_LIST[0]
|
config.SELECTED_OLLAMA_MODEL = config.SELECTABLE_OLLAMA_MODEL_LIST[0]
|
||||||
model.setTranslatorOllamaModel(model=config.SELECTED_OLLAMA_MODEL)
|
model.setTranslatorOllamaModel(model=config.SELECTED_OLLAMA_MODEL)
|
||||||
self.run(200, self.run_mapping["selected_ollama_model"], config.SELECTED_OLLAMA_MODEL)
|
self.run(200, self.run_mapping["selected_ollama_model"], config.SELECTED_OLLAMA_MODEL)
|
||||||
model.updateTranslatorOllamaClient()
|
model.updateTranslatorOllamaClient()
|
||||||
self.updateTranslationEngineAndEngineList()
|
self.updateTranslationEngineAndEngineList()
|
||||||
response = {"status":200, "result":True}
|
response = {"status":200, "result":True}
|
||||||
@@ -2957,13 +2973,13 @@ class Controller:
|
|||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = False
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = False
|
||||||
if config.AUTH_KEYS[engine] is not None:
|
if config.AUTH_KEYS[engine] is not None:
|
||||||
if model.authenticationTranslatorPlamoAuthKey(auth_key=config.AUTH_KEYS[engine]) is True:
|
if model.authenticationTranslatorPlamoAuthKey(auth_key=config.AUTH_KEYS[engine]) is True:
|
||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = True
|
|
||||||
printLog("Plamo API Key is valid")
|
|
||||||
config.SELECTABLE_PLAMO_MODEL_LIST = model.getTranslatorPlamoModelList()
|
config.SELECTABLE_PLAMO_MODEL_LIST = model.getTranslatorPlamoModelList()
|
||||||
if config.SELECTED_PLAMO_MODEL not in config.SELECTABLE_PLAMO_MODEL_LIST:
|
if config.SELECTED_PLAMO_MODEL not in config.SELECTABLE_PLAMO_MODEL_LIST:
|
||||||
config.SELECTED_PLAMO_MODEL = config.SELECTABLE_PLAMO_MODEL_LIST[0]
|
config.SELECTED_PLAMO_MODEL = config.SELECTABLE_PLAMO_MODEL_LIST[0]
|
||||||
model.setTranslatorPlamoModel(config.SELECTED_PLAMO_MODEL)
|
model.setTranslatorPlamoModel(config.SELECTED_PLAMO_MODEL)
|
||||||
model.updateTranslatorPlamoClient()
|
model.updateTranslatorPlamoClient()
|
||||||
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = True
|
||||||
|
printLog("Plamo API Key is valid")
|
||||||
else:
|
else:
|
||||||
# error update Auth key
|
# error update Auth key
|
||||||
auth_keys = config.AUTH_KEYS
|
auth_keys = config.AUTH_KEYS
|
||||||
@@ -2975,13 +2991,13 @@ class Controller:
|
|||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = False
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = False
|
||||||
if config.AUTH_KEYS[engine] is not None:
|
if config.AUTH_KEYS[engine] is not None:
|
||||||
if model.authenticationTranslatorGeminiAuthKey(auth_key=config.AUTH_KEYS[engine]) is True:
|
if model.authenticationTranslatorGeminiAuthKey(auth_key=config.AUTH_KEYS[engine]) is True:
|
||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = True
|
|
||||||
printLog("Gemini API Key is valid")
|
|
||||||
config.SELECTABLE_GEMINI_MODEL_LIST = model.getTranslatorGeminiModelList()
|
config.SELECTABLE_GEMINI_MODEL_LIST = model.getTranslatorGeminiModelList()
|
||||||
if config.SELECTED_GEMINI_MODEL not in config.SELECTABLE_GEMINI_MODEL_LIST:
|
if config.SELECTED_GEMINI_MODEL not in config.SELECTABLE_GEMINI_MODEL_LIST:
|
||||||
config.SELECTED_GEMINI_MODEL = config.SELECTABLE_GEMINI_MODEL_LIST[0]
|
config.SELECTED_GEMINI_MODEL = config.SELECTABLE_GEMINI_MODEL_LIST[0]
|
||||||
model.setTranslatorGeminiModel(config.SELECTED_GEMINI_MODEL)
|
model.setTranslatorGeminiModel(config.SELECTED_GEMINI_MODEL)
|
||||||
model.updateTranslatorGeminiClient()
|
model.updateTranslatorGeminiClient()
|
||||||
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = True
|
||||||
|
printLog("Gemini API Key is valid")
|
||||||
else:
|
else:
|
||||||
# error update Auth key
|
# error update Auth key
|
||||||
auth_keys = config.AUTH_KEYS
|
auth_keys = config.AUTH_KEYS
|
||||||
@@ -2993,13 +3009,13 @@ class Controller:
|
|||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = False
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = False
|
||||||
if config.AUTH_KEYS[engine] is not None:
|
if config.AUTH_KEYS[engine] is not None:
|
||||||
if model.authenticationTranslatorOpenAIAuthKey(auth_key=config.AUTH_KEYS[engine]) is True:
|
if model.authenticationTranslatorOpenAIAuthKey(auth_key=config.AUTH_KEYS[engine]) is True:
|
||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = True
|
|
||||||
printLog("OpenAI API Key is valid")
|
|
||||||
config.SELECTABLE_OPENAI_MODEL_LIST = model.getTranslatorOpenAIModelList()
|
config.SELECTABLE_OPENAI_MODEL_LIST = model.getTranslatorOpenAIModelList()
|
||||||
if config.SELECTED_OPENAI_MODEL not in config.SELECTABLE_OPENAI_MODEL_LIST:
|
if config.SELECTED_OPENAI_MODEL not in config.SELECTABLE_OPENAI_MODEL_LIST:
|
||||||
config.SELECTED_OPENAI_MODEL = config.SELECTABLE_OPENAI_MODEL_LIST[0]
|
config.SELECTED_OPENAI_MODEL = config.SELECTABLE_OPENAI_MODEL_LIST[0]
|
||||||
model.setTranslatorOpenAIModel(config.SELECTED_OPENAI_MODEL)
|
model.setTranslatorOpenAIModel(config.SELECTED_OPENAI_MODEL)
|
||||||
model.updateTranslatorOpenAIClient()
|
model.updateTranslatorOpenAIClient()
|
||||||
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = True
|
||||||
|
printLog("OpenAI API Key is valid")
|
||||||
else:
|
else:
|
||||||
# error update Auth key
|
# error update Auth key
|
||||||
auth_keys = config.AUTH_KEYS
|
auth_keys = config.AUTH_KEYS
|
||||||
@@ -3007,30 +3023,36 @@ class Controller:
|
|||||||
config.AUTH_KEYS = auth_keys
|
config.AUTH_KEYS = auth_keys
|
||||||
printLog("OpenAI API Key is invalid")
|
printLog("OpenAI API Key is invalid")
|
||||||
case "LMStudio":
|
case "LMStudio":
|
||||||
printLog("Start check LMStudio API Key")
|
printLog("Start check LMStudio Server")
|
||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = False
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = False
|
||||||
if config.LMSTUDIO_URL is not None:
|
if config.LMSTUDIO_URL is not None:
|
||||||
if model.authenticationTranslatorLMStudio(base_url=config.LMSTUDIO_URL) is True:
|
if model.authenticationTranslatorLMStudio(base_url=config.LMSTUDIO_URL) is True:
|
||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = True
|
|
||||||
printLog("LMStudio URL is valid")
|
|
||||||
config.SELECTABLE_LMSTUDIO_MODEL_LIST = model.getTranslatorLMStudioModelList()
|
config.SELECTABLE_LMSTUDIO_MODEL_LIST = model.getTranslatorLMStudioModelList()
|
||||||
|
if len(config.SELECTABLE_LMSTUDIO_MODEL_LIST) == 0:
|
||||||
|
printLog("LMStudio model list is empty")
|
||||||
|
break
|
||||||
if config.SELECTED_LMSTUDIO_MODEL not in config.SELECTABLE_LMSTUDIO_MODEL_LIST:
|
if config.SELECTED_LMSTUDIO_MODEL not in config.SELECTABLE_LMSTUDIO_MODEL_LIST:
|
||||||
config.SELECTED_LMSTUDIO_MODEL = config.SELECTABLE_LMSTUDIO_MODEL_LIST[0]
|
config.SELECTED_LMSTUDIO_MODEL = config.SELECTABLE_LMSTUDIO_MODEL_LIST[0]
|
||||||
model.setTranslatorLMStudioModel(config.SELECTED_LMSTUDIO_MODEL)
|
model.setTranslatorLMStudioModel(config.SELECTED_LMSTUDIO_MODEL)
|
||||||
model.updateTranslatorLMStudioClient()
|
model.updateTranslatorLMStudioClient()
|
||||||
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = True
|
||||||
|
printLog("LMStudio is available")
|
||||||
else:
|
else:
|
||||||
printLog("LMStudio is not available")
|
printLog("LMStudio is not available")
|
||||||
case "Ollama":
|
case "Ollama":
|
||||||
printLog("Start check Ollama API Key")
|
printLog("Start check Ollama Server")
|
||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = False
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = False
|
||||||
if model.authenticationTranslatorOllama() is True:
|
if model.authenticationTranslatorOllama() is True:
|
||||||
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = True
|
|
||||||
printLog("Ollama is available")
|
|
||||||
config.SELECTABLE_OLLAMA_MODEL_LIST = model.getTranslatorOllamaModelList()
|
config.SELECTABLE_OLLAMA_MODEL_LIST = model.getTranslatorOllamaModelList()
|
||||||
|
if len(config.SELECTABLE_OLLAMA_MODEL_LIST) == 0:
|
||||||
|
printLog("Ollama model list is empty")
|
||||||
|
break
|
||||||
if config.SELECTED_OLLAMA_MODEL not in config.SELECTABLE_OLLAMA_MODEL_LIST:
|
if config.SELECTED_OLLAMA_MODEL not in config.SELECTABLE_OLLAMA_MODEL_LIST:
|
||||||
config.SELECTED_OLLAMA_MODEL = config.SELECTABLE_OLLAMA_MODEL_LIST[0]
|
config.SELECTED_OLLAMA_MODEL = config.SELECTABLE_OLLAMA_MODEL_LIST[0]
|
||||||
model.setTranslatorOllamaModel(config.SELECTED_OLLAMA_MODEL)
|
model.setTranslatorOllamaModel(config.SELECTED_OLLAMA_MODEL)
|
||||||
model.updateTranslatorOllamaClient()
|
model.updateTranslatorOllamaClient()
|
||||||
|
config.SELECTABLE_TRANSLATION_ENGINE_STATUS[engine] = True
|
||||||
|
printLog("Ollama is available")
|
||||||
else:
|
else:
|
||||||
printLog("Ollama is not available")
|
printLog("Ollama is not available")
|
||||||
case _:
|
case _:
|
||||||
@@ -3126,6 +3148,9 @@ class Controller:
|
|||||||
model.stopWebSocketServer()
|
model.stopWebSocketServer()
|
||||||
printLog("WebSocket server host or port is not available")
|
printLog("WebSocket server host or port is not available")
|
||||||
|
|
||||||
|
printLog("Revalidate Selected Models")
|
||||||
|
config.revalidate_selected_models()
|
||||||
|
|
||||||
printLog("Update settings")
|
printLog("Update settings")
|
||||||
self.updateConfigSettings()
|
self.updateConfigSettings()
|
||||||
|
|
||||||
|
|||||||
@@ -207,6 +207,7 @@ mapping = {
|
|||||||
"/set/data/openai_auth_key": {"status": True, "variable":controller.setOpenAIAuthKey},
|
"/set/data/openai_auth_key": {"status": True, "variable":controller.setOpenAIAuthKey},
|
||||||
"/delete/data/openai_auth_key": {"status": True, "variable":controller.delOpenAIAuthKey},
|
"/delete/data/openai_auth_key": {"status": True, "variable":controller.delOpenAIAuthKey},
|
||||||
|
|
||||||
|
"/get/data/connected_lmstudio": {"status": True, "variable":controller.getTranslatorLMStudioConnection},
|
||||||
"/run/lmstudio_connection": {"status": True, "variable":controller.checkTranslatorLMStudioConnection},
|
"/run/lmstudio_connection": {"status": True, "variable":controller.checkTranslatorLMStudioConnection},
|
||||||
"/get/data/selectable_lmstudio_model_list": {"status": True, "variable":controller.getTranslatorLStudioModelList},
|
"/get/data/selectable_lmstudio_model_list": {"status": True, "variable":controller.getTranslatorLStudioModelList},
|
||||||
"/get/data/selected_lmstudio_model": {"status": True, "variable":controller.getTranslatorLMStudioModel},
|
"/get/data/selected_lmstudio_model": {"status": True, "variable":controller.getTranslatorLMStudioModel},
|
||||||
@@ -214,6 +215,7 @@ mapping = {
|
|||||||
"/get/data/lmstudio_url": {"status": True, "variable":controller.getTranslatorLMStudioURL},
|
"/get/data/lmstudio_url": {"status": True, "variable":controller.getTranslatorLMStudioURL},
|
||||||
"/set/data/lmstudio_url": {"status": True, "variable":controller.setTranslatorLMStudioURL},
|
"/set/data/lmstudio_url": {"status": True, "variable":controller.setTranslatorLMStudioURL},
|
||||||
|
|
||||||
|
"/get/data/connected_ollama": {"status": True, "variable":controller.getTranslatorOllamaConnection},
|
||||||
"/run/ollama_connection": {"status": True, "variable":controller.checkTranslatorOllamaConnection},
|
"/run/ollama_connection": {"status": True, "variable":controller.checkTranslatorOllamaConnection},
|
||||||
"/get/data/selectable_ollama_model_list": {"status": True, "variable":controller.getTranslatorOllamaModelList},
|
"/get/data/selectable_ollama_model_list": {"status": True, "variable":controller.getTranslatorOllamaModelList},
|
||||||
"/get/data/selected_ollama_model": {"status": True, "variable":controller.getTranslatorOllamaModel},
|
"/get/data/selected_ollama_model": {"status": True, "variable":controller.getTranslatorOllamaModel},
|
||||||
|
|||||||
@@ -249,6 +249,10 @@ class Model:
|
|||||||
self.ensure_initialized()
|
self.ensure_initialized()
|
||||||
self.translator.updateOpenAIClient()
|
self.translator.updateOpenAIClient()
|
||||||
|
|
||||||
|
def getTranslatorLMStudioConnected(self) -> bool:
|
||||||
|
self.ensure_initialized()
|
||||||
|
return self.translator.getLMStudioConnected()
|
||||||
|
|
||||||
def authenticationTranslatorLMStudio(self, base_url: str) -> bool:
|
def authenticationTranslatorLMStudio(self, base_url: str) -> bool:
|
||||||
result = self.translator.setLMStudioClientURL(base_url=base_url, root_path=config.PATH_LOCAL)
|
result = self.translator.setLMStudioClientURL(base_url=base_url, root_path=config.PATH_LOCAL)
|
||||||
return result
|
return result
|
||||||
@@ -265,6 +269,10 @@ class Model:
|
|||||||
self.ensure_initialized()
|
self.ensure_initialized()
|
||||||
self.translator.updateLMStudioClient()
|
self.translator.updateLMStudioClient()
|
||||||
|
|
||||||
|
def getTranslatorOllamaConnected(self) -> bool:
|
||||||
|
self.ensure_initialized()
|
||||||
|
return self.translator.getOllamaConnected()
|
||||||
|
|
||||||
def authenticationTranslatorOllama(self) -> bool:
|
def authenticationTranslatorOllama(self) -> bool:
|
||||||
result = self.translator.checkOllamaClient(root_path=config.PATH_LOCAL)
|
result = self.translator.checkOllamaClient(root_path=config.PATH_LOCAL)
|
||||||
return result
|
return result
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from openai import OpenAI
|
|
||||||
from langchain_openai import ChatOpenAI
|
from langchain_openai import ChatOpenAI
|
||||||
from pydantic import SecretStr
|
from pydantic import SecretStr
|
||||||
|
import requests
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from .translation_languages import translation_lang
|
from .translation_languages import translation_lang
|
||||||
@@ -8,33 +8,35 @@ try:
|
|||||||
except Exception:
|
except Exception:
|
||||||
import sys
|
import sys
|
||||||
from os import path as os_path
|
from os import path as os_path
|
||||||
sys.path.append(os_path.dirname(os_path.dirname(os_path.dirname(os_path.abspath(__file__)))))
|
sys.path.append(os_path.dirname(os_path.abspath(__file__)))
|
||||||
from translation_languages import translation_lang
|
from translation_languages import translation_lang, loadTranslationLanguages
|
||||||
from translation_utils import loadPromptConfig
|
from translation_utils import loadPromptConfig
|
||||||
|
loadTranslationLanguages(path=".", force=True)
|
||||||
|
|
||||||
def _authentication_check(api_key: str, base_url: str | None = None) -> bool:
|
def _authentication_check(base_url: str | None = None) -> bool:
|
||||||
"""Check if the provided API key is valid by attempting to list models.
|
"""Check if the provided API key is valid by attempting to list models.
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
client = OpenAI(api_key=api_key, base_url=base_url)
|
response = requests.get(f"{base_url}/models", timeout=0.2)
|
||||||
client.models.list()
|
if response.status_code == 200:
|
||||||
return True
|
return True
|
||||||
|
else:
|
||||||
|
return False
|
||||||
except Exception:
|
except Exception:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def _get_available_text_models(api_key: str, base_url: str | None = None) -> list[str]:
|
def _get_available_text_models(base_url: str | None = None) -> list[str]:
|
||||||
"""Extract the list of available text models from the LM Studio.
|
"""Extract the list of available text models from the LM Studio.
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
client = OpenAI(api_key=api_key, base_url=base_url)
|
response = requests.get(f"{base_url}/models", timeout=0.2)
|
||||||
res = client.models.list()
|
models = response.json()["data"]
|
||||||
models = res.data
|
|
||||||
except Exception:
|
except Exception:
|
||||||
models = []
|
models = []
|
||||||
|
|
||||||
allowed_models = []
|
allowed_models = []
|
||||||
for model in models:
|
for model in models:
|
||||||
allowed_models.append(model.id)
|
allowed_models.append(model["id"])
|
||||||
|
|
||||||
allowed_models.sort()
|
allowed_models.sort()
|
||||||
return allowed_models
|
return allowed_models
|
||||||
@@ -58,13 +60,13 @@ class LMStudioClient:
|
|||||||
return self.base_url
|
return self.base_url
|
||||||
|
|
||||||
def setBaseURL(self, base_url: str | None) -> None:
|
def setBaseURL(self, base_url: str | None) -> None:
|
||||||
result = _authentication_check(api_key=self.api_key, base_url=base_url)
|
result = _authentication_check(base_url=base_url)
|
||||||
if result:
|
if result:
|
||||||
self.base_url = base_url
|
self.base_url = base_url
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def getModelList(self) -> list[str]:
|
def getModelList(self) -> list[str]:
|
||||||
return _get_available_text_models(api_key=self.api_key, base_url=self.base_url) if self.base_url else []
|
return _get_available_text_models(base_url=self.base_url) if self.base_url else []
|
||||||
|
|
||||||
def getModel(self) -> str:
|
def getModel(self) -> str:
|
||||||
return self.model
|
return self.model
|
||||||
@@ -108,7 +110,7 @@ class LMStudioClient:
|
|||||||
return content.strip()
|
return content.strip()
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
client = LMStudioClient(base_url="http://192.168.68.110:1234/v1")
|
client = LMStudioClient(base_url="http://127.0.0.1:1234/v1")
|
||||||
models = client.getModelList()
|
models = client.getModelList()
|
||||||
if models:
|
if models:
|
||||||
print("Available models:", models)
|
print("Available models:", models)
|
||||||
|
|||||||
@@ -7,15 +7,16 @@ try:
|
|||||||
except Exception:
|
except Exception:
|
||||||
import sys
|
import sys
|
||||||
from os import path as os_path
|
from os import path as os_path
|
||||||
sys.path.append(os_path.dirname(os_path.dirname(os_path.dirname(os_path.abspath(__file__)))))
|
sys.path.append(os_path.dirname(os_path.abspath(__file__)))
|
||||||
from translation_languages import translation_lang
|
from translation_languages import translation_lang, loadTranslationLanguages
|
||||||
from translation_utils import loadPromptConfig
|
from translation_utils import loadPromptConfig
|
||||||
|
loadTranslationLanguages(path=".", force=True)
|
||||||
|
|
||||||
def _authentication_check(base_url: str | None = None) -> bool:
|
def _authentication_check(base_url: str | None = None) -> bool:
|
||||||
"""Check authentication for Ollama API.
|
"""Check authentication for Ollama API.
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
response = requests.get(f"{base_url}")
|
response = requests.get(f"{base_url}", timeout=0.2)
|
||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -176,6 +176,16 @@ class Translator:
|
|||||||
"""Update the OpenAI client (fetch available models)."""
|
"""Update the OpenAI client (fetch available models)."""
|
||||||
self.openai_client.updateClient()
|
self.openai_client.updateClient()
|
||||||
|
|
||||||
|
def getLMStudioConnected(self) -> bool:
|
||||||
|
"""Get LM Studio connection status.
|
||||||
|
|
||||||
|
Returns True if connected, False otherwise.
|
||||||
|
"""
|
||||||
|
if self.lmstudio_client is None:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return True
|
||||||
|
|
||||||
def setLMStudioClientURL(self, base_url: str | None = None, root_path: str = None) -> bool:
|
def setLMStudioClientURL(self, base_url: str | None = None, root_path: str = None) -> bool:
|
||||||
"""Authenticate LM Studio with the provided base URL.
|
"""Authenticate LM Studio with the provided base URL.
|
||||||
|
|
||||||
@@ -207,6 +217,16 @@ class Translator:
|
|||||||
"""Update the LM Studio client (fetch available models)."""
|
"""Update the LM Studio client (fetch available models)."""
|
||||||
self.lmstudio_client.updateClient()
|
self.lmstudio_client.updateClient()
|
||||||
|
|
||||||
|
def getOllamaConnected(self) -> bool:
|
||||||
|
"""Get Ollama connection status.
|
||||||
|
|
||||||
|
Returns True if connected, False otherwise.
|
||||||
|
"""
|
||||||
|
if self.ollama_client is None:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return True
|
||||||
|
|
||||||
def checkOllamaClient(self, root_path: str = None) -> bool:
|
def checkOllamaClient(self, root_path: str = None) -> bool:
|
||||||
"""Check if Ollama client is available.
|
"""Check if Ollama client is available.
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { useI18n } from "@useI18n";
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
useNotificationStatus,
|
useNotificationStatus,
|
||||||
|
useLLMConnection,
|
||||||
} from "@logics_common";
|
} from "@logics_common";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -46,6 +47,11 @@ export const _useBackendErrorHandling = () => {
|
|||||||
updateWebsocketPort,
|
updateWebsocketPort,
|
||||||
} = useAdvancedSettings();
|
} = useAdvancedSettings();
|
||||||
|
|
||||||
|
const {
|
||||||
|
updateIsOllamaConnected,
|
||||||
|
updateIsLMStudioConnected,
|
||||||
|
} = useLLMConnection();
|
||||||
|
|
||||||
const errorHandling_Backend = ({message, data, endpoint, result}) => {
|
const errorHandling_Backend = ({message, data, endpoint, result}) => {
|
||||||
switch (endpoint) {
|
switch (endpoint) {
|
||||||
case "/run/error_device":
|
case "/run/error_device":
|
||||||
@@ -221,6 +227,18 @@ export const _useBackendErrorHandling = () => {
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
case "/run/lmstudio_connection":
|
||||||
|
updateIsLMStudioConnected(data);
|
||||||
|
showNotification_Error(message);
|
||||||
|
console.error(message);
|
||||||
|
return;
|
||||||
|
|
||||||
|
case "/run/ollama_connection":
|
||||||
|
updateIsOllamaConnected(data);
|
||||||
|
showNotification_Error(message);
|
||||||
|
console.error(message);
|
||||||
|
return;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
console.error(`Invalid endpoint or message: ${endpoint}\nmessage: ${message}\nresult: ${JSON.stringify(result)}`);
|
console.error(`Invalid endpoint or message: ${endpoint}\nmessage: ${message}\nresult: ${JSON.stringify(result)}`);
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -14,4 +14,5 @@ export { useHandleNetworkConnection } from "./useHandleNetworkConnection";
|
|||||||
export { useHandleOscQuery } from "./useHandleOscQuery";
|
export { useHandleOscQuery } from "./useHandleOscQuery";
|
||||||
export { useIsOscAvailable } from "./useIsOscAvailable";
|
export { useIsOscAvailable } from "./useIsOscAvailable";
|
||||||
export { useIsVrctAvailable } from "./useIsVrctAvailable";
|
export { useIsVrctAvailable } from "./useIsVrctAvailable";
|
||||||
export { useFetch } from "./useFetch";
|
export { useFetch } from "./useFetch";
|
||||||
|
export { useLLMConnection } from "./useLLMConnection";
|
||||||
47
src-ui/logics/common/useLLMConnection.js
Normal file
47
src-ui/logics/common/useLLMConnection.js
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
import { useStdoutToPython } from "@useStdoutToPython";
|
||||||
|
import {
|
||||||
|
useStore_IsLMStudioConnected,
|
||||||
|
useStore_IsOllamaConnected,
|
||||||
|
} from "@store";
|
||||||
|
|
||||||
|
export const useLLMConnection = () => {
|
||||||
|
const { asyncStdoutToPython } = useStdoutToPython();
|
||||||
|
const {
|
||||||
|
currentIsLMStudioConnected,
|
||||||
|
updateIsLMStudioConnected,
|
||||||
|
pendingIsLMStudioConnected,
|
||||||
|
} = useStore_IsLMStudioConnected();
|
||||||
|
const {
|
||||||
|
currentIsOllamaConnected,
|
||||||
|
updateIsOllamaConnected,
|
||||||
|
pendingIsOllamaConnected,
|
||||||
|
} = useStore_IsOllamaConnected();
|
||||||
|
|
||||||
|
const checkConnection_LMStudio = () => {
|
||||||
|
pendingIsLMStudioConnected();
|
||||||
|
asyncStdoutToPython("/run/lmstudio_connection");
|
||||||
|
};
|
||||||
|
const setConnectionStatus_LMStudio = (is_connected) => {
|
||||||
|
updateIsLMStudioConnected(is_connected);
|
||||||
|
};
|
||||||
|
|
||||||
|
const checkConnection_Ollama = () => {
|
||||||
|
pendingIsOllamaConnected();
|
||||||
|
asyncStdoutToPython("/run/ollama_connection");
|
||||||
|
};
|
||||||
|
const setConnectionStatus_Ollama = (is_connected) => {
|
||||||
|
updateIsOllamaConnected(is_connected);
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
currentIsLMStudioConnected,
|
||||||
|
updateIsLMStudioConnected,
|
||||||
|
setConnectionStatus_LMStudio,
|
||||||
|
checkConnection_LMStudio,
|
||||||
|
|
||||||
|
currentIsOllamaConnected,
|
||||||
|
updateIsOllamaConnected,
|
||||||
|
setConnectionStatus_Ollama,
|
||||||
|
checkConnection_Ollama,
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -167,6 +167,8 @@ export const { atomInstance: Atom_NotificationStatus, useHook: useStore_Notifica
|
|||||||
key: 0,
|
key: 0,
|
||||||
message: "",
|
message: "",
|
||||||
}, "NotificationStatus");
|
}, "NotificationStatus");
|
||||||
|
export const { atomInstance: Atom_IsLMStudioConnected, useHook: useStore_IsLMStudioConnected } = createAtomWithHook(false, "IsLMStudioConnected");
|
||||||
|
export const { atomInstance: Atom_IsOllamaConnected, useHook: useStore_IsOllamaConnected } = createAtomWithHook(false, "IsOllamaConnected");
|
||||||
|
|
||||||
// Main Page
|
// Main Page
|
||||||
// Common
|
// Common
|
||||||
|
|||||||
@@ -101,12 +101,17 @@ export const getPluginsList = () => {
|
|||||||
if (IS_PLUGIN_PATH_DEV_MODE || IS_PLUGIN_LIST_URL_DEV_MODE) console.warn("ui_configs IS_PLUGIN_PATH_DEV_MODE or IS_PLUGIN_LIST_URL_DEV_MODE is true. Turn to 'false' when it's production environment.");
|
if (IS_PLUGIN_PATH_DEV_MODE || IS_PLUGIN_LIST_URL_DEV_MODE) console.warn("ui_configs IS_PLUGIN_PATH_DEV_MODE or IS_PLUGIN_LIST_URL_DEV_MODE is true. Turn to 'false' when it's production environment.");
|
||||||
|
|
||||||
export const translator_status = [
|
export const translator_status = [
|
||||||
{ id: "DeepL", label: "DeepL", is_available: false },
|
{ id: "CTranslate2", label: `AI\nCTranslate2`, is_available: false, is_default: true },
|
||||||
{ id: "DeepL_API", label: `DeepL API`, is_available: false },
|
|
||||||
{ id: "Google", label: "Google", is_available: false },
|
{ id: "Google", label: "Google", is_available: false },
|
||||||
{ id: "Bing", label: "Bing", is_available: false },
|
{ id: "Bing", label: "Bing", is_available: false },
|
||||||
{ id: "Papago", label: "Papago", is_available: false },
|
{ id: "Papago", label: "Papago", is_available: false },
|
||||||
{ id: "CTranslate2", label: `AI\nCTranslate2`, is_available: false, is_default: true },
|
{ id: "DeepL", label: "DeepL", is_available: false },
|
||||||
|
{ id: "DeepL_API", label: `DeepL API`, is_available: false },
|
||||||
|
{ id: "Plamo_API", label: `Plamo API`, is_available: false },
|
||||||
|
{ id: "Gemini_API", label: `Gemini API`, is_available: false },
|
||||||
|
{ id: "OpenAI_API", label: `OpenAI API`, is_available: false },
|
||||||
|
{ id: "LMStudio", label: `LMStudio`, is_available: false },
|
||||||
|
{ id: "Ollama", label: `Ollama`, is_available: false },
|
||||||
];
|
];
|
||||||
|
|
||||||
export const ctranslate2_weight_type_status = [
|
export const ctranslate2_weight_type_status = [
|
||||||
|
|||||||
@@ -20,6 +20,12 @@ export const STATIC_ROUTE_META_LIST = [
|
|||||||
{ endpoint: "/run/open_filepath_logs", ns: common, hook_name: "useOpenFolder", method_name: "openedFolder_MessageLogs" },
|
{ endpoint: "/run/open_filepath_logs", ns: common, hook_name: "useOpenFolder", method_name: "openedFolder_MessageLogs" },
|
||||||
{ endpoint: "/run/open_filepath_config_file", ns: common, hook_name: "useOpenFolder", method_name: "openedFolder_ConfigFile" },
|
{ endpoint: "/run/open_filepath_config_file", ns: common, hook_name: "useOpenFolder", method_name: "openedFolder_ConfigFile" },
|
||||||
|
|
||||||
|
{ endpoint: "/get/data/connected_lmstudio", ns: common, hook_name: "useLLMConnection", method_name: "setConnectionStatus_LMStudio" },
|
||||||
|
{ endpoint: "/run/lmstudio_connection", ns: common, hook_name: "useLLMConnection", method_name: "setConnectionStatus_LMStudio" },
|
||||||
|
|
||||||
|
{ endpoint: "/get/data/connected_ollama", ns: common, hook_name: "useLLMConnection", method_name: "setConnectionStatus_Ollama" },
|
||||||
|
{ endpoint: "/run/ollama_connection", ns: common, hook_name: "useLLMConnection", method_name: "setConnectionStatus_Ollama" },
|
||||||
|
|
||||||
// Software Version
|
// Software Version
|
||||||
{ endpoint: "/get/data/version", ns: common, hook_name: "useSoftwareVersion", method_name: "updateSoftwareVersion" },
|
{ endpoint: "/get/data/version", ns: common, hook_name: "useSoftwareVersion", method_name: "updateSoftwareVersion" },
|
||||||
// Latest Software Version Info
|
// Latest Software Version Info
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import styles from "./ConnectionCheckButton.module.scss";
|
||||||
|
|
||||||
|
export const ConnectionCheckButton = (props) => {
|
||||||
|
const label = props.state === "pending"
|
||||||
|
? "Checking... 🌀"
|
||||||
|
: props.variable === true
|
||||||
|
? "Connected ✅"
|
||||||
|
: "Disconnected ❌";
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={styles.container}>
|
||||||
|
<p>{label}</p>
|
||||||
|
<p>{`UI Status: ${props.state}`}</p>
|
||||||
|
<button className={styles.button_wrapper} onClick={props.checkFunction}>
|
||||||
|
<p className={styles.button_label}>Connection Check</p>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
.button_wrapper {
|
||||||
|
padding: 1.6rem;
|
||||||
|
border-radius: 0.4rem;
|
||||||
|
&:hover {
|
||||||
|
background-color: var(--dark_825_color);
|
||||||
|
}
|
||||||
|
&:active {
|
||||||
|
background-color: var(--dark_900_color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.button_svg {
|
||||||
|
width: 2.4rem;
|
||||||
|
color: var(--dark_400_color);
|
||||||
|
}
|
||||||
@@ -13,4 +13,5 @@ export { SwitchBox } from "./switch_box/SwitchBox";
|
|||||||
export { ThresholdComponent } from "./threshold_component/ThresholdComponent";
|
export { ThresholdComponent } from "./threshold_component/ThresholdComponent";
|
||||||
export { WordFilter, WordFilterListToggleComponent } from "./word_filter/WordFilter";
|
export { WordFilter, WordFilterListToggleComponent } from "./word_filter/WordFilter";
|
||||||
export { DownloadModels } from "./download_models/DownloadModels";
|
export { DownloadModels } from "./download_models/DownloadModels";
|
||||||
export { MessageFormat } from "./message_format/MessageFormat";
|
export { MessageFormat } from "./message_format/MessageFormat";
|
||||||
|
export { ConnectionCheckButton } from "./connection_check_button/ConnectionCheckButton";
|
||||||
@@ -19,6 +19,7 @@ import {
|
|||||||
WordFilterListToggleComponent,
|
WordFilterListToggleComponent,
|
||||||
DownloadModels,
|
DownloadModels,
|
||||||
MessageFormat,
|
MessageFormat,
|
||||||
|
ConnectionCheckButton,
|
||||||
} from "../_components";
|
} from "../_components";
|
||||||
import { Checkbox } from "@common_components";
|
import { Checkbox } from "@common_components";
|
||||||
|
|
||||||
@@ -181,6 +182,10 @@ export const DownloadModelsContainer = (props) => (
|
|||||||
<CommonContainer Component={DownloadModels} {...props} />
|
<CommonContainer Component={DownloadModels} {...props} />
|
||||||
);
|
);
|
||||||
|
|
||||||
|
export const ConnectionCheckButtonContainer = (props) => (
|
||||||
|
<CommonContainer Component={ConnectionCheckButton} {...props} />
|
||||||
|
);
|
||||||
|
|
||||||
export const MessageFormatContainer = (props) => {
|
export const MessageFormatContainer = (props) => {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import {
|
|||||||
EntryWithSaveButtonContainer,
|
EntryWithSaveButtonContainer,
|
||||||
RadioButtonContainer,
|
RadioButtonContainer,
|
||||||
DropdownMenuContainer,
|
DropdownMenuContainer,
|
||||||
|
ConnectionCheckButtonContainer,
|
||||||
|
|
||||||
useOnMouseLeaveDropdownMenu,
|
useOnMouseLeaveDropdownMenu,
|
||||||
} from "../_templates/Templates";
|
} from "../_templates/Templates";
|
||||||
@@ -25,9 +26,11 @@ import {
|
|||||||
DropdownMenu,
|
DropdownMenu,
|
||||||
MultiDropdownMenu,
|
MultiDropdownMenu,
|
||||||
LabelComponent,
|
LabelComponent,
|
||||||
|
ConnectionCheckButton,
|
||||||
} from "../_components";
|
} from "../_components";
|
||||||
|
|
||||||
import { deepl_auth_key_url } from "@ui_configs";
|
import { deepl_auth_key_url } from "@ui_configs";
|
||||||
|
import { useLLMConnection } from "@logics_common";
|
||||||
|
|
||||||
export const Translation = () => {
|
export const Translation = () => {
|
||||||
return (
|
return (
|
||||||
@@ -46,9 +49,11 @@ export const Translation = () => {
|
|||||||
<OpenAIAuthKey_Box />
|
<OpenAIAuthKey_Box />
|
||||||
<OpenAIModelContainer />
|
<OpenAIModelContainer />
|
||||||
|
|
||||||
|
<LMStudioConnectionCheck_Box />
|
||||||
<LMStudioURL_Box />
|
<LMStudioURL_Box />
|
||||||
<LMStudioModelContainer />
|
<LMStudioModelContainer />
|
||||||
|
|
||||||
|
<OllamaConnectionCheck_Box />
|
||||||
<OllamaModelContainer />
|
<OllamaModelContainer />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
@@ -422,6 +427,23 @@ const OpenAIModelContainer = () => {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const LMStudioConnectionCheck_Box = () => {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const { currentIsLMStudioConnected, checkConnection_LMStudio } = useLLMConnection();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<ConnectionCheckButtonContainer
|
||||||
|
label="Check LM Studio Connection"
|
||||||
|
variable={currentIsLMStudioConnected.data}
|
||||||
|
state={currentIsLMStudioConnected.state}
|
||||||
|
checkFunction={checkConnection_LMStudio}
|
||||||
|
remove_border_bottom={true}
|
||||||
|
// width="10rem"
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
const LMStudioURL_Box = () => {
|
const LMStudioURL_Box = () => {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { currentLMStudioURL, setLMStudioURL, deleteLMStudioURL } = useTranslation();
|
const { currentLMStudioURL, setLMStudioURL, deleteLMStudioURL } = useTranslation();
|
||||||
@@ -475,6 +497,23 @@ const LMStudioModelContainer = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const OllamaConnectionCheck_Box = () => {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const { currentIsOllamaConnected, checkConnection_Ollama } = useLLMConnection();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<ConnectionCheckButtonContainer
|
||||||
|
label="Check Ollama Connection"
|
||||||
|
variable={currentIsOllamaConnected.data}
|
||||||
|
state={currentIsOllamaConnected.state}
|
||||||
|
checkFunction={checkConnection_Ollama}
|
||||||
|
remove_border_bottom={true}
|
||||||
|
// width="10rem"
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
const OllamaModelContainer = () => {
|
const OllamaModelContainer = () => {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const {
|
const {
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
overflow-y: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.relative_container {
|
.relative_container {
|
||||||
@@ -17,8 +18,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
width: 100%;
|
padding: 2rem 0;
|
||||||
height: 100%;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|||||||
Reference in New Issue
Block a user