翻訳バックエンドを拡張・リファクタリング：OpenAI/Plamo/Gemini クライアントを追加・改修し、プロンプトを YAML から読み込むように変更。各クライアントでモデル一覧取得・認証・クライアント更新機能を実装し、Translator/Model 層の対応メソッドを追加。Controller と mainloop にプラモ・ジェミニ・OpenAI の認証/モデル操作エンドポイントを追加・整備。config のモデル/API設定をプロパティ化して既定値を None に変更し、選択肢リストを初期化。translation_languages に OpenAI 用マッピングを追加。requirements ファイルの依存記述を調整。
This commit is contained in:
misyaguziya
@@ -1,148 +1,138 @@
|
||||
import logging
|
||||
from google import genai
|
||||
from langchain_google_genai import ChatGoogleGenerativeAI
|
||||
from langchain_core.messages import HumanMessage
|
||||
import yaml
|
||||
from os import path as os_path
|
||||
|
||||
logger = logging.getLogger("langchain_google_genai")
|
||||
logger.setLevel(logging.ERROR)
|
||||
|
||||
_MODELS = [
|
||||
"gemini-2.5-pro",
|
||||
"gemini-2.5-flash",
|
||||
"gemini-2.5-flash-lite", # default
|
||||
"gemini-2.0-flash",
|
||||
"gemini-2.0-flash-lite",
|
||||
"gemini-1.5-pro",
|
||||
"gemini-1.5-flash-8b"
|
||||
"gemini-1.5-flash",
|
||||
def _authentication_check(api_key: str) -> bool:
|
||||
"""Check if the provided API key is valid by attempting to list models.
|
||||
"""
|
||||
try:
|
||||
client = genai.Client(api_key=api_key)
|
||||
client.models.list()
|
||||
return True
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
def _get_available_text_models(api_key: str) -> list[str]:
|
||||
"""Extract only Gemini models suitable for translation and chat applications
|
||||
"""
|
||||
client = genai.Client(api_key=api_key)
|
||||
res = client.models.list()
|
||||
allowed_models = []
|
||||
|
||||
# 除外対象のキーワード
|
||||
exclude_keywords = [
|
||||
"audio",
|
||||
"image",
|
||||
"veo",
|
||||
"tts",
|
||||
"robotics",
|
||||
"computer-use"
|
||||
]
|
||||
for model in res:
|
||||
model_id = model.name
|
||||
if ("gemini" in model_id.lower() or "gemma" in model_id.lower()) and "generateContent" in model.supported_actions:
|
||||
if any(x in model_id for x in exclude_keywords):
|
||||
continue
|
||||
allowed_models.append(model_id.replace("models/", ""))
|
||||
allowed_models.sort()
|
||||
return allowed_models
|
||||
|
||||
def _load_prompt_config(root_path: str = None) -> dict:
|
||||
"""プロンプト設定をYAMLファイルから読み込む"""
|
||||
prompt_filename = "translation_gemini.yml"
|
||||
|
||||
# PyInstallerでビルドされた場合のパス
|
||||
if root_path and os_path.exists(os_path.join(root_path, "_internal", "prompt", prompt_filename)):
|
||||
prompt_path = os_path.join(root_path, "_internal", "prompt", prompt_filename)
|
||||
# src-pythonフォルダから直接実行している場合のパス
|
||||
elif os_path.exists(os_path.join(os_path.dirname(__file__), "models", "translation", "prompt", prompt_filename)):
|
||||
prompt_path = os_path.join(os_path.dirname(__file__), "models", "translation", "prompt", prompt_filename)
|
||||
# translationフォルダから直接実行している場合のパス
|
||||
elif os_path.exists(os_path.join(os_path.dirname(__file__), "prompt", prompt_filename)):
|
||||
prompt_path = os_path.join(os_path.dirname(__file__), "prompt", prompt_filename)
|
||||
else:
|
||||
raise FileNotFoundError(f"Prompt file not found: {prompt_filename}")
|
||||
|
||||
with open(prompt_path, "r", encoding="utf-8") as f:
|
||||
return yaml.safe_load(f)
|
||||
|
||||
class GeminiClient:
|
||||
def __init__(self, api_key: str = "", model: str = "gemini-2.5-flash-lite", root_path: str = None):
|
||||
self.api_key = api_key
|
||||
self.model = model
|
||||
def __init__(self, root_path: str = None):
|
||||
self.api_key = None
|
||||
self.model = None
|
||||
|
||||
# プロンプト設定をYAMLファイルから読み込む
|
||||
prompt_config = self._load_prompt_config(root_path)
|
||||
prompt_config = _load_prompt_config(root_path)
|
||||
self.supported_languages = prompt_config["supported_languages"]
|
||||
self.prompt_template = prompt_config["system_prompt"]
|
||||
|
||||
self.gemini_llm = None
|
||||
|
||||
def getModelList(self) -> list[str]:
|
||||
return _get_available_text_models(self.api_key)
|
||||
|
||||
def getAuthKey(self) -> str:
|
||||
return self.api_key
|
||||
|
||||
def setAuthKey(self, api_key: str) -> bool:
|
||||
result = _authentication_check(api_key)
|
||||
if result:
|
||||
self.api_key = api_key
|
||||
return result
|
||||
|
||||
def getModel(self) -> str:
|
||||
return self.model
|
||||
|
||||
def setModel(self, model: str) -> bool:
|
||||
if model in self.getModelList():
|
||||
self.model = model
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
def updateClient(self) -> None:
|
||||
self.gemini_llm = ChatGoogleGenerativeAI(
|
||||
model=self.model,
|
||||
api_key=self.api_key,
|
||||
)
|
||||
|
||||
def _load_prompt_config(self, root_path: str = None) -> dict:
|
||||
"""プロンプト設定をYAMLファイルから読み込む"""
|
||||
prompt_filename = "translation_gemini.yml"
|
||||
|
||||
# PyInstallerでビルドされた場合のパス
|
||||
if root_path and os_path.exists(os_path.join(root_path, "_internal", "prompt", prompt_filename)):
|
||||
prompt_path = os_path.join(root_path, "_internal", "prompt", prompt_filename)
|
||||
# src-pythonフォルダから直接実行している場合のパス
|
||||
elif os_path.exists(os_path.join(os_path.dirname(__file__), "models", "translation", "prompt", prompt_filename)):
|
||||
prompt_path = os_path.join(os_path.dirname(__file__), "models", "translation", "prompt", prompt_filename)
|
||||
# translationフォルダから直接実行している場合のパス
|
||||
elif os_path.exists(os_path.join(os_path.dirname(__file__), "prompt", prompt_filename)):
|
||||
prompt_path = os_path.join(os_path.dirname(__file__), "prompt", prompt_filename)
|
||||
else:
|
||||
raise FileNotFoundError(f"Prompt file not found: {prompt_filename}")
|
||||
|
||||
with open(prompt_path, "r", encoding="utf-8") as f:
|
||||
return yaml.safe_load(f)
|
||||
|
||||
def getListModels(self) -> list[str]:
|
||||
return _MODELS
|
||||
|
||||
def getAuthKey(self) -> str:
|
||||
"""現在のAuthKeyを取得する"""
|
||||
return self.api_key
|
||||
|
||||
def getModel(self) -> str:
|
||||
"""現在のモデルを取得する"""
|
||||
return self.model
|
||||
|
||||
def setAuthKey(self, api_key: str) -> bool:
|
||||
"""AuthKeyを設定し、成功したかどうかを返す"""
|
||||
try:
|
||||
self.api_key = api_key
|
||||
self.gemini_llm = ChatGoogleGenerativeAI(
|
||||
model=self.model,
|
||||
api_key=self.api_key,
|
||||
)
|
||||
return True
|
||||
except Exception as e:
|
||||
print(f"Error setting AuthKey: {e}")
|
||||
return False
|
||||
|
||||
def setModel(self, model: str) -> bool:
|
||||
"""モデルを設定し、成功したかどうかを返す"""
|
||||
try:
|
||||
if model in _MODELS:
|
||||
self.model = model
|
||||
self.gemini_llm = ChatGoogleGenerativeAI(
|
||||
model=self.model,
|
||||
api_key=self.api_key,
|
||||
)
|
||||
return True
|
||||
else:
|
||||
print(f"Model {model} is not supported.")
|
||||
return False
|
||||
except Exception as e:
|
||||
print(f"Error setting model: {e}")
|
||||
return False
|
||||
|
||||
def translate(self, text: str, input_lang: str, output_lang: str) -> str:
|
||||
messages = self.prompt_template.format(
|
||||
input_lang=input_lang,
|
||||
output_lang=output_lang,
|
||||
text=text
|
||||
)
|
||||
system_prompt = self.prompt_template.format(
|
||||
supported_languages=self.supported_languages,
|
||||
input_lang=input_lang,
|
||||
output_lang=output_lang
|
||||
)
|
||||
|
||||
output = self.gemini_llm.invoke([HumanMessage(content=messages)])
|
||||
return output.content
|
||||
messages = [
|
||||
{"role": "system", "content": system_prompt},
|
||||
{"role": "user", "content": text}
|
||||
]
|
||||
|
||||
def checkAuthKey(self) -> bool:
|
||||
try:
|
||||
self.setModel(self.model)
|
||||
self.translate("Hello World", input_lang="English", output_lang="Japanese")
|
||||
return True
|
||||
except Exception:
|
||||
return False
|
||||
resp = self.gemini_llm.invoke(messages)
|
||||
content = ""
|
||||
if isinstance(resp.content, str):
|
||||
content = resp.content
|
||||
elif isinstance(resp.content, list):
|
||||
for part in resp.content:
|
||||
if isinstance(part, str):
|
||||
content += part
|
||||
elif isinstance(part, dict) and "content" in part and isinstance(part["content"], str):
|
||||
content += part["content"]
|
||||
return content.strip()
|
||||
|
||||
if __name__ == "__main__":
|
||||
AUTH_KEY = "AUTH_KEY"
|
||||
text = """
|
||||
毎朝コーヒーを入れるのがささやかな楽しみになってる
|
||||
"""
|
||||
input_lang = "Japanese"
|
||||
output_lang = "English"
|
||||
|
||||
gemini_client = GeminiClient(api_key=AUTH_KEY, model="gemini-2.5-flash-lite")
|
||||
|
||||
print("model list:", gemini_client.getListModels())
|
||||
print("AuthKey:", gemini_client.getAuthKey())
|
||||
# print("Model:", gemini_client.getModel())
|
||||
# print(f"set model: {gemini_client.setModel('gemini-2.5-flash')}")
|
||||
# print(f"set AuthKey: {gemini_client.setAuthKey(AUTH_KEY)}")
|
||||
# print(f"check AuthKey: {gemini_client.checkAuthKey()}")
|
||||
|
||||
# try:
|
||||
# translated_text = gemini_client.translate(text, input_lang, output_lang)
|
||||
# print(translated_text)
|
||||
# except Exception:
|
||||
# print("Invalid API key. Please check your credentials.")
|
||||
|
||||
# 外部ファイルから読み込んだサポート言語を使用
|
||||
for lang in gemini_client.supported_languages.split("\n"):
|
||||
if lang == "":
|
||||
continue
|
||||
print (f"Translating to {lang}:")
|
||||
try:
|
||||
translated_text = gemini_client.translate(text, input_lang, lang)
|
||||
print(f"Translated text: {translated_text}")
|
||||
except Exception as e:
|
||||
print(f"Error translating to {lang} api limit")
|
||||
print(f"Error reason: {e}")
|
||||
break
|
||||
client = GeminiClient()
|
||||
client.setAuthKey(AUTH_KEY)
|
||||
models = client.getModelList()
|
||||
if models:
|
||||
print("Available models:", models)
|
||||
model = input("Select a model: ")
|
||||
client.setModel(model)
|
||||
client.updateClient()
|
||||
print(client.translate("こんにちは世界", "Japanese", "English"))
|
||||
Reference in New Issue
Block a user