镜像自地址
https://github.com/binary-husky/gpt_academic.git
已同步 2025-12-06 22:46:48 +00:00
修复get_conf接口
这个提交包含在:
2
main.py
2
main.py
@@ -433,7 +433,7 @@ def main():
|
|||||||
server_port=PORT,
|
server_port=PORT,
|
||||||
favicon_path=os.path.join(os.path.dirname(__file__), "docs/logo.png"),
|
favicon_path=os.path.join(os.path.dirname(__file__), "docs/logo.png"),
|
||||||
auth=AUTHENTICATION if len(AUTHENTICATION) != 0 else None,
|
auth=AUTHENTICATION if len(AUTHENTICATION) != 0 else None,
|
||||||
blocked_paths=["config.py","config_private.py","docker-compose.yml","Dockerfile"])
|
blocked_paths=["config.py","config_private.py","docker-compose.yml","Dockerfile","gpt_log/admin"])
|
||||||
|
|
||||||
# 如果需要在二级路径下运行
|
# 如果需要在二级路径下运行
|
||||||
# CUSTOM_PATH = get_conf('CUSTOM_PATH')
|
# CUSTOM_PATH = get_conf('CUSTOM_PATH')
|
||||||
|
|||||||
@@ -120,6 +120,7 @@ def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="",
|
|||||||
raise ConnectionAbortedError("OpenAI拒绝了请求:" + error_msg)
|
raise ConnectionAbortedError("OpenAI拒绝了请求:" + error_msg)
|
||||||
else:
|
else:
|
||||||
if "API key has been deactivated" in error_msg: report_invalid_key(api_key)
|
if "API key has been deactivated" in error_msg: report_invalid_key(api_key)
|
||||||
|
elif "exceeded your current quota" in error_msg: report_invalid_key(api_key)
|
||||||
raise RuntimeError("OpenAI拒绝了请求:" + error_msg)
|
raise RuntimeError("OpenAI拒绝了请求:" + error_msg)
|
||||||
if ('data: [DONE]' in chunk): break # api2d 正常完成
|
if ('data: [DONE]' in chunk): break # api2d 正常完成
|
||||||
json_data = json.loads(chunk.lstrip('data:'))['choices'][0]
|
json_data = json.loads(chunk.lstrip('data:'))['choices'][0]
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ def generate_message_payload(inputs, llm_kwargs, history, system_prompt):
|
|||||||
|
|
||||||
|
|
||||||
def generate_from_baidu_qianfan(inputs, llm_kwargs, history, system_prompt):
|
def generate_from_baidu_qianfan(inputs, llm_kwargs, history, system_prompt):
|
||||||
BAIDU_CLOUD_QIANFAN_MODEL, = get_conf('BAIDU_CLOUD_QIANFAN_MODEL')
|
BAIDU_CLOUD_QIANFAN_MODEL = get_conf('BAIDU_CLOUD_QIANFAN_MODEL')
|
||||||
|
|
||||||
url_lib = {
|
url_lib = {
|
||||||
"ERNIE-Bot": "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions" ,
|
"ERNIE-Bot": "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions" ,
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ from multiprocessing import Process, Pipe
|
|||||||
model_name = '星火认知大模型'
|
model_name = '星火认知大模型'
|
||||||
|
|
||||||
def validate_key():
|
def validate_key():
|
||||||
XFYUN_APPID, = get_conf('XFYUN_APPID', )
|
XFYUN_APPID = get_conf('XFYUN_APPID', )
|
||||||
if XFYUN_APPID == '00000000' or XFYUN_APPID == '':
|
if XFYUN_APPID == '00000000' or XFYUN_APPID == '':
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ try:
|
|||||||
CHANNEL_ID = None
|
CHANNEL_ID = None
|
||||||
|
|
||||||
async def open_channel(self):
|
async def open_channel(self):
|
||||||
response = await self.conversations_open(users=get_conf('SLACK_CLAUDE_BOT_ID')[0])
|
response = await self.conversations_open(users=get_conf('SLACK_CLAUDE_BOT_ID'))
|
||||||
self.CHANNEL_ID = response["channel"]["id"]
|
self.CHANNEL_ID = response["channel"]["id"]
|
||||||
|
|
||||||
async def chat(self, text):
|
async def chat(self, text):
|
||||||
@@ -51,7 +51,7 @@ try:
|
|||||||
# TODO:暂时不支持历史消息,因为在同一个频道里存在多人使用时历史消息渗透问题
|
# TODO:暂时不支持历史消息,因为在同一个频道里存在多人使用时历史消息渗透问题
|
||||||
resp = await self.conversations_history(channel=self.CHANNEL_ID, oldest=self.LAST_TS, limit=1)
|
resp = await self.conversations_history(channel=self.CHANNEL_ID, oldest=self.LAST_TS, limit=1)
|
||||||
msg = [msg for msg in resp["messages"]
|
msg = [msg for msg in resp["messages"]
|
||||||
if msg.get("user") == get_conf('SLACK_CLAUDE_BOT_ID')[0]]
|
if msg.get("user") == get_conf('SLACK_CLAUDE_BOT_ID')]
|
||||||
return msg
|
return msg
|
||||||
except (SlackApiError, KeyError) as e:
|
except (SlackApiError, KeyError) as e:
|
||||||
raise RuntimeError(f"获取Slack消息失败。")
|
raise RuntimeError(f"获取Slack消息失败。")
|
||||||
|
|||||||
在新工单中引用
屏蔽一个用户