From 1b417d75a8e24e5ec9fd29e9b75ee53049f3b79e Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 19 十一月 2024 17:13:14 +0800
Subject: [PATCH] 跨域问题
---
app/api/agent.py | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index 3d181c0..3178144 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -12,6 +12,7 @@
from app.models.base_model import get_db
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
@@ -26,7 +27,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 +42,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,7 +52,7 @@
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)
--
Gitblit v1.8.0