From 726a6682af6c898aa72f02085c281cefcfb51771 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 07 一月 2025 15:44:34 +0800
Subject: [PATCH] 文档出卷
---
app/api/chat.py | 11 ++++++-----
app/api/files.py | 32 ++++++++++++++++++++------------
2 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 15758a5..e782c1e 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -783,15 +783,15 @@
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:
+ 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_choices" in receive_message:
+ if "multiple_choice" in receive_message:
inputs["Multiple_Choice"] = receive_message["multiple_choice"]
- if "easy_questions" in receive_message:
+ 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"]
@@ -823,6 +823,7 @@
})
if files:
inputs["upload_files"] = files
+ # print(inputs)
if not question and not inputs:
await websocket.send_json({"message": "Invalid request", "type": "error"})
continue
@@ -844,7 +845,7 @@
complete_response += rag_response
try:
data = json.loads(complete_response)
- print(data)
+ # 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"]: # 淇℃伅杩囨护
@@ -878,7 +879,7 @@
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", "")
diff --git a/app/api/files.py b/app/api/files.py
index a84a0b3..380ea9c 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -10,7 +10,9 @@
from app.api import Response, get_current_user, ResponseList
from app.config.config import settings
-from app.config.const import DOCUMENT_TO_REPORT, IMAGE_TO_TEXT
+from app.config.const import DOCUMENT_TO_REPORT, IMAGE_TO_TEXT, DOCUMENT_TO_REPORT_TITLE, DOCUMENT_IA_QUESTIONS, \
+ DOCUMENT_TO_PAPER
+from app.models import MenuCapacityModel
from app.models.agent_model import AgentType, AgentModel
from app.models.base_model import get_db
from app.models.user_model import UserModel
@@ -33,16 +35,17 @@
db: Session = Depends(get_db),
current_user: UserModel = Depends(get_current_user)
):
- agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ agent = db.query(MenuCapacityModel).filter(MenuCapacityModel.chat_id == agent_id).first()
if not agent:
- return Response(code=404, msg="Agent not found")
+ return ResponseList(code=404, msg="Agent not found")
+ agent_type = int(agent.capacity_type)
# 妫�鏌� agent 绫诲瀷锛岀‘瀹氭槸鍚﹀厑璁镐笂浼犲涓枃浠�
- if agent.agent_type in [AgentType.RAGFLOW, AgentType.BISHENG]:
+ if agent_type in [AgentType.RAGFLOW, AgentType.BISHENG]:
if len(file) > 1:
return Response(code=400, msg="杩欎釜鏅鸿兘浣撳彧鏀寔浼犲崟涓枃浠�")
- if agent.agent_type == AgentType.RAGFLOW or agent.agent_type == AgentType.BISHENG:
+ if agent_type == AgentType.RAGFLOW or agent_type == AgentType.BISHENG:
file = file[0]
# 璇诲彇涓婁紶鐨勬枃浠跺唴瀹�
try:
@@ -50,7 +53,7 @@
except Exception as e:
return Response(code=400, msg=str(e))
- if agent.agent_type == AgentType.RAGFLOW:
+ if agent_type == AgentType.RAGFLOW:
token = await get_ragflow_token(db, current_user.id)
ragflow_service = RagflowService(base_url=settings.fwr_base_url)
# 鏌ヨ浼氳瘽鏄惁瀛樺湪锛屼笉瀛樺湪鍏堝垱寤轰細璇�
@@ -63,7 +66,7 @@
# 瀵逛簬澶氭枃浠讹紝鍙兘闇�瑕佹敹闆嗘墍鏈塪oc_ids
return Response(code=200, msg="", data={"doc_ids": doc_ids, "file_name": file.filename})
- elif agent.agent_type == AgentType.BISHENG:
+ elif agent_type == AgentType.BISHENG:
bisheng_service = BishengService(base_url=settings.sgb_base_url)
try:
token = await get_bisheng_token(db, current_user.id)
@@ -73,7 +76,7 @@
result["file_name"] = file.filename
return Response(code=200, msg="", data=result)
- elif agent.agent_type == AgentType.BASIC:
+ elif agent_type == AgentType.BASIC:
if agent_id == "basic_excel_talk":
# 澶勭悊鍗曚釜鏂囦欢鐨勬儏鍐�
file_list = file
@@ -97,9 +100,9 @@
# service = BasicService(base_url=settings.basic_paper_url)
# result = await service.paper_file_upload(chat_id, file.filename, file_content)
- elif agent.agent_type == AgentType.DIFY:
+ elif agent_type == AgentType.DIFY:
dify_service = DifyService(base_url=settings.dify_base_url)
- if agent.type == "imageTalk":
+ if agent.chat_type == "imageTalk":
token = DfTokenDao(db).get_token_by_id(IMAGE_TO_TEXT)
if not token:
raise HTTPException(status_code=500, detail="鑾峰彇token澶辫触锛宨mage_and_text_conversion锛�")
@@ -113,8 +116,13 @@
data = await dify_service.upload(token, file.filename, file_content, current_user.id)
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
- elif agent.type == "reportWorkflow" or agent.type == "documentIa":
- token = DfTokenDao(db).get_token_by_id(DOCUMENT_TO_REPORT)
+ elif agent.chat_type == "reportWorkflow" or agent.chat_type == "documentIa" or agent.chat_type == "paperTalk":
+ token_dict = {
+ "reportWorkflow": DOCUMENT_TO_REPORT,
+ "documentIa": DOCUMENT_IA_QUESTIONS,
+ "paperTalk": DOCUMENT_TO_PAPER,
+ }
+ token = DfTokenDao(db).get_token_by_id(token_dict[agent.chat_type])
if not token:
raise HTTPException(status_code=500, detail="鑾峰彇token澶辫触锛宒ocument_to_report锛�")
result = []
--
Gitblit v1.8.0