From c0d11dac469251c71b036c757c788615285c9683 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 十一月 2024 10:57:10 +0800
Subject: [PATCH] 毕昇对话历史只返回了一条修正，按时间正序排列吧，json乱码修正
---
app/service/bisheng.py | 10 ++++++----
app/api/agent.py | 43 ++++++++++++++++++++++++++++---------------
2 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index faedaee..67fe927 100644
--- a/app/api/agent.py
+++ b/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 瀵硅薄,濡傛灉鏄痡son鍙栧叾涓殑question瀛楁锛屾垨鑰卹eport_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:
diff --git a/app/service/bisheng.py b/app/service/bisheng.py
index d4781da..e55dbb7 100644
--- a/app/service/bisheng.py
+++ b/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
- ],
- }
+ ]
+
+ # 鎶妔ession_log 鎸塼s 鍗囧簭鎺掑簭
+ session_log.sort(key=lambda x: x['ts'])
return session_log
async def variable_list(self, token: str, agent_id: str) -> list:
--
Gitblit v1.8.0