From 5ef590b70cc8e2de16083af2ee2d977daae5587c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 19 十一月 2024 16:34:29 +0800
Subject: [PATCH] 会话缓存本地数据库
---
app/api/agent.py | 57 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index 92da117..3178144 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -1,3 +1,4 @@
+import json
import uuid
from fastapi import Depends, APIRouter, Query, HTTPException
@@ -11,8 +12,9 @@
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.token import get_ragflow_token, get_bisheng_token
+from app.service.service_token import get_ragflow_token, get_bisheng_token
router = APIRouter()
@@ -25,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")
@@ -35,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)
@@ -43,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)
@@ -94,21 +103,33 @@
try:
token = get_bisheng_token(db, current_user.id)
result = await bisheng_service.get_session_log(token, agent_id, conversation_id)
- if 'session_log' in result:
- combined_logs = []
- last_question = None
- for session in result['session_log']:
- if session['role'] == 'question':
- last_question = session['message']
- elif session['role'] == 'answer' and last_question:
- combined_logs.append({
- 'question': last_question,
- 'answer': session['message']
- })
- last_question = None
- return JSONResponse(status_code=200, content={"code": 200, "log": combined_logs})
- else:
- return JSONResponse(status_code=200, content={"code": 400, "message": "Invalid result structure"})
+ combined_logs = []
+ last_question = None
+
+ for session in result:
+ message = session['message']
+
+ # 鍒ゆ柇message鏄瓧绗︿覆杩樻槸json 瀵硅薄,濡傛灉鏄痡son鍙栧叾涓殑question瀛楁锛屾垨鑰卹eport_name瀛楁璧嬪�肩粰message
+ try:
+ message_json = json.loads(message)
+ if 'question' in message_json:
+ message = message_json['question']
+ elif 'query' in message_json:
+ message = message_json['query']
+ elif 'report_name' in message_json:
+ message = message_json['report_name']
+ except json.JSONDecodeError:
+ pass
+
+ if session['role'] == 'question':
+ last_question = message
+ elif session['role'] == 'answer' and last_question:
+ combined_logs.append({
+ 'question': last_question,
+ 'answer': message
+ })
+ last_question = None
+ return JSONResponse(status_code=200, content={"code": 200, "data": combined_logs})
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
else:
--
Gitblit v1.8.0