修改返回内容

zhangxiao

2024-10-23 db8c55d218c4952aa010cb1a4c5be623a1e4efe1

 app/api/chat.py

@@ -46,19 +46,25 @@
                    message = await websocket.receive_json()
                    print(f"Received from client {chat_id}: {message}")
                    chat_history = message.get('chatHistory', [])
                    message["role"] = "user"
                    if len(chat_history) == 0:
                        chat_history = await ragflow_service.get_session_history(token, chat_id)
                        if len(chat_history) == 0:
                            chat_history = await ragflow_service.set_session(token, agent_id,
                                                                             message["message"], chat_id, True)
                                                                             message, chat_id, True)
                            if len(chat_history) == 0:
                                result = {"message": "内部错误：创建会话失败", "type": "close"}
                                await websocket.send_json(result)
                                await websocket.close()
                                return
                        else:
                            chat_history.append({
                                "content": message["message"],
                                "doc_ids": message.get("doc_ids", []),
                                "role": "user"
                            })
                    async for rag_response in ragflow_service.chat(token, chat_id, chat_history):
                        try:
                            print(f"Received from ragflow: {rag_response}")
                            if rag_response[:5] == "data:":
                                # 如果是，则截取掉前5个字符，并去除首尾空白符
                                text = rag_response[5:].strip()
@@ -72,18 +78,20 @@
                                    result = {"message": "", "type": "close"}
                                elif data is None:  # 发生错误
                                    answer = json_data.get("retmsg", json_data.get("retcode"))
                                    result = {"message": "内部错误：" + answer, "type": "stream"}
                                    result = {"message": "内部错误：" + answer, "type": "message"}
                                else:  # 正常输出
                                    answer = data.get("answer", "")
                                    result = {"message": answer, "type": "stream"}
                                    result = {"message": answer, "type": "message"}
                                await websocket.send_json(result)
                            except json.JSONDecodeError:
                                result = {"message": text, "type": "stream"}
                            await websocket.send_json(result)
                            print(f"Forwarded to client {chat_id}: {result}")
                                print(f"Error decode ragflow response: {text}")
                                pass

                        except Exception as e:
                            result = {"message": f"内部错误： {e}", "type": "close"}
                            await websocket.send_json(result)
                            print(f"Error process message of ragflow: {e}")

            # 启动任务处理客户端消息
            tasks = [
                asyncio.create_task(forward_to_ragflow())
@@ -152,4 +160,3 @@
    else:
        ret = {"message": "Agent not found", "type": "close"}
        await websocket.send_json(ret)