From 9c632dc526dec3c9366ed749e11bf2fc17101ced Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期二, 19 十一月 2024 17:05:12 +0800 Subject: [PATCH] 增加对话表保存basic的agent会话,会话列表支持basic会话查询 --- app/api/agent.py | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/app/api/agent.py b/app/api/agent.py index 8e7f1c3..4e410d4 100644 --- a/app/api/agent.py +++ b/app/api/agent.py @@ -10,8 +10,10 @@ from app.config.config import settings from app.models.agent_model import AgentType, AgentModel from app.models.base_model import get_db +from app.models.session_model import SessionModel from app.models.user_model import UserModel from app.service.bisheng import BishengService +from app.service.dialog import get_session_history from app.service.ragflow import RagflowService from app.service.service_token import get_ragflow_token, get_bisheng_token @@ -41,6 +43,8 @@ try: token = get_ragflow_token(db, current_user.id) result = await ragflow_service.get_chat_sessions(token, agent_id) + if not result: + result = await get_session_history(db, current_user.id, agent_id) except Exception as e: raise HTTPException(status_code=500, detail=str(e)) return ResponseList(code=200, msg="", data=result) @@ -54,6 +58,12 @@ raise HTTPException(status_code=500, detail=str(e)) return ResponseList(code=200, msg="", data=result) + 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() + result = [item.to_dict() for item in records] + return ResponseList(code=200, msg="", data=result) + else: return ResponseList(code=200, msg="Unsupported agent type") -- Gitblit v1.8.0