RYDE-WORK/Langchain-Chatchat
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/Langchain-Chatchat.git synced 2026-02-04 21:53:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3591 from srszzw/dev-to-pull

Browse Source 
解决ollama部署的qwen,执行agent,返回的json格式不正确问题。
This commit is contained in:
liunux4odoo 2024-04-01 14:54:38 +08:00 committed by GitHub
commit cabb3f2abf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chatchat-server/chatchat/server/agent/agent_factory/qwen_agent.py
View File

@ -87,7 +87,18 @@ class QwenChatAgentOutputParserCustom(StructuredChatOutputParser):
def parse(self, text: str) -> Union[AgentAction, AgentFinish]: def parse(self, text: str) -> Union[AgentAction, AgentFinish]:
if s := re.findall(r"\nAction:\s*(.+)\nAction\sInput:\s*(.+)", text, flags=re.DOTALL): if s := re.findall(r"\nAction:\s*(.+)\nAction\sInput:\s*(.+)", text, flags=re.DOTALL):
s = s[-1] s = s[-1]
return AgentAction(tool=s[0].strip(), tool_input=json.loads(s[1]), log=text) json_string: str=s[1]
json_input=None
try:
json_input=json.loads(json_string)
except:
# ollama部署的qwen，返回的json键值可能为单引号，可能缺少最后的引号和括号
if not json_string.endswith("\"}"):
print("尝试修复格式不正确的json输出:"+json_string)
json_string=(json_string+"\"}").replace("'","\"");
print("修复后的json:"+json_string)
json_input=json.loads(json_string)
return AgentAction(tool=s[0].strip(), tool_input=json_input, log=text)
elif s := re.findall(r"\nFinal\sAnswer:\s*(.+)", text, flags=re.DOTALL): elif s := re.findall(r"\nFinal\sAnswer:\s*(.+)", text, flags=re.DOTALL):
s = s[-1] s = s[-1]
return AgentFinish({"output": s}, log=text) return AgentFinish({"output": s}, log=text)