15308555518/ MaxKB
1
0
Fork 0
mirror of https://github.com/1Panel-dev/MaxKB.git synced 2025-12-26 01:33:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: 修复大模型返回json时，解析出错 #656 (#697)

This commit is contained in:
shaohuzhang1 2024-07-03 15:19:09 +08:00 committed by GitHub
parent 1c3ea93f06
commit 7b5658f19d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py
View File

@ -143,7 +143,8 @@ class BaseChatStep(IChatStep):
def get_stream_result(message_list: List[BaseMessage],
chat_model: BaseChatModel = None,
paragraph_list=None,
no_references_setting=None):
no_references_setting=None,
problem_text=None):
if paragraph_list is None:
paragraph_list = []
directly_return_chunk_list = [AIMessageChunk(content=paragraph.content)
@ -153,7 +154,8 @@ class BaseChatStep(IChatStep):
return iter(directly_return_chunk_list), False
elif len(paragraph_list) == 0 and no_references_setting.get(
'status') == 'designated_answer':
return iter([AIMessageChunk(content=no_references_setting.get('value'))]), False
return iter(
[AIMessageChunk(content=no_references_setting.get('value').replace('{question}', problem_text))]), False
if chat_model is None:
return iter([AIMessageChunk('抱歉，没有配置 AI 模型，无法优化引用分段，请先去应用中设置 AI 模型。')]), False
else:
@ -170,7 +172,7 @@ class BaseChatStep(IChatStep):
client_id=None, client_type=None,
no_references_setting=None):
chat_result, is_ai_chat = self.get_stream_result(message_list, chat_model, paragraph_list,
no_references_setting)
no_references_setting, problem_text)
chat_record_id = uuid.uuid1()
r = StreamingHttpResponse(
streaming_content=event_content(chat_result, chat_id, chat_record_id, paragraph_list,
@ -185,7 +187,8 @@ class BaseChatStep(IChatStep):
def get_block_result(message_list: List[BaseMessage],
chat_model: BaseChatModel = None,
paragraph_list=None,
no_references_setting=None):
no_references_setting=None,
problem_text=None):
if paragraph_list is None:
paragraph_list = []
@ -196,7 +199,7 @@ class BaseChatStep(IChatStep):
return directly_return_chunk_list[0], False
elif len(paragraph_list) == 0 and no_references_setting.get(
'status') == 'designated_answer':
return AIMessage(no_references_setting.get('value')), False
return AIMessage(no_references_setting.get('value').replace('{question}', problem_text)), False
if chat_model is None:
return AIMessage('抱歉，没有配置 AI 模型，无法优化引用分段，请先去应用中设置 AI 模型。'), False
else:
@ -215,7 +218,7 @@ class BaseChatStep(IChatStep):
# 调用模型
try:
chat_result, is_ai_chat = self.get_block_result(message_list, chat_model, paragraph_list,
no_references_setting)
no_references_setting, problem_text)
if is_ai_chat:
request_token = chat_model.get_num_tokens_from_messages(message_list)
response_token = chat_model.get_num_tokens(chat_result.content)

6
apps/application/chat_pipeline/step/generate_human_message_step/impl/base_generate_human_message_step.py
View File

@ -48,9 +48,9 @@ class BaseGenerateHumanMessageStep(IGenerateHumanMessageStep):
if paragraph_list is None or len(paragraph_list) == 0:
if no_references_setting.get('status') == 'ai_questioning':
return HumanMessage(
content=no_references_setting.get('value').format(**{'question': problem}))
content=no_references_setting.get('value').replace('{question}', problem))
else:
return HumanMessage(content=prompt.format(**{'data': "", 'question': problem}))
return HumanMessage(content=prompt.replace('{data}', "").replace('{question}', problem))
temp_data = ""
data_list = []
for p in paragraph_list:
@ -63,4 +63,4 @@ class BaseGenerateHumanMessageStep(IGenerateHumanMessageStep):
else:
data_list.append(f"<data>{content}</data>")
data = "\n".join(data_list)
return HumanMessage(content=prompt.format(**{'data': data, 'question': problem}))
return HumanMessage(content=prompt.replace('{data}', data).replace('{question}', problem))