From e79d383437d2b7316ee1def8049a13f3eb7c8dfa Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 14 一月 2025 13:38:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/chat.py | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 15758a5..84fd2f9 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"]
@@ -799,7 +799,10 @@
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,
@@ -823,6 +826,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 +848,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 +882,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", "")
--
Gitblit v1.8.0