From f9a307e86b771f20bd2dc043a875b2ee86cc5d50 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 12 十一月 2024 18:42:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/agent.py | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index cded0f8..028bded 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -1,4 +1,7 @@
+import uuid
+
from fastapi import Depends, APIRouter, Query, HTTPException
+from fastapi.responses import JSONResponse
from pydantic import BaseModel
from sqlalchemy.orm import Session
@@ -14,27 +17,10 @@
router = APIRouter()
-# Pydantic 妯″瀷鐢ㄤ簬鍝嶅簲
-class AgentResponse(BaseModel):
- id: str
- name: str
- agent_type: AgentType
-
- class Config:
- orm_mode = True
-
-
@router.get("/list", response_model=ResponseList)
async def agent_list(db: Session = Depends(get_db)):
- agents = db.query(AgentModel).all()
- result = [
- {
- "id": item.id,
- "name": item.name,
- "agent_type": item.agent_type
- }
- for item in agents
- ]
+ agents = db.query(AgentModel).order_by(AgentModel.sort.asc()).all()
+ result = [item.to_dict() for item in agents]
return ResponseList(code=200, msg="", data=result)
@@ -45,7 +31,7 @@
return ResponseList(code=404, msg="Agent not found")
if agent.agent_type == AgentType.RAGFLOW:
- ragflow_service = RagflowService(base_url=settings.ragflow_base_url)
+ ragflow_service = RagflowService(base_url=settings.fwr_base_url)
try:
token = get_ragflow_token(db, current_user.id)
result = await ragflow_service.get_chat_sessions(token, agent_id)
@@ -54,7 +40,7 @@
return ResponseList(code=200, msg="", data=result)
elif agent.agent_type == AgentType.BISHENG:
- bisheng_service = BishengService(base_url=settings.bisheng_base_url)
+ 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)
@@ -65,3 +51,22 @@
else:
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("/get-chat-id/{agent_id}", response_model=Response)
+async def get_chat_id(agent_id: str, db: Session = Depends(get_db)):
+ agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ if not agent:
+ return Response(code=404, msg="Agent not found")
+
+ return Response(code=200, msg="", data={"chat_id": uuid.uuid4().hex})
--
Gitblit v1.8.0