From 319e3e93bbb4807da58db2ac72bb8f3029738dd7 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 03 十二月 2024 13:48:40 +0800
Subject: [PATCH] dify报告合并
---
app/api/agent.py | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index a9efc92..98ee2cb 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -6,7 +6,7 @@
from pydantic import BaseModel
from sqlalchemy.orm import Session
-from app.api import Response, get_current_user, ResponseList
+from app.api import Response, get_current_user, ResponseList, process_files
from app.api.user import reset_user_pwd
from app.config.config import settings
from app.models.agent_model import AgentType, AgentModel
@@ -113,15 +113,19 @@
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
elif agent.agent_type == AgentType.BISHENG:
+ is_join = False
+ if agent.name == "鎶ュ憡鐢熸垚":
+ is_join = True
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
-
+ answer_str = ""
+ files = []
for session in result:
- print(session)
+ # print(session)
# 妫�鏌� session 鏄惁涓� None
if session is None:
continue
@@ -138,19 +142,38 @@
message = message_json['query']
elif 'report_name' in message_json:
message = message_json['report_name']
+
+ except json.JSONDecodeError:
+ pass # 闈� JSON 瀛楃涓诧紝缁х画浣跨敤鍘熷 message
+ if session.get('files') and isinstance(session.get('files'), str):
+ try:
+ files = json.loads(session.get('files'))
+ process_files(files, agent_id)
+
except json.JSONDecodeError:
pass # 闈� JSON 瀛楃涓诧紝缁х画浣跨敤鍘熷 message
# 妫�鏌� message 鏄惁涓� None
if message is None:
continue
+ if is_join:
+ ...
+ if session.get('role') == 'question':
+ last_question = message
+ elif session.get('role') == 'answer':
+ answer_str += message
- if session.get('role') == 'question':
- last_question = 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": {"question":"", "answer": "\n".join(combined_logs)}})
+ else:
+ if session.get('role') == 'question':
+ last_question = message
+ elif session.get('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 if combined_logs else [{'question': last_question,
+ 'answer': answer_str, 'files': files}]})
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
elif agent.agent_type == AgentType.BASIC:
@@ -208,6 +231,9 @@
"file_url": i.get("content", {}).get("file_url")}]
if "images" in i.get("content", {}):
tmp_data["images"] = i.get("content", {}).get("images")
+
+ if "download_url" in i.get("content", {}):
+ tmp_data["download_url"] = i.get("content", {}).get("download_url")
else:
tmp_data["answer"] = i.get("content")
data.append(tmp_data)
--
Gitblit v1.8.0