AI/ragflow
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git synced 2025-08-13 21:06:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix zhipuAI stream issue (#825)

Browse Source 
### What problem does this PR solve?


### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
KevinHuSh 2024-05-17 17:07:33 +08:00 committed by GitHub
parent 081f922ee6
commit f6a599461f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/apps/api_app.py
View File

@ -222,7 +222,7 @@ def completion():
resp.headers.add_header("Content-Type", "text/event-stream; charset=utf-8") resp.headers.add_header("Content-Type", "text/event-stream; charset=utf-8")
return resp return resp
else: else:
ans = chat(dia, msg, False, **req) ans = chat(dia, msg, **req)
fillin_conv(ans) fillin_conv(ans)
API4ConversationService.append_message(conv.id, conv.to_dict()) API4ConversationService.append_message(conv.id, conv.to_dict())
return get_json_result(data=ans) return get_json_result(data=ans)

2
api/apps/conversation_app.py
View File

@ -162,7 +162,7 @@ def completion():
return resp return resp
else: else:
ans = chat(dia, msg, False, **req) ans = chat(dia, msg, **req)
fillin_conv(ans) fillin_conv(ans)
ConversationService.update_by_id(conv.id, conv.to_dict()) ConversationService.update_by_id(conv.id, conv.to_dict())
return get_json_result(data=ans) return get_json_result(data=ans)

5
rag/llm/chat_model.py
View File

@ -193,10 +193,11 @@ class ZhipuChat(Base):
if not resp.choices[0].delta.content:continue if not resp.choices[0].delta.content:continue
delta = resp.choices[0].delta.content delta = resp.choices[0].delta.content
ans += delta ans += delta
tk_count = resp.usage.total_tokens if response.usage else 0 if resp.choices[0].finish_reason == "length":
if resp.output.choices[0].finish_reason == "length":
ans += "...\nFor the content length reason, it stopped, continue?" if is_english( ans += "...\nFor the content length reason, it stopped, continue?" if is_english(
[ans]) else "······\n由于长度的原因，回答被截断了，要继续吗？" [ans]) else "······\n由于长度的原因，回答被截断了，要继续吗？"
tk_count = resp.usage.total_tokens
if resp.choices[0].finish_reason == "stop": tk_count = resp.usage.total_tokens
yield ans yield ans
except Exception as e: except Exception as e:
yield ans + "\n**ERROR**: " + str(e) yield ans + "\n**ERROR**: " + str(e)