From b9c7727dc6fbb3789f063c0616ef9392311fecb2 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 06 二月 2025 10:58:14 +0800
Subject: [PATCH] merge master
---
app/api/chat.py | 397 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 327 insertions(+), 70 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index a824acd..2241161 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -10,7 +10,8 @@
from Log import logger
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
+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
from app.models import MenuCapacityModel
from app.models.agent_model import AgentModel, AgentType
from app.models.base_model import get_db
@@ -55,7 +56,8 @@
ret = {"message": "Chat ID not found", "type": "close"}
await websocket.send_json(ret)
return
-
+ # print(agent_type)
+ # print(chat_type)
if agent_type == AgentType.RAGFLOW:
ragflow_service = RagflowService(settings.fwr_base_url)
token = await get_ragflow_token(db, current_user.id)
@@ -359,7 +361,7 @@
"upload_file_id": upload_file_id
})
async for rag_response in dify_service.chat(token, current_user.id, question, files,
- conversation_id):
+ conversation_id, {}):
# print(rag_response)
try:
if rag_response[:5] == "data:":
@@ -437,9 +439,12 @@
upload_files = receive_message.get('upload_files', [])
title = receive_message.get('title', "")
workflow_type = receive_message.get('workflow', 1)
- if not upload_files:
- await websocket.send_json({"message": "Invalid request", "type": "error"})
- continue
+ sub_titles = receive_message.get('sub_titles', "")
+ title_number = receive_message.get('title_number', 8)
+ title_style = receive_message.get('title_style', "")
+ title_query = receive_message.get('title_query', "")
+ if upload_files:
+ title_query = "start"
try:
session = SessionService(db).create_session(
chat_id,
@@ -466,87 +471,178 @@
if workflow_type == 2:
inputs["file_list"] = files
inputs["Completion_of_main_indicators"] = title
- token = DfTokenDao(db).get_token_by_id(DOCUMENT_TO_REPORT)
+ 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"})
+ elif workflow_type == 3:
+ inputs["file_list"] = files
+ inputs["number_of_title"] = title_number
+ inputs["title_style"] = title_style
+ token = DfTokenDao(db).get_token_by_id(DOCUMENT_TO_TITLE)
+ if not token:
+ await websocket.send_json(
+ {"message": "Invalid token document_to_title", "type": "error"})
+
complete_response = ""
- async for rag_response in dify_service.workflow(token, current_user.id, inputs):
- # 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
+ if workflow_type == 1 or workflow_type == 2:
+ async for rag_response in dify_service.workflow(token, current_user.id, inputs):
+ # print(rag_response)
try:
- data = json.loads(complete_response)
- 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: # 姝ｅ父杈撳嚭
+ 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)
+ 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", "")
+
+ result = {"message": message, "type": "system"}
+ elif data.get("event") == "workflow_finished":
answer = data.get("data", "")
if isinstance(answer, str):
logger.error("----------------鏈煡鏁版嵁--------------------")
logger.error(data)
- continue
+ result = {"message": "", "type": "close", "download_url": ""}
elif isinstance(answer, dict):
+ download_url = ""
+ outputs = answer.get("outputs", {})
+ if outputs:
+ message = outputs.get("output", "")
+ download_url = outputs.get("download_url", "")
+ else:
+ message = answer.get("error", "")
- message = answer.get("title", "")
+ result = {"message": message, "type": "message", "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)
+ result = {"message": "", "type": "close", "download_url": ""}
- result = {"message": message, "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("output", "")
- download_url = outputs.get("download_url", "")
- else:
- message = answer.get("error", "")
- result = {"message": message, "type": "message", "download_url": download_url}
+ 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 workflow_type == 3:
+ image_list = []
+ # print(inputs)
+ complete_response = ""
+ async for rag_response in dify_service.chat(token, current_user.id, title_query, [],
+ conversation_id, inputs):
+ 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)
+ 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", "")
+
+ result = {"message": message, "type": "system"}
+ elif data.get("event") == "message":
+ message = data.get("answer", "")
+ # try:
+ # msg_dict = json.loads(answer)
+ # message = msg_dict.get("output", "")
+ # except Exception as e:
+ # print(e)
+ # continue
+ result = {"message": message, "type": "message",
+ "download_url": ""}
try:
SessionService(db).update_session(chat_id,
message={"role": "assistant",
"content": {
"answer": message,
- "download_url": 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)
+ # try:
+ # await websocket.send_json(result)
+ # except Exception as e:
+ # logger.error(e)
+ # logger.error("杩斿洖瀹㈡埛绔秷鎭紓甯�!")
+
+ elif data.get("event") == "message_end":
result = {"message": "", "type": "close", "download_url": ""}
-
-
- 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}")
+ else:
+ continue
+ try:
+ await websocket.send_json(result)
+ except Exception as e:
+ logger.error(e)
+ logger.error("dify杩斿洖瀹㈡埛绔秷鎭紓甯�!")
+ 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 == "documentIa":
# print(122112)
token = DfTokenDao(db).get_token_by_id(DOCUMENT_IA_QUESTIONS)
@@ -588,8 +684,8 @@
answer_str = ""
complete_response = ""
async for rag_response in dify_service.chat(token, current_user.id, question, files,
- conversation_id):
- # print(rag_response)
+ conversation_id, {}):
+ print(rag_response)
try:
if rag_response[:5] == "data:":
# 濡傛灉鏄紝鍒欐埅鍙栨帀鍓�5涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
@@ -616,19 +712,24 @@
elif isinstance(answer, dict):
message = answer.get("title", "")
+ if answer.get("status") == "failed":
+ message = answer.get("error")
result = {"message": message, "type": "system"}
- continue
+ # 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": ""}
+ # result = {"message": "", "type": "close", "download_url": ""}
elif isinstance(answer, dict):
download_url = ""
outputs = answer.get("outputs", {})
@@ -638,8 +739,8 @@
else:
message = answer.get("error", "")
- # result = {"message": message, "type": "message",
- # "download_url": download_url}
+ result = {"message": message, "type": "system",
+ "download_url": download_url}
try:
SessionService(db).update_session(chat_id,
message={"role": "assistant",
@@ -652,7 +753,7 @@
logger.error("淇濆瓨dify鐨勪細璇濆紓甯革紒")
logger.error(e)
# await websocket.send_json(result)
- continue
+ # continue
elif data.get("event") == "message_end":
result = {"message": "", "type": "close"}
@@ -671,6 +772,162 @@
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:":
+ # 濡傛灉鏄紝鍒欐埅鍙栨帀鍓�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)
+ # print(data)
+ 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", "")
+
+ 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}")
+
# 鍚姩浠诲姟澶勭悊瀹㈡埛绔秷鎭�
tasks = [
--
Gitblit v1.8.0