kaiyuan/chatgpt-on-wechat
1
0
Fork 0
mirror of https://github.com/zhayujie/chatgpt-on-wechat.git synced 2026-07-21 14:17:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix for azure chatgpt adapting

Browse Source
This commit is contained in:
yubai
2023-04-09 15:36:03 +08:00
parent bf4ae9a051
commit 89e8f385b4
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bot/chatgpt/chat_gpt_bot.py
View File

@@ -151,6 +151,7 @@ class AzureChatGPTBot(ChatGPTBot):
def compose_args(self): def compose_args(self):
args = super().compose_args() args = super().compose_args()
args["engine"] = args["model"] args["deployment_id"] = conf().get("azure_deployment_id")
del(args["model"]) #args["engine"] = args["model"]
#del(args["model"])
return args return args

2
bot/chatgpt/chat_gpt_session.py
View File

@@ -55,7 +55,7 @@ def num_tokens_from_messages(messages, model):
except KeyError: except KeyError:
logger.debug("Warning: model not found. Using cl100k_base encoding.") logger.debug("Warning: model not found. Using cl100k_base encoding.")
encoding = tiktoken.get_encoding("cl100k_base") encoding = tiktoken.get_encoding("cl100k_base")
if model == "gpt-3.5-turbo": if model == "gpt-3.5-turbo" or model == "gpt-35-turbo":
return num_tokens_from_messages(messages, model="gpt-3.5-turbo-0301") return num_tokens_from_messages(messages, model="gpt-3.5-turbo-0301")
elif model == "gpt-4": elif model == "gpt-4":
return num_tokens_from_messages(messages, model="gpt-4-0314") return num_tokens_from_messages(messages, model="gpt-4-0314")

1
config-template.json
View File

@@ -1,5 +1,6 @@
{ {
"open_ai_api_key": "YOUR API KEY", "open_ai_api_key": "YOUR API KEY",
"open_ai_api_base": "",
"model": "gpt-3.5-turbo", "model": "gpt-3.5-turbo",
"proxy": "", "proxy": "",
"single_chat_prefix": ["bot", "@bot"], "single_chat_prefix": ["bot", "@bot"],

1
config.py
View File

@@ -16,6 +16,7 @@ available_setting = {
# chatgpt模型， 当use_azure_chatgpt为true时，其名称为Azure上model deployment名称 # chatgpt模型， 当use_azure_chatgpt为true时，其名称为Azure上model deployment名称
"model": "gpt-3.5-turbo", "model": "gpt-3.5-turbo",
"use_azure_chatgpt": False, # 是否使用azure的chatgpt "use_azure_chatgpt": False, # 是否使用azure的chatgpt
"azure_deployment_id": "", #azure 模型部署名称
# Bot触发配置 # Bot触发配置
"single_chat_prefix": ["bot", "@bot"], # 私聊时文本需要包含该前缀才能触发机器人回复 "single_chat_prefix": ["bot", "@bot"], # 私聊时文本需要包含该前缀才能触发机器人回复