From 0d11657e07dff84cfe118eb446efdb645a3c735f Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 13 十一月 2024 15:17:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/agent.py | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index 028bded..59d1f21 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -52,15 +52,31 @@
return ResponseList(code=200, msg="Unsupported agent type")
-@router.get("/{conversation_id}/session_log")
-async def session_log(conversation_id: str, db: Session = Depends(get_db), current_user: UserModel = Depends(get_current_user)):
- ragflow_service = RagflowService(base_url=settings.fwr_base_url)
- try:
- token = get_ragflow_token(db, current_user.id)
- result = await ragflow_service.get_session_log(token, conversation_id)
- except Exception as e:
- raise HTTPException(status_code=500, detail=str(e))
- return JSONResponse(status_code=200, content={"code": 200, "log": result})
+@router.get("/{agent_id}/{conversation_id}/session_log")
+async def session_log(agent_id: str, conversation_id: str, 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 Response(code=404, msg="Agent not found")
+
+ if agent.agent_type == AgentType.RAGFLOW:
+ ragflow_service = RagflowService(base_url=settings.fwr_base_url)
+ try:
+ token = get_ragflow_token(db, current_user.id)
+ result = await ragflow_service.get_session_log(token, conversation_id)
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=str(e))
+ return JSONResponse(status_code=200, content={"code": 200, "log": result})
+ if 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)
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=str(e))
+ return JSONResponse(status_code=200, content={"code": 200, "log": result})
+
+ else:
+ return JSONResponse(status_code=200, content={"code": 200, "log": "Unsupported agent type"})
@router.get("/get-chat-id/{agent_id}", response_model=Response)
--
Gitblit v1.8.0