From f6a0aa15269cae87737d1564ad7a33063f1d94de Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 18 二月 2025 13:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway into develop_2.1
---
app/api/chat.py | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 2d2845d..6e54cb9 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -323,7 +323,7 @@
# token = get_dify_token(db, current_user.id)
try:
async def forward_to_dify():
- if chat_type == "imageTalk":
+ if agent.type == "imageTalk":
token = DfTokenDao(db).get_token_by_id(IMAGE_TO_TEXT)
if not token:
await websocket.send_json({"message": "Invalid token", "type": "error"})
@@ -429,12 +429,13 @@
result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
await websocket.send_json(result)
print(f"Error process message of ragflow: {e2}")
- elif chat_type == "reportWorkflow":
+ elif agent.type == "reportWorkflow":
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', "")
sub_titles = receive_message.get('sub_titles', "")
workflow_type = receive_message.get('workflow', 1)
@@ -458,7 +459,7 @@
AgentType.DIFY,
current_user.id,
{"role": "user", "content": title if title else title_query, "type": workflow_type,
- "is_clean": is_clean},
+ "is_clean": is_clean, "upload_filenames":upload_filenames},
workflow_type
)
conversation_id = session.conversation_id
@@ -823,6 +824,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"})
@@ -834,7 +836,7 @@
agent_id,
AgentType.DIFY,
current_user.id,
- {"role": "user", "content": question}
+ {"role": "user", "content": question, "upload_filenames": upload_filenames}
)
conversation_id = session.conversation_id
except Exception as e:
--
Gitblit v1.8.0