rag-gateway.git

			@@ -1,6 +1,5 @@
			import json
			import re
			import uuid
			from copy import deepcopy

			from fastapi import WebSocket, WebSocketDisconnect, APIRouter, Depends
			@@ -12,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_PAPER
			DOCUMENT_TO_REPORT_TITLE, DOCUMENT_TO_TITLE, DOCUMENT_TO_PAPER, DOCUMENT_IA_QUESTIONS_DS
			from app.models import MenuCapacityModel
			from app.models.agent_model import AgentModel, AgentType
			from app.models.base_model import get_db
			@@ -231,7 +230,8 @@
			question,
			agent_id,
			AgentType.BASIC,
			current_user.id
			current_user.id,
			{"role": "user", "content": question}
			)
			except Exception as e:
			logger.error(e)
			@@ -345,7 +345,8 @@
			question,
			agent_id,
			AgentType.DIFY,
			current_user.id
			current_user.id,
			{"role": "user", "content": question}
			)
			conversation_id = session.conversation_id
			except Exception as e:
			@@ -434,6 +435,7 @@
			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)
			@@ -457,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
			@@ -806,8 +808,12 @@
			result = {"message": f"内部错误： {e2}", "type": "close"}
			await websocket.send_json(result)
			print(f"Error process message of ragflow: {e2}")
			elif agent.type == "documentIa":
			token = DfTokenDao(db).get_token_by_id(DOCUMENT_IA_QUESTIONS)
			elif chat_type == "documentIa" or chat_type == "documentIaDs":
			token_dict = {
			"documentIa": DOCUMENT_IA_QUESTIONS,
			"documentIaDs": DOCUMENT_IA_QUESTIONS_DS,
			}
			token = DfTokenDao(db).get_token_by_id(token_dict[chat_type])
			# print(token)
			if not token:
			await websocket.send_json({"message": "Invalid token", "type": "error"})
			@@ -818,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"})
			@@ -828,7 +835,8 @@
			question,
			agent_id,
			AgentType.DIFY,
			current_user.id
			current_user.id,
			{"role": "user", "content": question, "upload_filenames": upload_filenames}
			)
			conversation_id = session.conversation_id
			except Exception as e:
			@@ -872,11 +880,13 @@
			logger.error(data)
			continue
			elif isinstance(answer, dict):
			if answer.get("status") == "failed":
			message = answer.get("error", "")
			else:
			message = answer.get("title", "")

			message = answer.get("title", "")

			result = {"message": message, "type": "system"}
			continue
			result = {"message": message, "type": "system"}
			# continue
			elif data.get("event") == "message": # "event": "message_end"
			# 正常输出
			answer = data.get("answer", "")
			@@ -929,7 +939,6 @@
			result = {"message": f"内部错误： {e2}", "type": "close"}
			await websocket.send_json(result)
			print(f"Error process message of ragflow: {e2}")


			# 启动任务处理客户端消息
			tasks = [