fix ask py

This commit is contained in:
syui 2025-05-23 15:48:36 +09:00
parent 0ee4739aef
commit e5820782a3
Signed by: syui
GPG Key ID: 5417CFEBAD92DF56

View File

@ -59,16 +59,6 @@ def call_mcp(cfg, message: str):
response.raise_for_status() response.raise_for_status()
return response.json().get("output", {}).get("response", "❓ 応答が取得できませんでした") return response.json().get("output", {}).get("response", "❓ 応答が取得できませんでした")
#def call_openai(cfg, message: str):
# payload = build_payload_openai(cfg, message)
# headers = {
# "Authorization": f"Bearer {cfg['api_key']}",
# "Content-Type": "application/json",
# }
# response = requests.post(cfg["url"], headers=headers, json=payload)
# response.raise_for_status()
# return response.json()["choices"][0]["message"]["content"]
def call_openai(cfg, message: str): def call_openai(cfg, message: str):
tools = [ tools = [
{ {
@ -127,6 +117,17 @@ def call_openai(cfg, message: str):
# 通常のテキスト応答 # 通常のテキスト応答
return result["choices"][0]["message"]["content"] return result["choices"][0]["message"]["content"]
def call_ollama(cfg, message: str):
payload = {
"model": cfg["model"],
"prompt": message, # `prompt` → `message` にすべき(変数未定義エラー回避)
"stream": False
}
headers = {"Content-Type": "application/json"}
response = requests.post(cfg["url"], headers=headers, json=payload)
response.raise_for_status()
return response.json().get("response", "❌ 応答が取得できませんでした")
def main(): def main():
if len(sys.argv) < 2: if len(sys.argv) < 2:
print("Usage: ask.py 'your message'") print("Usage: ask.py 'your message'")
@ -142,6 +143,9 @@ def main():
response = call_openai(cfg, message) response = call_openai(cfg, message)
elif cfg["provider"] == "mcp": elif cfg["provider"] == "mcp":
response = call_mcp(cfg, message) response = call_mcp(cfg, message)
elif cfg["provider"] == "ollama":
response = call_ollama(cfg, message)
else: else:
raise ValueError(f"未対応のプロバイダー: {cfg['provider']}") raise ValueError(f"未対応のプロバイダー: {cfg['provider']}")