From ce9fb375be9a551b4cdc5cb78a759fbcea1eac22 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 21 十一月 2024 20:13:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/agent.py | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index 67fe927..fe6e6c0 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -10,10 +10,12 @@
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.token import get_ragflow_token, get_bisheng_token
+from app.service.service_token import get_ragflow_token, get_bisheng_token
router = APIRouter()
@@ -26,7 +28,12 @@
@router.get("/{agent_id}/sessions", response_model=ResponseList)
-async def chat_list(agent_id: str, db: Session = Depends(get_db), current_user: UserModel = Depends(get_current_user)):
+async def chat_list(
+ agent_id: str,
+ page: int = Query(1, ge=1),
+ limit: int = Query(1000, ge=1, le=1000),
+ db: Session = Depends(get_db),
+ current_user: UserModel = Depends(get_current_user)):
agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
if not agent:
return ResponseList(code=404, msg="Agent not found")
@@ -36,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)
@@ -44,9 +53,15 @@
bisheng_service = BishengService(base_url=settings.sgb_base_url)
try:
token = get_bisheng_token(db, current_user.id)
- result = await bisheng_service.get_chat_sessions(token)
+ result = await bisheng_service.get_chat_sessions(token, page, limit)
except Exception as e:
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, SessionModel.tenant_id==current_user.id).offset(offset).limit(limit).all()
+ result = [item.to_dict() for item in records]
return ResponseList(code=200, msg="", data=result)
else:
@@ -90,7 +105,7 @@
return JSONResponse(status_code=200, content={"code": 400, "message": "Invalid result structure"})
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
- if agent.agent_type == AgentType.BISHENG:
+ elif agent.agent_type == AgentType.BISHENG:
bisheng_service = BishengService(base_url=settings.sgb_base_url)
try:
token = get_bisheng_token(db, current_user.id)
@@ -124,6 +139,9 @@
return JSONResponse(status_code=200, content={"code": 200, "data": combined_logs})
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
+ elif agent.agent_type == AgentType.BASIC:
+ 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