历史会话问题

zhaoqingang

2024-11-22 aa7ebd168dd512dcc99b4c91335819d73afd55b6

 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"})