From 9c275b214f9619a64cd2998596ce696610185eb4 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 19 十一月 2024 10:05:56 +0800
Subject: [PATCH] 增加删除
---
app/api/agent.py | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index 59d1f21..3d181c0 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
@@ -12,7 +13,7 @@
from app.models.user_model import UserModel
from app.service.bisheng import BishengService
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()
@@ -63,18 +64,66 @@
try:
token = get_ragflow_token(db, current_user.id)
result = await ragflow_service.get_session_log(token, conversation_id)
+ if 'session_log' in result and 'reference' in result:
+ combined_logs = []
+ last_question = None
+ references = result['reference']
+ reference_index = 0
+ for session in result['session_log']:
+ if session['role'] == 'user':
+ last_question = session['message']
+ elif session['role'] == 'assistant' and last_question:
+ if reference_index < len(references):
+ reference = references[reference_index]
+ else:
+ reference = None
+ combined_logs.append({
+ 'question': last_question,
+ 'answer': session['message'],
+ 'reference': reference
+ })
+ last_question = None
+ reference_index += 1
+ return JSONResponse(status_code=200, content={"code": 200, "data": combined_logs})
+ else:
+
+ return JSONResponse(status_code=200, content={"code": 400, "message": "Invalid result structure"})
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
- return JSONResponse(status_code=200, content={"code": 200, "log": result})
if agent.agent_type == AgentType.BISHENG:
bisheng_service = BishengService(base_url=settings.sgb_base_url)
try:
token = get_bisheng_token(db, current_user.id)
result = await bisheng_service.get_session_log(token, agent_id, conversation_id)
+ 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))
- return JSONResponse(status_code=200, content={"code": 200, "log": result})
-
else:
return JSONResponse(status_code=200, content={"code": 200, "log": "Unsupported agent type"})
--
Gitblit v1.8.0