From 0897e36de45df26ab185568a0e747f223afb9910 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 28 十一月 2024 13:44:46 +0800
Subject: [PATCH] bisheng的历史会话添加智能体过滤
---
app/api/agent.py | 124 ++++++++++++++++++++++++++++++++++-------
1 files changed, 103 insertions(+), 21 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index a3c9a22..2f27f23 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
@@ -9,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()
@@ -25,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")
@@ -35,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)
@@ -43,9 +53,21 @@
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, agent_id, 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).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)
+
+ elif agent.agent_type == AgentType.DIFY:
+ offset = (page - 1) * limit
+ 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)
else:
@@ -82,35 +104,95 @@
'reference': reference
})
last_question = None
- reference_index += 1 # 鍙湁鍦ㄦ坊鍔犱簡assistant鐨勫洖绛斿悗锛岀储寮曟墠澧炲姞
- return JSONResponse(status_code=200, content={"code": 200, "log": combined_logs})
+ reference_index += 1
+ return JSONResponse(status_code=200, content={"code": 200, "data": combined_logs})
else:
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)
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))
+ elif agent.agent_type == AgentType.BASIC:
+ data = []
+ session = db.query(SessionModel).filter(SessionModel.id == conversation_id).first()
+ if session:
+ tmp_data = {}
+ for i in session.log_to_json().get("message", []):
+ if i.get("role") == "user":
+ tmp_data["question"]=i.get("content")
+ elif i.get("role") == "assistant":
+ if isinstance(i.get("content"), dict):
+ tmp_data["answer"] = i.get("content", {}).get("message")
+ if "file_name" in i.get("content", {}):
+ tmp_data["files"] = [{"file_name":i.get("content", {}).get("file_name"), "file_url":i.get("content", {}).get("file_url")}]
+ else:
+ tmp_data["answer"] = i.get("content")
+ data.append(tmp_data)
+ tmp_data = {}
+
+ if tmp_data:
+ data.append(tmp_data)
+
+ return JSONResponse(status_code=200, content={"code": 200, "data": data})
+ elif agent.agent_type == AgentType.DIFY:
+ data = []
+ session = db.query(SessionModel).filter(SessionModel.id == conversation_id).first()
+ if session:
+ tmp_data = {}
+ for i in session.log_to_json().get("message", []):
+ if i.get("role") == "user":
+ tmp_data["question"] = i.get("content")
+ elif i.get("role") == "assistant":
+ if isinstance(i.get("content"), dict):
+ tmp_data["answer"] = i.get("content", {}).get("answer")
+ if "file_name" in i.get("content", {}):
+ tmp_data["files"] = [{"file_name": i.get("content", {}).get("file_name"),
+ "file_url": i.get("content", {}).get("file_url")}]
+ if "images" in i.get("content", {}):
+ tmp_data["images"] = i.get("content", {}).get("images")
+ else:
+ tmp_data["answer"] = i.get("content")
+ data.append(tmp_data)
+ tmp_data = {}
+
+ if tmp_data:
+ data.append(tmp_data)
+
+ return JSONResponse(status_code=200, content={"code": 200, "data": data})
+
else:
return JSONResponse(status_code=200, content={"code": 200, "log": "Unsupported agent type"})
--
Gitblit v1.8.0