From f249dda1376dd5a525e74617900351c5bbc61705 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 02 十二月 2024 09:26:18 +0800
Subject: [PATCH] 报告生成
---
app/api/agent.py | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index 698ca0d..a9efc92 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -7,6 +7,7 @@
from sqlalchemy.orm import Session
from app.api import Response, get_current_user, ResponseList
+from app.api.user import reset_user_pwd
from app.config.config import settings
from app.models.agent_model import AgentType, AgentModel
from app.models.base_model import get_db
@@ -120,29 +121,36 @@
last_question = None
for session in result:
- message = session['message']
+ print(session)
+ # 妫�鏌� session 鏄惁涓� None
+ if session is None:
+ continue
- # 鍒ゆ柇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
+ message = session.get('message')
- if session['role'] == 'question':
+ # 鍒ゆ柇 message 鏄惁鏄瓧绗︿覆锛岀劧鍚庡皾璇曡В鏋愪负 JSON 瀵硅薄
+ if isinstance(message, str):
+ 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 # 闈� JSON 瀛楃涓诧紝缁х画浣跨敤鍘熷 message
+
+ # 妫�鏌� message 鏄惁涓� None
+ if message is None:
+ continue
+
+ if session.get('role') == 'question':
last_question = message
- elif session['role'] == 'answer' and last_question:
- combined_logs.append({
- 'question': last_question,
- 'answer': message
- })
+ elif session.get('role') == 'answer' and last_question:
+ combined_logs.append(last_question + "\n" + message)
last_question = None
- return JSONResponse(status_code=200, content={"code": 200, "data": combined_logs})
+ return JSONResponse(status_code=200, content={"code": 200, "data": {"question":"", "answer": "\n".join(combined_logs)}})
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
elif agent.agent_type == AgentType.BASIC:
@@ -172,6 +180,11 @@
tmp_data["code"] = i.get("code")
if "e" in i:
tmp_data["e"] = i.get("e")
+
+ if "image_name" in i:
+ tmp_data["image_name"] = i.get("image_name")
+ if "excel_name" in i:
+ tmp_data["excel_name"] = i.get("excel_name")
data.append(tmp_data)
tmp_data = {}
--
Gitblit v1.8.0