From a7c9047450b2ebb8b7e5d2201c3c6b61af580a3c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 14 一月 2025 14:28:31 +0800
Subject: [PATCH] 智能体列表问题优化
---
app/service/dialog.py | 80 ++++++++++++++++++++++++++++++++-------
1 files changed, 65 insertions(+), 15 deletions(-)
diff --git a/app/service/dialog.py b/app/service/dialog.py
index 1bf4e4a..c302d10 100644
--- a/app/service/dialog.py
+++ b/app/service/dialog.py
@@ -13,23 +13,26 @@
user = db.query(UserModel).filter(UserModel.id == user_id).first()
if user is None:
return {"rows": []}
- query = db.query(DialogModel).filter(DialogModel.status != Dialog_STATSU_DELETE)
- id_list = []
- if label:
- id_list = [i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id==label).all()]
- if user.permission != "admin":
- dia_list = [j.id for i in user.groups for j in i.dialogs if not label or j.id in id_list]
- query = query.filter(or_(DialogModel.tenant_id == user_id, DialogModel.id.in_(dia_list)))
+ query = db.query(DialogModel)
+ if status:
+ query = query.filter(DialogModel.status == status)
else:
- if label:
- query = query.filter(or_(DialogModel.id.in_(id_list)))
+ query = query.filter(DialogModel.status != Dialog_STATSU_DELETE)
+ id_list = []
+ # if label:
+ # id_list = [i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id==label).all()]
+ if user.permission != "admin":
+ dia_list = [j.id for i in user.groups for j in i.dialogs]
+ query = query.filter(or_(DialogModel.tenant_id == user_id, DialogModel.id.in_(dia_list)))
+ # else:
+ if label:
+ id_list = [i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id == label).all()]
+ query = query.filter(DialogModel.id.in_(id_list))
if keyword:
query = query.filter(DialogModel.name.like('%{}%'.format(keyword)))
- if status:
- # print(status)
- query = query.filter(DialogModel.status == status)
+
query = query.order_by(DialogModel.update_date.desc())
total = query.count()
if page_size:
@@ -83,10 +86,10 @@
db.rollback()
-async def get_session_history(db, user_id, dialog_id):
+async def get_session_history(db, user_id, dialog_id, page, limit):
session_list = db.query(ConversationModel).filter(ConversationModel.tenant_id.__eq__(user_id),
ConversationModel.dialog_id.__eq__(dialog_id)).order_by(
- ConversationModel.update_time.desc()).all()
+ ConversationModel.update_time.desc()).limit(limit).offset((page - 1) * limit).all()
return [i.to_json() for i in session_list]
@@ -134,4 +137,51 @@
logger.error(e)
db.rollback()
return False
- return True
\ No newline at end of file
+ return True
+
+
+async def get_dialog_manage_list(db, user_id, keyword, label, status, page_size, page_index, mode):
+ user = db.query(UserModel).filter(UserModel.id == user_id).first()
+ if user is None:
+ return {"rows": []}
+ query = db.query(DialogModel).filter(DialogModel.status != Dialog_STATSU_DELETE)
+ if user.permission != "admin":
+ dia_list = [j.id for i in user.groups for j in i.dialogs]
+ query = query.filter(or_(DialogModel.tenant_id == user_id, DialogModel.id.in_(dia_list)))
+
+ if label:
+ id_list = set(
+ [i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id.in_(label)).all()])
+ query = query.filter(DialogModel.id.in_(id_list))
+
+ if keyword:
+ query = query.filter(DialogModel.name.like('%{}%'.format(keyword)))
+
+ if status:
+ # print(status)
+ query = query.filter(DialogModel.status == status)
+ if mode:
+ query = query.filter(DialogModel.mode == mode)
+ query = query.order_by(DialogModel.update_date.desc())
+ total = query.count()
+ if page_size:
+ query = query.limit(page_size).offset((page_index - 1) * page_size)
+
+ rows = []
+ user_id_set = set()
+ dialog_id_set = set()
+ label_dict = {}
+ for kld in query.all():
+ user_id_set.add(kld.tenant_id)
+ dialog_id_set.add(kld.id)
+ rows.append(kld.to_json())
+ user_dict = {str(i.id): i.to_dict() for i in db.query(UserModel).filter(UserModel.id.in_(user_id_set)).all()}
+ for i in db.query(LabelModel.id, LabelModel.name, LabelWorkerModel.object_id).outerjoin(LabelWorkerModel,
+ LabelModel.id == LabelWorkerModel.label_id).filter(
+ LabelWorkerModel.object_id.in_(dialog_id_set)).all():
+
+ label_dict[i.object_id] = label_dict.get(i.object_id, []) +[{"labelId": i.id, "labelName": i.name}]
+ for r in rows:
+ r["user"] = user_dict.get(r["user_id"], {})
+ r["label"] = label_dict.get(r["id"], [])
+ return {"total": total, "rows": rows}
\ No newline at end of file
--
Gitblit v1.8.0