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

[Update] 翻訳者クラスにLM StudioおよびOllamaの接続状態を管理する機能を追加

Browse Source
This commit is contained in:
misyaguziya
2026-01-10 23:50:36 +09:00
parent 7834a98a54
commit bf7d2e61a7
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src-python/models/translation/translation_translator.py
View File

@@ -57,7 +57,9 @@ class Translator:
self.groq_client: Optional[GroqClient] = None self.groq_client: Optional[GroqClient] = None
self.openrouter_client: Optional[OpenRouterClient] = None self.openrouter_client: Optional[OpenRouterClient] = None
self.lmstudio_client: LMStudioClient[LMStudioClient] = None self.lmstudio_client: LMStudioClient[LMStudioClient] = None
self.lmstudio_connected: bool = False
self.ollama_client: OllamaClient[OllamaClient] = None self.ollama_client: OllamaClient[OllamaClient] = None
self.ollama_connected: bool = False
self.ctranslate2_translator: Any = None self.ctranslate2_translator: Any = None
self.ctranslate2_tokenizer: Any = None self.ctranslate2_tokenizer: Any = None
self.is_loaded_ctranslate2_model: bool = False self.is_loaded_ctranslate2_model: bool = False
@@ -123,6 +125,7 @@ class Translator:
if self.gemini_client.setAuthKey(auth_key): if self.gemini_client.setAuthKey(auth_key):
return True return True
else: else:
self.gemini_client = None
return False return False
def getGeminiModelList(self) -> list[str]: def getGeminiModelList(self) -> list[str]:
@@ -253,12 +256,9 @@ class Translator:
def getLMStudioConnected(self) -> bool: def getLMStudioConnected(self) -> bool:
"""Get LM Studio connection status. """Get LM Studio connection status.
Returns True if connected, False otherwise. Returns True if connected and verified, False otherwise.
""" """
if self.lmstudio_client is None: return self.lmstudio_connected
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.
@@ -269,6 +269,9 @@ class Translator:
result = self.lmstudio_client.setBaseURL(base_url) result = self.lmstudio_client.setBaseURL(base_url)
if result is False: if result is False:
self.lmstudio_client = None self.lmstudio_client = None
self.lmstudio_connected = False
else:
self.lmstudio_connected = True
return result return result
def getLMStudioModelList(self) -> list[str]: def getLMStudioModelList(self) -> list[str]:
@@ -294,12 +297,9 @@ class Translator:
def getOllamaConnected(self) -> bool: def getOllamaConnected(self) -> bool:
"""Get Ollama connection status. """Get Ollama connection status.
Returns True if connected, False otherwise. Returns True if connected and verified, False otherwise.
""" """
if self.ollama_client is None: return self.ollama_connected
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.
@@ -310,6 +310,9 @@ class Translator:
result = self.ollama_client.authenticationCheck() result = self.ollama_client.authenticationCheck()
if result is False: if result is False:
self.ollama_client = None self.ollama_client = None
self.ollama_connected = False
else:
self.ollama_connected = True
return result return result
def getOllamaModelList(self, root_path: str = None) -> bool: def getOllamaModelList(self, root_path: str = None) -> bool: