From a625a4731c0f8d1ca57b164580bc44c37d98d533 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 29 十月 2024 16:47:56 +0800
Subject: [PATCH] 毕昇报告生成放出message,并去掉重复的step_message
---
app/api/report.py | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/app/api/report.py b/app/api/report.py
index 386dcf1..d262013 100644
--- a/app/api/report.py
+++ b/app/api/report.py
@@ -4,7 +4,7 @@
import asyncio
import websockets
from sqlalchemy.orm import Session
-from app.api import get_current_user_websocket, ResponseList, get_current_user
+from app.api import get_current_user_websocket, ResponseList, get_current_user, format_file_url, process_files
from app.config.config import settings
from app.models.agent_model import AgentModel, AgentType
from app.models.base_model import get_db
@@ -35,7 +35,7 @@
return websocket.send_json(ret)
token = get_bisheng_token(db, current_user.id)
- service_uri = f"{settings.bisheng_websocket_url}/api/v1/chat/{agent_id}?type=L1&t=&chat_id={chat_id}"
+ service_uri = f"{settings.sgb_websocket_url}/api/v1/chat/{agent_id}?type=L1&t=&chat_id={chat_id}"
headers = {'cookie': f"access_token_cookie={token};"}
await websocket.accept()
@@ -57,20 +57,26 @@
# 鐩戝惉姣曟槆鍙戞潵鐨勬秷鎭苟杞彂缁欏鎴风
async def forward_to_client():
+ last_message = "step"
while True:
message = await service_websocket.recv()
print(f"Received from bisheng: {message}")
data = json.loads(message)
files = data.get("files", [])
steps = data.get("intermediate_steps", "")
- if len(files) != 0 or steps != "" or data["type"] == "close":
+ msg = data.get("message", "")
+
+ if len(files) != 0 or (steps and last_message == "step") or msg or data["type"] == "close":
if data["type"] == "close":
t = "close"
else:
t = "stream"
- result = {"step_message": steps, "type": t, "files": files}
+ process_files(files, agent_id)
+ result = {"step_message": steps, "message": msg, "type": t, "files": files}
await websocket.send_json(result)
print(f"Forwarded to client, {chat_id}: {result}")
+
+ last_message = "step" if steps else "message"
# 鍚姩涓や釜浠诲姟锛屽垎鍒鐞嗗鎴风鍜屾湇鍔＄鐨勬秷鎭�
tasks = [
@@ -96,7 +102,7 @@
agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
if not agent:
return ResponseList(code=404, msg="Agent not found")
- bisheng_service = BishengService(base_url=settings.bisheng_base_url)
+ bisheng_service = BishengService(base_url=settings.sgb_base_url)
try:
token = get_bisheng_token(db, current_user.id)
result = await bisheng_service.variable_list(token, agent_id)
--
Gitblit v1.8.0