毕昇对话历史只返回了一条修正，按时间正序排列吧，json乱码修正

zhangqian

2024-11-15 c0d11dac469251c71b036c757c788615285c9683

毕昇对话历史只返回了一条修正，按时间正序排列吧，json乱码修正

 app/api/agent.py

@@ -1,3 +1,4 @@
import json
import uuid

from fastapi import Depends, APIRouter, Query, HTTPException
@@ -94,21 +95,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, "data": 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:

 app/service/bisheng.py

@@ -84,15 +84,17 @@
            response = await client.get(url, headers=headers)
            response.raise_for_status()
            data = self._check_response(response)
            session_log = {
                "session_log": [
            session_log = [
                    {
                        "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'])
            return session_log

    async def variable_list(self, token: str, agent_id: str) -> list: