From 165d75b97916335ec7b5046f7c476e494a12df51 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 十一月 2024 11:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/agent.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index af36024..e2982c7 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).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,8 @@
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
elif agent.agent_type == AgentType.BASIC:
- session = db.query(SessionModel).filter(SessionModel.agent_id == agent_id, SessionModel.tenant_id==current_user.id).first()
- return JSONResponse(status_code=200, content={"code": 200, "data": session.log_to_json()})
+ 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 {}})
else:
return JSONResponse(status_code=200, content={"code": 200, "log": "Unsupported agent type"})
--
Gitblit v1.8.0