Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway

zhaoqingang

2024-11-19 13c3fdf08558b6ce01dcbdc7716bd77dc9b2e88c

 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,15 @@
        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)

    elif agent.agent_type == AgentType.BASIC:
        offset = (page - 1) * limit
        records = db.query(SessionModel).filter(SessionModel.agent_id == agent_id).offset(offset).limit(limit).all()
        result = [item.to_dict() for item in records]
        return ResponseList(code=200, msg="", data=result)

    else:
@@ -94,21 +110,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 对象,如果是json取其中的question字段，或者report_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: