controller: 翻訳モデル選択時にモデル適用とクライアント更新を確実に行うよう修正
- デフォルト選択時および明示的なモデル設定時に model.setTranslatorXModel(...) を呼び出し、モデル状態を確実に反映 - OpenAI/LMStudio/Ollama/Plamo/Gemini/Ollama でクライアント更新を適切な箇所に追加して整合性を向上 mainloop: LMStudio/Ollama 接続チェックのエンドポイントを run 系に変更、ローマ字変換関連を追加 - "/get/data/*_connection" → "/run/*_connection" に変更（LMStudio/Ollama） - ローマ字変換(convert_message_to_romaji) のマッピングを追加（取得／有効化／無効化） translation_ollama: 認証チェックのエンドポイント呼び出しを修正 - base_url + "/api/ping" ではなく base_url 直下に対して GET を行うよう変更（環境による応答差異に対応）
This commit is contained in:
misyaguziya
@@ -1625,6 +1625,7 @@ class Controller:
|
||||
self.run(200, self.run_mapping["selectable_plamo_model_list"], 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]
|
||||
model.setTranslatorPlamoModel(model=config.SELECTED_PLAMO_MODEL)
|
||||
self.run(200, self.run_mapping["selected_plamo_model"], config.SELECTED_PLAMO_MODEL)
|
||||
model.updateTranslatorPlamoClient()
|
||||
self.updateTranslationEngineAndEngineList()
|
||||
@@ -1678,6 +1679,7 @@ class Controller:
|
||||
result = model.setTranslatorPlamoModel(model=data)
|
||||
if result is True:
|
||||
config.SELECTED_PLAMO_MODEL = data
|
||||
model.setTranslatorPlamoModel(model=config.SELECTED_PLAMO_MODEL)
|
||||
model.updateTranslatorPlamoClient()
|
||||
response = {"status":200, "result":config.SELECTED_PLAMO_MODEL}
|
||||
else:
|
||||
@@ -1719,6 +1721,7 @@ class Controller:
|
||||
self.run(200, self.run_mapping["selectable_gemini_model_list"], 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]
|
||||
model.setTranslatorGeminiModel(model=config.SELECTED_GEMINI_MODEL)
|
||||
self.run(200, self.run_mapping["selected_gemini_model"], config.SELECTED_GEMINI_MODEL)
|
||||
model.updateTranslatorGeminiClient()
|
||||
self.updateTranslationEngineAndEngineList()
|
||||
@@ -1772,6 +1775,7 @@ class Controller:
|
||||
result = model.setTranslatorGeminiModel(model=data)
|
||||
if result is True:
|
||||
config.SELECTED_GEMINI_MODEL = data
|
||||
model.setTranslatorGeminiModel(model=config.SELECTED_GEMINI_MODEL)
|
||||
model.updateTranslatorGeminiClient()
|
||||
response = {"status":200, "result":config.SELECTED_GEMINI_MODEL}
|
||||
else:
|
||||
@@ -1812,6 +1816,7 @@ class Controller:
|
||||
self.run(200, self.run_mapping["selectable_openai_model_list"], 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]
|
||||
model.setTranslatorOpenAIModel(model=config.SELECTED_OPENAI_MODEL)
|
||||
self.run(200, self.run_mapping["selected_openai_model"], config.SELECTED_OPENAI_MODEL)
|
||||
model.updateTranslatorOpenAIClient()
|
||||
self.updateTranslationEngineAndEngineList()
|
||||
@@ -1857,6 +1862,8 @@ class Controller:
|
||||
result = model.setTranslatorOpenAIModel(model=data)
|
||||
if result is True:
|
||||
config.SELECTED_OPENAI_MODEL = data
|
||||
model.setTranslatorOpenAIModel(model=config.SELECTED_OPENAI_MODEL)
|
||||
model.updateTranslatorOpenAIClient()
|
||||
response = {"status":200, "result":config.SELECTED_OPENAI_MODEL}
|
||||
else:
|
||||
response = {
|
||||
@@ -1888,6 +1895,7 @@ class Controller:
|
||||
self.run(200, self.run_mapping["selectable_lmstudio_model_list"], 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]
|
||||
model.setTranslatorLMStudioModel(model=config.SELECTED_LMSTUDIO_MODEL)
|
||||
self.run(200, self.run_mapping["selected_lmstudio_model"], config.SELECTED_LMSTUDIO_MODEL)
|
||||
model.updateTranslatorLMStudioClient()
|
||||
self.updateTranslationEngineAndEngineList()
|
||||
@@ -1927,6 +1935,7 @@ class Controller:
|
||||
self.run(200, self.run_mapping["selectable_lmstudio_model_list"], 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]
|
||||
model.setTranslatorLMStudioModel(model=config.SELECTED_LMSTUDIO_MODEL)
|
||||
self.run(200, self.run_mapping["selected_lmstudio_model"], config.SELECTED_LMSTUDIO_MODEL)
|
||||
model.updateTranslatorLMStudioClient()
|
||||
self.updateTranslationEngineAndEngineList()
|
||||
@@ -1964,6 +1973,8 @@ class Controller:
|
||||
result = model.setTranslatorLMStudioModel(model=data)
|
||||
if result is True:
|
||||
config.SELECTED_LMSTUDIO_MODEL = data
|
||||
model.setTranslatorLMStudioModel(model=config.SELECTED_LMSTUDIO_MODEL)
|
||||
model.updateTranslatorLMStudioClient()
|
||||
response = {"status":200, "result":config.SELECTED_LMSTUDIO_MODEL}
|
||||
else:
|
||||
response = {
|
||||
@@ -1995,6 +2006,7 @@ class Controller:
|
||||
self.run(200, self.run_mapping["selectable_ollama_model_list"], 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]
|
||||
model.setTranslatorOllamaModel(model=config.SELECTED_OLLAMA_MODEL)
|
||||
self.run(200, self.run_mapping["selected_ollama_model"], config.SELECTED_OLLAMA_MODEL)
|
||||
model.updateTranslatorOllamaClient()
|
||||
self.updateTranslationEngineAndEngineList()
|
||||
@@ -2032,6 +2044,8 @@ class Controller:
|
||||
result = model.setTranslatorOllamaModel(model=data)
|
||||
if result is True:
|
||||
config.SELECTED_OLLAMA_MODEL = data
|
||||
model.setTranslatorOllamaModel(model=config.SELECTED_OLLAMA_MODEL)
|
||||
model.updateTranslatorOllamaClient()
|
||||
response = {"status":200, "result":config.SELECTED_OLLAMA_MODEL}
|
||||
else:
|
||||
response = {
|
||||
|
||||
@@ -206,18 +206,19 @@ mapping = {
|
||||
"/set/data/openai_auth_key": {"status": True, "variable":controller.setOpenAIAuthKey},
|
||||
"/delete/data/openai_auth_key": {"status": True, "variable":controller.delOpenAIAuthKey},
|
||||
|
||||
"/get/data/lmstudio_connection": {"status": True, "variable":controller.checkTranslatorLMStudioConnection},
|
||||
"/run/lmstudio_connection": {"status": True, "variable":controller.checkTranslatorLMStudioConnection},
|
||||
"/get/data/lmstudio_model_list": {"status": True, "variable":controller.getTranslatorLStudioModelList},
|
||||
"/get/data/lmstudio_model": {"status": True, "variable":controller.getTranslatorLMStudioModel},
|
||||
"/set/data/lmstudio_model": {"status": True, "variable":controller.setTranslatorLMStudioModel},
|
||||
"/get/data/lmstudio_url": {"status": True, "variable":controller.getTranslatorLMStudioURL},
|
||||
"/set/data/lmstudio_url": {"status": True, "variable":controller.setTranslatorLMStudioURL},
|
||||
|
||||
"/get/data/ollama_connection": {"status": True, "variable":controller.checkTranslatorOllamaConnection},
|
||||
"/run/ollama_connection": {"status": True, "variable":controller.checkTranslatorOllamaConnection},
|
||||
"/get/data/ollama_model_list": {"status": True, "variable":controller.getTranslatorOllamaModelList},
|
||||
"/get/data/ollama_model": {"status": True, "variable":controller.getTranslatorOllamaModel},
|
||||
"/set/data/ollama_model": {"status": True, "variable":controller.setTranslatorOllamaModel},
|
||||
|
||||
# Transliteration
|
||||
"/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},
|
||||
|
||||
@@ -15,7 +15,7 @@ def _authentication_check(base_url: str | None = None) -> bool:
|
||||
"""Check authentication for Ollama API.
|
||||
"""
|
||||
try:
|
||||
response = requests.get(f"{base_url}/api/ping")
|
||||
response = requests.get(f"{base_url}")
|
||||
if response.status_code == 200:
|
||||
return True
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user