From b134897836ca6f26cba71ef22f2474447cf39d15 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 07 一月 2025 14:12:50 +0800
Subject: [PATCH] dify 出题工作流
---
app/config/env_conf/api_key_conf.json | 3
app/api/chat.py | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++
app/config/const.py | 4 +
app/task/fetch_agent.py | 2
main.py | 3
app/service/difyService.py | 1
app/config/env_conf/menu_conf.json | 6 +-
7 files changed, 164 insertions(+), 9 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 6909e98..15758a5 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -11,7 +11,7 @@
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_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
@@ -56,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)
@@ -766,6 +767,155 @@
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_choices" 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_choices" in receive_message:
+ inputs["Multiple_Choice"] = receive_message["multiple_choice"]
+ if "easy_questions" 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', "")
+
+ 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
+ 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") == "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": "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)
+ 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 = [
diff --git a/app/config/const.py b/app/config/const.py
index c5f4d79..fcc1e5f 100644
--- a/app/config/const.py
+++ b/app/config/const.py
@@ -6,6 +6,10 @@
DOCUMENT_IA_QUESTIONS = "document_ia_questions"
DOCUMENT_TO_REPORT_TITLE = "document_to_report_title"
DOCUMENT_TO_TITLE = "document_to_title"
+DOCUMENT_TO_PAPER = "document_to_paper"
+
+
+### --------- file path------------------
ENV_CONF_PATH = "app/config/env_conf"
APP_SERVICE_PATH = "app/service/"
diff --git a/app/config/env_conf/api_key_conf.json b/app/config/env_conf/api_key_conf.json
index 8a5b98e..cf7de8c 100644
--- a/app/config/env_conf/api_key_conf.json
+++ b/app/config/env_conf/api_key_conf.json
@@ -1,5 +1,6 @@
{
"image_and_text_conversion": "",
"document_to_report": "",
- "document_to_cleaning": ""
+ "document_to_cleaning": "",
+ "document_to_paper": ""
}
\ No newline at end of file
diff --git a/app/config/env_conf/menu_conf.json b/app/config/env_conf/menu_conf.json
index e044dde..7e77746 100644
--- a/app/config/env_conf/menu_conf.json
+++ b/app/config/env_conf/menu_conf.json
@@ -129,10 +129,10 @@
"rank": 93,
"dialog": [
{
- "id": "basic_paper_talk",
- "chat_id": "basic_paper_talk",
+ "id": "2f6ddf93-7ba6-4b2d-b991-d96421404600",
+ "chat_id": "2f6ddf93-7ba6-4b2d-b991-d96421404600",
"chat_type": "paperTalk",
- "agentType": 3
+ "agentType": 4
}
]
},
diff --git a/app/service/difyService.py b/app/service/difyService.py
index 075cfaa..3c67d09 100644
--- a/app/service/difyService.py
+++ b/app/service/difyService.py
@@ -128,7 +128,6 @@
async def chat(self, token: str, user_id: int, message: str, files: [], conversation_id: str, inputs: dict):
-
target_url = f"{self.base_url}/v1/chat-messages"
data = {
"inputs": inputs,
diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py
index 8cb7e5a..ae2e4b5 100644
--- a/app/task/fetch_agent.py
+++ b/app/task/fetch_agent.py
@@ -163,7 +163,7 @@
('basic_excel_talk', 6, '鏅鸿兘鏁版嵁', 'BASIC', 'excelTalk'),
('basic_question_talk', 7, '鍑洪缁勫嵎', 'BASIC', 'questionTalk'),
('9d75142a-66eb-4e23-b7d4-03efe4584915', 8, '灏忔暟缁樺浘', 'DIFY', 'imageTalk'),
- ('basic_paper_talk', 9, '鏂囨。鍑哄嵎', 'BASIC', 'paperTalk'),
+ ('2f6ddf93-7ba6-4b2d-b991-d96421404600', 9, '鏂囨。鍑哄嵎', 'DIFY', 'paperTalk'),
('basic_report_clean', 10, '鏂囨。鎶ュ憡', 'DIFY', 'reportWorkflow')
]
diff --git a/main.py b/main.py
index 6b28b99..03b997a 100644
--- a/main.py
+++ b/main.py
@@ -39,8 +39,9 @@
# initialize_agents()
# # 鍦ㄥ簲鐢ㄥ惎鍔ㄦ椂鍚屾浠ｇ悊
# sync_agents()
- await sync_default_data()
+
+ await sync_default_data()
sync_agents_v2()
sync_knowledge()
sync_resources_from_json()
--
Gitblit v1.8.0