From 633a8ed975625851f23398f896594581c179f612 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 23 十二月 2024 09:45:50 +0800
Subject: [PATCH] mysql链接数量
---
app/api/agent.py | 133 +++++++++++++++++++++++++++++++------------
1 files changed, 95 insertions(+), 38 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index b8c1b9d..fb1ad87 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -6,8 +6,10 @@
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 import DialogModel, MenuCapacityModel
from app.models.agent_model import AgentType, AgentModel
from app.models.base_model import get_db
from app.models.session_model import SessionModel
@@ -16,6 +18,7 @@
from app.service.dialog import get_session_history
from app.service.ragflow import RagflowService
from app.service.service_token import get_ragflow_token, get_bisheng_token
+from app.task.fetch_agent import initialize_agents
router = APIRouter()
@@ -34,37 +37,39 @@
limit: int = Query(1000, ge=1, le=1000),
db: Session = Depends(get_db),
current_user: UserModel = Depends(get_current_user)):
- agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ # agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ agent = db.query(MenuCapacityModel).filter(MenuCapacityModel.chat_id == agent_id).first()
if not agent:
return ResponseList(code=404, msg="Agent not found")
-
- if agent.agent_type == AgentType.RAGFLOW:
+ agent_type = int(agent.capacity_type)
+ if agent_type == AgentType.RAGFLOW:
ragflow_service = RagflowService(base_url=settings.fwr_base_url)
try:
- token = get_ragflow_token(db, current_user.id)
+ token = await get_ragflow_token(db, current_user.id)
result = await ragflow_service.get_chat_sessions(token, agent_id)
if not result:
- result = await get_session_history(db, current_user.id, agent_id)
+ result = await get_session_history(db, current_user.id, agent_id, page, limit)
except Exception as e:
+ print(e)
raise HTTPException(status_code=500, detail=str(e))
return ResponseList(code=200, msg="", data=result)
- elif agent.agent_type == AgentType.BISHENG:
+ elif 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_chat_sessions(token, page, limit)
+ token = await get_bisheng_token(db, current_user.id)
+ result = await bisheng_service.get_chat_sessions(token, agent_id, page, limit)
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
return ResponseList(code=200, msg="", data=result)
- elif agent.agent_type == AgentType.BASIC:
+ elif agent_type == AgentType.BASIC:
offset = (page - 1) * limit
records = db.query(SessionModel).filter(SessionModel.agent_id == agent_id, SessionModel.tenant_id==current_user.id).order_by(SessionModel.create_date.desc()).offset(offset).limit(limit).all()
result = [item.to_dict() for item in records]
return ResponseList(code=200, msg="", data=result)
- elif agent.agent_type == AgentType.DIFY:
+ elif agent_type == AgentType.DIFY:
offset = (page - 1) * limit
records = db.query(SessionModel).filter(SessionModel.agent_id == agent_id, SessionModel.tenant_id==current_user.id).order_by(SessionModel.create_date.desc()).offset(offset).limit(limit).all()
result = [item.to_dict() for item in records]
@@ -83,7 +88,7 @@
if agent.agent_type == AgentType.RAGFLOW:
ragflow_service = RagflowService(base_url=settings.fwr_base_url)
try:
- token = get_ragflow_token(db, current_user.id)
+ token = await 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 = []
@@ -112,37 +117,67 @@
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)
+ token = await 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:
- 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':
- 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})
+ # 鍒ゆ柇 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 Exception as e:
+ 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 Exception as e:
+ 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
+
+ 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:
@@ -154,12 +189,29 @@
if i.get("role") == "user":
tmp_data["question"]=i.get("content")
elif i.get("role") == "assistant":
+
if isinstance(i.get("content"), dict):
tmp_data["answer"] = i.get("content", {}).get("message")
if "file_name" in i.get("content", {}):
tmp_data["files"] = [{"file_name":i.get("content", {}).get("file_name"), "file_url":i.get("content", {}).get("file_url")}]
else:
tmp_data["answer"] = i.get("content")
+
+ if "excel_url" in i:
+ tmp_data["excel_url"] = i.get("excel_url")
+ if "image_url" in i:
+ tmp_data["image_url"] = i.get("image_url")
+ if "sql" in i:
+ tmp_data["sql"] = i.get("sql")
+ if "code" in i:
+ 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 = {}
@@ -181,6 +233,11 @@
if "file_name" in i.get("content", {}):
tmp_data["files"] = [{"file_name": i.get("content", {}).get("file_name"),
"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)
@@ -197,8 +254,8 @@
@router.get("/get-chat-id/{agent_id}", response_model=Response)
async def get_chat_id(agent_id: str, db: Session = Depends(get_db)):
- agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
- if not agent:
- return Response(code=404, msg="Agent not found")
+ # agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ # if not agent:
+ # return Response(code=404, msg="Agent not found")
return Response(code=200, msg="", data={"chat_id": uuid.uuid4().hex})
--
Gitblit v1.8.0