From 27277c97d235b84c6354c21ab80285bd0d3f30fa Mon Sep 17 00:00:00 2001 From: Changhua Date: Sat, 17 Feb 2024 08:00:32 +0800 Subject: [PATCH] Upgrade openai --- base/func_chatgpt.py | 49 ++++++++++++++++++++++---------------------- config.yaml.template | 5 +++-- requirements.txt | 2 +- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/base/func_chatgpt.py b/base/func_chatgpt.py index 4a51d06..f023e45 100644 --- a/base/func_chatgpt.py +++ b/base/func_chatgpt.py @@ -1,22 +1,26 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- +import logging from datetime import datetime -import openai +from openai import APIConnectionError, APIError, AuthenticationError, OpenAI -class ChatGPT: - +class ChatGPT(): def __init__(self, conf: dict) -> None: - openai.api_key = conf["key"] - # 自己搭建或第三方代理的接口 - openai.api_base = conf["api"] - proxy = conf["proxy"] + key = conf.get("key") + api = conf.get("api") + proxy = conf.get("proxy") + prompt = conf.get("prompt") + self.model = conf.get("model", "gpt-3.5-turbo") + self.LOG = logging.getLogger("ChatGPT") if proxy: - openai.proxy = {"http": proxy, "https": proxy} + self.client = OpenAI(api_key=key, base_url=api, proxy={"http": proxy, "https": proxy}) + else: + self.client = OpenAI(api_key=key, base_url=api) self.conversation_list = {} - self.system_content_msg = {"role": "system", "content": conf["prompt"]} + self.system_content_msg = {"role": "system", "content": prompt} def __repr__(self): return 'ChatGPT' @@ -31,26 +35,23 @@ class ChatGPT: def get_answer(self, question: str, wxid: str) -> str: # wxid或者roomid,个人时为微信id，群消息时为群id self.updateMessage(wxid, question, "user") - + rsp = "" try: - ret = openai.ChatCompletion.create( - model="gpt-3.5-turbo", - messages=self.conversation_list[wxid], - temperature=0.2 - ) - - rsp = ret["choices"][0]["message"]["content"] + ret = self.client.chat.completions.create(model=self.model, + messages=self.conversation_list[wxid], + temperature=0.2) + rsp = ret.choices[0].message.content rsp = rsp[2:] if rsp.startswith("\n\n") else rsp rsp = rsp.replace("\n\n", "\n") self.updateMessage(wxid, rsp, "assistant") - except openai.error.AuthenticationError as e3: - rsp = "OpenAI API 认证失败，请检查 API 密钥是否正确" - except openai.error.APIConnectionError as e2: - rsp = "无法连接到 OpenAI API，请检查网络连接" - except openai.error.APIError as e1: - rsp = "OpenAI API 返回了错误：" + str(e1) + except AuthenticationError: + self.LOG.error("OpenAI API 认证失败，请检查 API 密钥是否正确") + except APIConnectionError: + self.LOG.error("无法连接到 OpenAI API，请检查网络连接") + except APIError as e1: + self.LOG.error(f"OpenAI API 返回了错误：{str(e1)}") except Exception as e0: - rsp = "发生未知错误：" + str(e0) + self.LOG.error(f"发生未知错误：{str(e0)}") return rsp diff --git a/config.yaml.template b/config.yaml.template index 16472b7..653b232 100644 --- a/config.yaml.template +++ b/config.yaml.template @@ -50,8 +50,9 @@ report_reminder: chatgpt: # -----chatgpt配置这行不填----- key: # 填写你 ChatGPT 的 key api: https://api.openai.com/v1 # 如果你不知道这是干嘛的，就不要改 + model: gpt-3.5-turbo proxy: # 如果你在国内，你可能需要魔法，大概长这样：http://域名或者IP地址:端口号 - prompt: 你是智能聊天机器人，你叫wcferry # 根据需要对角色进行设定 + prompt: 你是智能聊天机器人，你叫 wcferry # 根据需要对角色进行设定 chatglm: # -----chatglm配置这行不填----- key: sk-012345678901234567890123456789012345678901234567 # 这个应该不用动 @@ -68,7 +69,7 @@ xinghuo_web: # -----讯飞星火web模式api配置这行不填 抓取方式详 cookie: # cookie fd: # fd GtToken: # GtToken - prompt: 你是智能聊天机器人，你叫wcferry。请用这个角色回答我的问题 # 根据需要对角色进行设定 + prompt: 你是智能聊天机器人，你叫 wcferry。请用这个角色回答我的问题 # 根据需要对角色进行设定 bard: # -----bard配置这行不填----- api_key: # api-key 创建地址：https://ai.google.dev/pricing?hl=en，创建后复制过来即可 diff --git a/requirements.txt b/requirements.txt index d4a3aac..0872810 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ chinese_calendar lxml -openai==0.27.6 +openai pandas pyyaml requests