ragflow发送消息前查找消息历史并放到消息里

app/api/agent.py

@@ -52,7 +52,7 @@ async def chat_list(agent_id: str, db: Session = Depends(get_db), current_user:
 
 
 @router.get("/get-chat-id/{agent_id}", response_model=Response)
-async def agent_list(agent_id: str, db: Session = Depends(get_db)):
+async def get_chat_id(agent_id: str, db: Session = Depends(get_db)):
     agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
     if not agent:
         return Response(code=404, msg="Agent not found")

app/api/chat.py

@@ -47,11 +47,14 @@ async def handle_client(websocket: WebSocket,
                     print(f"Received from client {chat_id}: {message}")
                     chat_history = message.get('chatHistory', [])
                     if len(chat_history) == 0:
-
-                        chat_history = await ragflow_service.set_session(token, agent_id, message["message"], chat_id, True)
+                        chat_history = await ragflow_service.get_session_history(token, agent_id)
                         if len(chat_history) == 0:
-                            result = {"message": "内部错误：创建会话失败", "type": "close"}
-                            await websocket.send_json(result)
+                            chat_history = await ragflow_service.set_session(token, agent_id,
+                                                                             message["message"], chat_id, True)
+                            if len(chat_history) == 0:
+                                result = {"message": "内部错误：创建会话失败", "type": "close"}
+                                await websocket.send_json(result)
+                                return
                     async for rag_response in ragflow_service.chat(token, chat_id, chat_history):
                         try:
                             print(f"Received from ragflow: {rag_response}")

app/service/bisheng.py

@@ -16,7 +16,13 @@ class BishengService:
         status_code = response_data.get("status_code", 0)
         if status_code != 200:
             raise Exception(f"Failed to fetch data from Bisheng API: {response.text}")
-        return response_data.get("data", {})
+        # 检查返回的数据类型
+        if isinstance(response_data.get("data"), dict):
+            return response_data.get("data", {})
+        elif isinstance(response_data.get("data"), list):
+            return response_data.get("data", [])
+        else:
+            return {}
 
     async def register(self, username: str, password: str):
         public_key = await self.get_public_key_api()

app/service/ragflow.py

@@ -1,5 +1,5 @@
 import httpx
-
+from typing import Union, Dict, List
 from app.config.config import settings
 from app.utils.rsa_crypto import RagflowCrypto
 
@@ -8,13 +8,30 @@ class RagflowService:
     def __init__(self, base_url: str):
         self.base_url = base_url
 
+    async def _handle_response(self, response: httpx.Response) -> Union[Dict, List]:
+        if response.status_code != 200:
+            return {}
+
+        data = response.json()
+        ret_code = data.get("retcode")
+        if ret_code != 0:
+            return {}
+
+        # 检查返回的数据类型
+        if isinstance(data.get("data"), dict):
+            return data.get("data", {})
+        elif isinstance(data.get("data"), list):
+            return data.get("data", [])
+        else:
+            return {}
+
     async def register(self, username: str, password: str):
         password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
         async with httpx.AsyncClient() as client:
             response = await client.post(
                 f"{self.base_url}/v1/user/register",
-                json={"nickname": username, "email": f"{username}@example.com", "password": password},
-                headers={'Content-Type': 'application/json'}
+                headers={'Content-Type': 'application/json'},
+                json={"nickname": username, "email": f"{username}@example.com", "password": password}
             )
             if response.status_code != 200:
                 raise Exception(f"Ragflow registration failed: {response.text}")
@@ -24,12 +41,11 @@ class RagflowService:
         async with httpx.AsyncClient() as client:
             response = await client.post(
                 f"{self.base_url}/v1/user/login",
-                json={"email": f"{username}@example.com", "password": password},
-                headers={'Content-Type': 'application/json'}
+                headers={'Content-Type': 'application/json'},
+                json={"email": f"{username}@example.com", "password": password}
             )
             if response.status_code != 200:
                 raise Exception(f"Ragflow login failed: {response.text}")
-                # 从响应头中提取 Authorization 字段
             authorization = response.headers.get('Authorization')
             if not authorization:
                 raise Exception("Authorization header not found in response")
@@ -46,11 +62,8 @@ class RagflowService:
                 'Content-Type': 'application/json',
                 'Authorization': token
             }
-            # 创建流式请求
             async with client.stream("POST", target_url, json=data, headers=headers) as response:
-                # 检查响应状态码
                 if response.status_code == 200:
-                    # 流式读取响应
                     try:
                         async for answer in response.aiter_text():
                             yield answer
@@ -62,15 +75,10 @@ class RagflowService:
 
     async def get_chat_sessions(self, token: str, dialog_id: str) -> list:
         url = f"{self.base_url}/v1/conversation/list?dialog_id={dialog_id}"
-        headers = {
-            "Authorization": token
-        }
+        headers = {"Authorization": token}
         async with httpx.AsyncClient() as client:
             response = await client.get(url, headers=headers)
-            if response.status_code != 200:
-                raise Exception(f"Failed to fetch data from Ragflow API: {response.text}")
-
-            data = response.json().get("data", [])
+            data = await self._handle_response(response)
             result = [
                 {
                     "id": item["id"],
@@ -83,25 +91,16 @@ class RagflowService:
 
     async def set_session(self, token: str, dialog_id: str, name: str, chat_id: str, is_new: bool) -> list:
         url = f"{self.base_url}/v1/conversation/set?dialog_id={dialog_id}"
-        headers = {
-            "Authorization": token
-        }
-
+        headers = {"Authorization": token}
         data = {
-                "dialog_id": dialog_id,
-                "name": name,
-                "is_new": is_new,
-                "conversation_id": chat_id,
-            }
-
+            "dialog_id": dialog_id,
+            "name": name,
+            "is_new": is_new,
+            "conversation_id": chat_id,
+        }
         async with httpx.AsyncClient() as client:
             response = await client.post(url, headers=headers, json=data)
-            if response.status_code != 200:
-                return []
-            ret_code = response.json().get("retcode")
-            if ret_code != 0:
-                return []
-
+            data = await self._handle_response(response)
             return [
                 {
                     "content": "你好！ 我是你的助理，有什么可以帮到你的吗？",
@@ -112,4 +111,12 @@ class RagflowService:
                     "doc_ids": [],
                     "role": "user"
                 }
-            ]
+            ] if data else []
+
+    async def get_session_history(self, token: str, chat_id: str) -> list:
+        url = f"{self.base_url}/v1/conversation/get?conversation_id={chat_id}"
+        headers = {"Authorization": token}
+        async with httpx.AsyncClient() as client:
+            response = await client.get(url, headers=headers)
+            data = await self._handle_response(response)
+            return data.get("message", [])