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

zhaoqingang

2024-11-19 35f8639455992d24f5d0b962bd6fa79d7fcb8f31

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

 app/api/agent.py

@@ -26,7 +26,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")
@@ -44,7 +49,7 @@
        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)

 app/service/bisheng.py

@@ -1,3 +1,4 @@
import json
from datetime import datetime
import httpx

@@ -56,8 +57,8 @@
            data = self._check_response(response)
            return data.get('public_key')

    async def get_chat_sessions(self, token: str) -> list:
        url = f"{self.base_url}/api/v1/chat/list?page=1&limit=40"
    async def get_chat_sessions(self, token: str, page: int = 1, limit: int=100) -> list:
        url = f"{self.base_url}/api/v1/chat/list?page={page}&limit={limit}"
        headers = {'cookie': f"access_token_cookie={token};"}
        async with httpx.AsyncClient() as client:
            response = await client.get(url, headers=headers)
@@ -70,7 +71,34 @@
                    "updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000)
                }
                for item in data
                if "latest_message" in item and "message" in item["latest_message"] and item["latest_message"]["message"]
            ]

            def process_name(item):
                message = item.get("latest_message", {}).get("message", "")
                name = message
                try:
                    message_json = json.loads(message)
                    if 'question' in message_json:
                        name = message_json['question']
                    elif 'query' in message_json:
                        name = message_json['query']
                    elif 'report_name' in message_json:
                        name = message_json['report_name']
                except json.JSONDecodeError:
                    pass
                return name

            result = [
                {
                    "id": item["chat_id"],
                    "name": process_name(item),
                    "updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000)
                }
                for item in data
                if "latest_message" in item and "message" in item["latest_message"] and item["latest_message"]["message"]
            ]

            return result

    async def get_session_log(self, token: str, agent_id: str, conversation_id: str):
@@ -85,13 +113,13 @@
            response.raise_for_status()
            data = self._check_response(response)
            session_log = [
                    {
                        "message": message.get("message"),
                        "role": message.get("category"),
                        "ts": message.get("create_time")
                    }
                    for message in data
                ]
                {
                    "message": message.get("message"),
                    "role": message.get("category"),
                    "ts": message.get("create_time")
                }
                for message in data
            ]

            # 把session_log 按ts 升序排序
            session_log.sort(key=lambda x: x['ts'])

 app/service/ragflow.py

@@ -100,6 +100,7 @@
                    "updated_time": item["update_time"]
                }
                for item in data
                if "id" in item and "name" in item and item["name"]
            ]
            return result