From abb91124a4372b0efe5ab1b7aa25859c635d30eb Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 10 四月 2025 13:49:37 +0800
Subject: [PATCH] merge
---
app/api/report.py | 104 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 45 deletions(-)
diff --git a/app/api/report.py b/app/api/report.py
index 213fdc7..00f80d9 100644
--- a/app/api/report.py
+++ b/app/api/report.py
@@ -8,6 +8,7 @@
from Log import logger
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 import MenuCapacityModel
from app.models.agent_model import AgentModel, AgentType
from app.models.base_model import get_db
from app.models.user_model import UserModel
@@ -23,11 +24,18 @@
chat_id: str,
current_user: UserModel = Depends(get_current_user_websocket),
db: Session = Depends(get_db)):
- agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ agent = db.query(MenuCapacityModel).filter(MenuCapacityModel.chat_id == agent_id).first()
+ if not agent:
+ agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ agent_type = agent.agent_type
+ chat_type = agent.type
+ else:
+ agent_type = agent.capacity_type
+ chat_type = agent.chat_type
if not agent:
ret = {"message": "Agent not found", "type": "close"}
return websocket.send_json(ret)
- agent_type = agent.agent_type
+ # agent_type = agent.agent_type
if chat_id == "" or chat_id == "0":
ret = {"message": "Chat ID not found", "type": "close"}
return websocket.send_json(ret)
@@ -36,7 +44,7 @@
ret = {"message": "Agent error", "type": "close"}
return websocket.send_json(ret)
- token = get_bisheng_token(db, current_user.id)
+ token = await get_bisheng_token(db, current_user.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};"}
@@ -61,49 +69,55 @@
async def forward_to_client():
is_answer = False
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", "")
- msg = data.get("message", "")
- category = data.get("category", "")
+ try:
+ message = await service_websocket.recv()
+ # print(f"Received from bisheng: {message}")
+ data = json.loads(message)
+ files = data.get("files", [])
+ steps = data.get("intermediate_steps", "")
+ msg = data.get("message", "")
+ category = data.get("category", "")
+ process_files(files, agent_id)
+ if category == "question" and steps:
+ is_answer = False
+ if not steps:
+ steps = "\n"
+ else:
+ steps = steps + "\n"
+ result = {"message": steps, "type": "stream", "files": files}
+ await websocket.send_json(result)
+ if category == "answer" and not is_answer:
+ if not steps.endswith("\n"):
+ steps += "\n\n"
+ result = {"message": steps, "type": "stream", "files": files}
+ await websocket.send_json(result)
+ if category == "answer" and is_answer:
+ # process_files(files, agent_id)
+ result = {"message": "\n", "type": "stream", "files": files}
+ await websocket.send_json(result)
+ elif data["type"] == "close":
+ # process_files(files, agent_id)
+ result = {"message": "", "type": "close", "files": files}
+ await websocket.send_json(result)
+ elif category == "processing":
+ # process_files(files, agent_id)
+ is_answer = True
+ result = {"message": msg, "type": "stream", "files": files}
+ await websocket.send_json(result)
+ elif files:
+ # process_files(files, agent_id)
+ result = {"message": "", "type": "stream", "files": files}
+ await websocket.send_json(result)
- if category == "question" and steps:
- is_answer = False
- if not steps:
- steps = "\n"
+ elif category == "system" and steps:
+ result = {"message": steps, "type": "stream", "files": files}
+ await websocket.send_json(result)
else:
- steps =steps + "\n"
-
- result = {"message": steps, "type": "stream", "files": files}
- await websocket.send_json(result)
- if category == "answer" and not is_answer:
- process_files(files, agent_id)
- if not steps.endswith("\n"):
- steps+= "\n\n"
- result = {"message": steps, "type": "stream", "files": files}
- await websocket.send_json(result)
- if category == "answer" and is_answer:
- process_files(files, agent_id)
- result = {"message": "\n", "type": "stream", "files": files}
- await websocket.send_json(result)
- elif category == "processing":
- process_files(files, agent_id)
- is_answer = True
- result = {"message": msg, "type": "stream", "files": files}
- await websocket.send_json(result)
- elif files:
- process_files(files, agent_id)
- result = {"message": "", "type": "stream", "files": files}
- await websocket.send_json(result)
- elif data["type"] == "close":
- process_files(files, agent_id)
- result = {"message": "", "type": "close", "files": files}
- await websocket.send_json(result)
- else:
- logger.error("-------------------11111111111111--------------------------")
- logger.error(data)
+ logger.error("-------------------11111111111111--------------------------")
+ logger.error(data)
+ except Exception as e:
+ logger.error(e)
+ await websocket.send_json({"message": "杩炴帴寮傚父锛�", "type": "close", "files": []})
# if len(files) != 0 or (msg and category != "answer") or data["type"] == "close":
# if data["type"] == "close":
# t = "close"
@@ -159,7 +173,7 @@
return ResponseList(code=404, msg="Agent not found")
bisheng_service = BishengService(base_url=settings.sgb_base_url)
try:
- token = get_bisheng_token(db, current_user.id)
+ token = await get_bisheng_token(db, current_user.id)
result = await bisheng_service.variable_list(token, agent_id)
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
--
Gitblit v1.8.0