From 345f2822f5072c34d9f969ae077830af968043b9 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 27 二月 2025 11:44:31 +0800
Subject: [PATCH] 优化输出
---
app/api/chat.py | 288 +++++++++++++++++++--------------------------------------
1 files changed, 97 insertions(+), 191 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index d609a64..16003e2 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -1,6 +1,5 @@
import json
import re
-import uuid
from copy import deepcopy
from fastapi import WebSocket, WebSocketDisconnect, APIRouter, Depends
@@ -12,7 +11,8 @@
from app.api import get_current_user_websocket
from app.config.config import settings
from app.config.const import IMAGE_TO_TEXT, DOCUMENT_TO_REPORT, DOCUMENT_TO_CLEANING, DOCUMENT_IA_QUESTIONS, \
- DOCUMENT_TO_REPORT_TITLE, DOCUMENT_TO_TITLE, DOCUMENT_TO_PAPER
+ DOCUMENT_TO_REPORT_TITLE, DOCUMENT_TO_TITLE, DOCUMENT_TO_PAPER, DOCUMENT_IA_QUESTIONS_DS, \
+ DOCUMENT_IA_QUESTIONS_EQUIPMENT
from app.models import MenuCapacityModel
from app.models.agent_model import AgentModel, AgentType
from app.models.base_model import get_db
@@ -40,6 +40,7 @@
print(f"Client {agent_id} connected")
agent = db.query(MenuCapacityModel).filter(MenuCapacityModel.chat_id == agent_id).first()
if not agent:
+ print("Agent not found")
agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
agent_type = agent.agent_type
chat_type = agent.type
@@ -231,7 +232,8 @@
question,
agent_id,
AgentType.BASIC,
- current_user.id
+ current_user.id,
+ {"role": "user", "content": question}
)
except Exception as e:
logger.error(e)
@@ -345,14 +347,13 @@
question,
agent_id,
AgentType.DIFY,
- current_user.id
+ current_user.id,
+ {"role": "user", "content": question}
)
conversation_id = session.conversation_id
except Exception as e:
logger.error(e)
# complete_response = ""
-
- answer_str = ""
files = []
if upload_file_id:
files.append({
@@ -361,6 +362,7 @@
"url": "",
"upload_file_id": upload_file_id
})
+ answer_str = ""
async for rag_response in dify_service.chat(token, current_user.id, question, files,
conversation_id, {}):
# print(rag_response)
@@ -431,16 +433,14 @@
print(f"Error process message of ragflow: {e2}")
elif chat_type == "reportWorkflow":
- token = DfTokenDao(db).get_token_by_id(DOCUMENT_TO_CLEANING)
- if not token:
- await websocket.send_json({"message": "Invalid token document_to_cleaning", "type": "error"})
while True:
receive_message = await websocket.receive_json()
print(f"Received from client {chat_id}: {receive_message}")
upload_files = receive_message.get('upload_files', [])
+ upload_filenames = receive_message.get('upload_filenames', [])
title = receive_message.get('title', "")
- workflow_type = receive_message.get('workflow', 1)
sub_titles = receive_message.get('sub_titles', "")
+ workflow_type = receive_message.get('workflow', 1)
title_number = receive_message.get('title_number', 8)
title_style = receive_message.get('title_style', "")
title_query = receive_message.get('title_query', "")
@@ -450,13 +450,19 @@
tokens = receive_message.get('tokens', 0)
if upload_files:
title_query = "start"
+ # if not upload_files:
+ # await websocket.send_json({"message": "Invalid request", "type": "error"})
+ # continue
try:
session = SessionService(db).create_session(
chat_id,
- title,
+ title if title else title_query,
agent_id,
AgentType.DIFY,
- current_user.id
+ current_user.id,
+ {"role": "user", "content": title if title else title_query, "type": workflow_type,
+ "is_clean": is_clean, "upload_filenames":upload_filenames},
+ workflow_type
)
conversation_id = session.conversation_id
except Exception as e:
@@ -489,14 +495,14 @@
inputs["input_files"] = files
inputs["Completion_of_main_indicators"] = title
inputs_list.append({"inputs": inputs, "token": token, "workflow_type": workflow_type})
- if workflow_type == 2:
+ elif workflow_type == 2:
inputs["file_list"] = files
inputs["Completion_of_main_indicators"] = title
inputs["sub_titles"] = sub_titles
token = DfTokenDao(db).get_token_by_id(DOCUMENT_TO_REPORT_TITLE)
if not token:
await websocket.send_json(
- {"message": "Invalid token document_to_cleaning", "type": "error"})
+ {"message": "Invalid token document_to_report", "type": "error"})
inputs_list.append({"inputs": inputs, "token": token, "workflow_type": workflow_type})
elif workflow_type == 3 and is_clean == 0 and tokens < max_token:
inputs["file_list"] = files
@@ -524,7 +530,8 @@
await websocket.send_json(
{"message": "Invalid token document_to_report", "type": "error"})
inputs_list.append({"inputs": inputs1, "token": token, "workflow_type": 3})
- complete_response = ""
+
+ # print(inputs_list)
for idx, input in enumerate(inputs_list):
# print(input)
if idx < len(inputs_list) - 1:
@@ -803,10 +810,17 @@
result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
await websocket.send_json(result)
print(f"Error process message of ragflow: {e2}")
- elif chat_type == "documentIa":
- # print(122112)
- token = DfTokenDao(db).get_token_by_id(DOCUMENT_IA_QUESTIONS)
+ elif chat_type == "documentIa" or chat_type == "documentIaDs" or chat_type == "documentIaEq":
+ token_dict = {
+ "documentIa": DOCUMENT_IA_QUESTIONS,
+ "documentIaDs": DOCUMENT_IA_QUESTIONS_DS,
+ "documentIaEq": DOCUMENT_IA_QUESTIONS_EQUIPMENT,
+ }
+ token = DfTokenDao(db).get_token_by_id(token_dict[chat_type])
# print(token)
+ node_list = []
+ workflow_list = []
+ workflow_dict = {}
if not token:
await websocket.send_json({"message": "Invalid token", "type": "error"})
@@ -816,6 +830,7 @@
receive_message = await websocket.receive_json()
print(f"Received from client {chat_id}: {receive_message}")
upload_file_id = receive_message.get('upload_file_id', [])
+ upload_filenames = receive_message.get('upload_filenames', [])
question = receive_message.get('message', "")
if not question and not image_url:
await websocket.send_json({"message": "Invalid request", "type": "error"})
@@ -826,7 +841,8 @@
question,
agent_id,
AgentType.DIFY,
- current_user.id
+ current_user.id,
+ {"role": "user", "content": question, "upload_filenames": upload_filenames}
)
conversation_id = session.conversation_id
except Exception as e:
@@ -845,162 +861,6 @@
complete_response = ""
async for rag_response in dify_service.chat(token, current_user.id, question, files,
conversation_id, {}):
- print(rag_response)
- try:
- if rag_response[:5] == "data:":
- # 濡傛灉鏄紝鍒欐埅鍙栨帀鍓�5涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
- complete_response = rag_response[5:].strip()
- elif "event: ping" in rag_response:
- continue
- else:
- # 鍚﹀垯锛屼繚鎸佸師鏍�
- complete_response += rag_response
- try:
- data = json.loads(complete_response)
- if data.get("event") == "node_started" or data.get(
- "event") == "node_finished": # "event": "message_end"
- if "data" not in data or not data["data"]: # 淇℃伅杩囨护
- logger.error("闈炴硶鏁版嵁--------------------")
- logger.error(data)
- continue
- else: # 姝ｅ父杈撳嚭
- answer = data.get("data", "")
- if isinstance(answer, str):
- logger.error("----------------鏈煡鏁版嵁--------------------")
- logger.error(data)
- continue
- elif isinstance(answer, dict):
-
- message = answer.get("title", "")
- if answer.get("status") == "failed":
- message = answer.get("error")
-
- result = {"message": message, "type": "system"}
- # continue
- elif data.get("event") == "message": # "event": "message_end"
- # 姝ｅ父杈撳嚭
- answer = data.get("answer", "")
- result = {"message": answer, "type": "stream"}
- elif data.get("event") == "error":
- answer = data.get("message", "")
- result = {"message": answer, "type": "system"}
- elif data.get("event") == "workflow_finished":
- answer = data.get("data", "")
- if isinstance(answer, str):
- logger.error("----------------鏈煡鏁版嵁--------------------")
- logger.error(data)
- # result = {"message": "", "type": "close", "download_url": ""}
- elif isinstance(answer, dict):
- download_url = ""
- outputs = answer.get("outputs", {})
- if outputs:
- message = outputs.get("answer", "")
- # download_url = outputs.get("download_url", "")
- else:
- message = answer.get("error", "")
-
- result = {"message": message, "type": "system",
- "download_url": download_url}
- try:
- SessionService(db).update_session(chat_id,
- message={"role": "assistant",
- "content": {
- "answer": message,
- "download_url": download_url}},
- conversation_id=data.get(
- "conversation_id"))
- except Exception as e:
- logger.error("淇濆瓨dify鐨勪細璇濆紓甯革紒")
- logger.error(e)
- # await websocket.send_json(result)
- # continue
- elif data.get("event") == "message_end":
- result = {"message": "", "type": "close"}
-
- else:
- continue
- try:
- await websocket.send_json(result)
- except Exception as e:
- logger.error(e)
- logger.error("杩斿洖瀹㈡埛绔秷鎭紓甯�!")
- complete_response = ""
- except json.JSONDecodeError as e:
- print(f"Error decoding JSON: {e}")
- # print(f"Response text: {text}")
- except Exception as e2:
- result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
- await websocket.send_json(result)
- print(f"Error process message of ragflow: {e2}")
- elif chat_type == "paperTalk":
- token = DfTokenDao(db).get_token_by_id(DOCUMENT_TO_PAPER)
- # print(token)
- if not token:
- await websocket.send_json({"message": "Invalid token", "type": "error"})
-
- while True:
- conversation_id = ""
- inputs = {}
- # print(4343)
- receive_message = await websocket.receive_json()
- print(f"Received from client {chat_id}: {receive_message}")
- if "difficulty" in receive_message:
- inputs["Question_Difficulty"] = receive_message["difficulty"]
- if "is_paper" in receive_message:
- inputs["Generate_test_paper"] = receive_message["is_paper"]
- if "single_choice" in receive_message:
- inputs["Multiple_choice_questions"] = receive_message["single_choice"]
- if "gap_filling" in receive_message:
- inputs["Fill_in_blank"] = receive_message["gap_filling"]
- if "true_or_false" in receive_message:
- inputs["true_or_false"] = receive_message["true_or_false"]
- if "multiple_choice" in receive_message:
- inputs["Multiple_Choice"] = receive_message["multiple_choice"]
- if "easy_question" in receive_message:
- inputs["Short_Answer_Questions"] = receive_message["easy_question"]
- if "case_questions" in receive_message:
- inputs["Case_Questions"] = receive_message["case_questions"]
- if "key_words" in receive_message:
- inputs["key_words"] = receive_message["key_words"]
- upload_files = receive_message.get('upload_files', [])
- question = receive_message.get('message', "")
- session_log = SessionService(db).get_session_by_id(chat_id)
- if not session_log and not upload_files:
- await websocket.send_json({"message": "闇�瑕佷笂浼犳枃妗ｏ紒", "type": "error"})
- continue
- try:
- session = SessionService(db).create_session(
- chat_id,
- question if question else "寮�濮嬪嚭棰�",
- agent_id,
- AgentType.DIFY,
- current_user.id
- )
- conversation_id = session.conversation_id
- except Exception as e:
- logger.error(e)
- # complete_response = ""
-
- files = []
- for fileId in upload_files:
- files.append({
- "type": "document",
- "transfer_method": "local_file",
- "url": "",
- "upload_file_id": fileId
- })
- if files:
- inputs["upload_files"] = files
- # print(inputs)
- if not question and not inputs:
- await websocket.send_json({"message": "Invalid request", "type": "error"})
- continue
-
- if not question:
- question = "寮�濮嬪嚭棰�"
- complete_response = ""
- async for rag_response in dify_service.chat(token, current_user.id, question, files,
- conversation_id, inputs):
# print(rag_response)
try:
if rag_response[:5] == "data:":
@@ -1013,9 +873,15 @@
complete_response += rag_response
try:
data = json.loads(complete_response)
- # print(data)
- if data.get("event") == "node_started" or data.get(
- "event") == "node_finished": # "event": "message_end"
+ node_data = deepcopy(data)
+ if "data" in node_data:
+ if "outputs" in node_data["data"]:
+ node_data["data"]["outputs"] = {}
+ if "inputs" in node_data["data"]:
+ node_data["data"]["inputs"] = {}
+ # print(node_data)
+ node_list.append(node_data)
+ if data.get("event") == "node_started":
if "data" not in data or not data["data"]: # 淇℃伅杩囨护
logger.error("闈炴硶鏁版嵁--------------------")
logger.error(data)
@@ -1027,18 +893,48 @@
logger.error(data)
continue
elif isinstance(answer, dict):
+ if answer.get("status") == "failed":
+ message = answer.get("error", "")
+ else:
+ message = answer.get("title", "")
- message = answer.get("title", "")
+ result = {"message": message, "type": "system", "workflow": {"node_data": workflow_list}}
+ elif data.get("event") == "node_finished":
+ workflow_list.append({
+ "title": data.get("data", {}).get("title", ""),
+ "status": data.get("data", {}).get("status", ""),
+ "created_at": data.get("data", {}).get("created_at", 0),
+ "finished_at": data.get("data", {}).get("finished_at", 0),
+ "node_type": data.get("data", {}).get("node_type", 0),
+ "elapsed_time": data.get("data", {}).get("elapsed_time", 0),
+ "error": data.get("data", {}).get("error", ""),
+ })
+ if "data" not in data or not data["data"]: # 淇℃伅杩囨护
+ logger.error("闈炴硶鏁版嵁--------------------")
+ logger.error(data)
+ continue
+ else: # 姝ｅ父杈撳嚭
+ answer = data.get("data", "")
+ if isinstance(answer, str):
+ logger.error("----------------鏈煡鏁版嵁--------------------")
+ logger.error(data)
+ continue
+ elif isinstance(answer, dict):
+ if answer.get("status") == "failed":
+ message = answer.get("error", "")
+ else:
+ message = answer.get("title", "")
- result = {"message": message, "type": "system"}
- # continue
+ result = {"message": message, "type": "system",
+ "workflow": {"node_data": workflow_list}}
elif data.get("event") == "message": # "event": "message_end"
- # 姝ｅ父杈撳嚭
+ # 姝ｅ父杈撳嚭
answer = data.get("answer", "")
- result = {"message": answer, "type": "stream"}
- elif data.get("event") == "error":
+ result = {"message": answer, "type": "stream", "workflow": {"node_data": workflow_list}}
+ elif data.get("event") == "error": # "event": "message_end"
+ # 姝ｅ父杈撳嚭
answer = data.get("message", "")
- result = {"message": answer, "type": "system"}
+ result = {"message": answer, "type": "system", "workflow": {"node_data": workflow_list}}
elif data.get("event") == "workflow_finished":
answer = data.get("data", "")
if isinstance(answer, str):
@@ -1050,27 +946,38 @@
outputs = answer.get("outputs", {})
if outputs:
message = outputs.get("answer", "")
- download_url = outputs.get("download_url", "")
+ # download_url = outputs.get("download_url", "")
else:
message = answer.get("error", "")
- result = {"message": message, "type": "system",
- "download_url": download_url}
+ # result = {"message": message, "type": "message",
+ # "download_url": download_url}
try:
SessionService(db).update_session(chat_id,
message={"role": "assistant",
"content": {
"answer": message,
+ "node_list": node_list,
"download_url": download_url}},
conversation_id=data.get(
"conversation_id"))
+ node_list = []
except Exception as e:
logger.error("淇濆瓨dify鐨勪細璇濆紓甯革紒")
logger.error(e)
# await websocket.send_json(result)
- # continue
+ workflow_dict = {
+ "node_data": workflow_list,
+ "total_tokens": data.get("data", {}).get("total_tokens", 0),
+ "created_at": data.get("data", {}).get("created_at", 0),
+ "finished_at": data.get("data", {}).get("finished_at", 0),
+ "status": data.get("data", {}).get("status", ""),
+ "error": data.get("data", {}).get("error", ""),
+ "elapsed_time": data.get("data", {}).get("elapsed_time", 0)
+ }
+ continue
elif data.get("event") == "message_end":
- result = {"message": "", "type": "close"}
+ result = {"message": "", "type": "close","workflow": workflow_dict}
else:
continue
@@ -1087,7 +994,6 @@
result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
await websocket.send_json(result)
print(f"Error process message of ragflow: {e2}")
-
# 鍚姩浠诲姟澶勭悊瀹㈡埛绔秷鎭�
tasks = [
--
Gitblit v1.8.0