From 3edf08c7e482f32bc1db0cc9786b64e17b097000 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 十一月 2024 17:06:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/agent.py | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index fe6e6c0..5842350 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -60,7 +60,7 @@
elif agent.agent_type == AgentType.BASIC:
offset = (page - 1) * limit
- records = db.query(SessionModel).filter(SessionModel.agent_id == agent_id, SessionModel.tenant_id==current_user.id).offset(offset).limit(limit).all()
+ records = db.query(SessionModel).filter(SessionModel.agent_id == agent_id, SessionModel.tenant_id==current_user.id).order_by(SessionModel.create_date.desc()).offset(offset).limit(limit).all()
result = [item.to_dict() for item in records]
return ResponseList(code=200, msg="", data=result)
@@ -140,8 +140,27 @@
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
elif agent.agent_type == AgentType.BASIC:
+ data = []
session = db.query(SessionModel).filter(SessionModel.id == conversation_id).first()
- return JSONResponse(status_code=200, content={"code": 200, "data": session.log_to_json() if session else {}})
+ if session:
+ tmp_data = {}
+ for i in session.log_to_json().get("message", []):
+ if i.get("role") == "user":
+ tmp_data["question"]=i.get("content")
+ elif i.get("role") == "assistant":
+ if isinstance(i.get("content"), dict):
+ tmp_data["answer"] = i.get("content", {}).get("message")
+ if "file_name" in i.get("content", {}):
+ tmp_data["files"] = [{"file_name":i.get("content", {}).get("file_name"), "file_url":i.get("content", {}).get("file_url")}]
+ else:
+ tmp_data["answer"] = i.get("content")
+ data.append(tmp_data)
+ tmp_data = {}
+
+ if tmp_data:
+ data.append(tmp_data)
+
+ return JSONResponse(status_code=200, content={"code": 200, "data": data})
else:
return JSONResponse(status_code=200, content={"code": 200, "log": "Unsupported agent type"})
--
Gitblit v1.8.0