From 3edf08c7e482f32bc1db0cc9786b64e17b097000 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 22 十一月 2024 17:06:09 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway --- app/api/agent.py | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/app/api/agent.py b/app/api/agent.py index 3178144..5842350 100644 --- a/app/api/agent.py +++ b/app/api/agent.py @@ -10,6 +10,7 @@ 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 @@ -57,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, 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: return ResponseList(code=200, msg="Unsupported agent type") @@ -98,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) @@ -132,6 +139,28 @@ 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}) else: return JSONResponse(status_code=200, content={"code": 200, "log": "Unsupported agent type"}) -- Gitblit v1.8.0