From c7d5be908e24ee7677140c1cf983836f2e413cf0 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 10 十二月 2024 18:26:20 +0800
Subject: [PATCH] 会话菜单增加
---
app/service/dialog.py | 82 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/app/service/dialog.py b/app/service/dialog.py
index 4fa7a63..d78fbbe 100644
--- a/app/service/dialog.py
+++ b/app/service/dialog.py
@@ -1,22 +1,76 @@
-from app.models import KnowledgeModel, GroupModel, DialogModel
+from datetime import datetime
+
+from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel, group_dialog_table
from app.models.user_model import UserModel
from Log import logger
-async def get_dialog_list(db, role, user_id):
- if role == "admin":
- dialog_list = db.query(DialogModel).all()
+async def get_dialog_list(db, user_id, keyword, page_size, page_index):
+ user = db.query(UserModel).filter(UserModel.id == user_id).first()
+ if user is None:
+ return {"rows": []}
+ if user.permission == "admin":
+ query = db.query(DialogModel)
else:
- user = db.query(UserModel).filter(UserModel.id == user_id).first()
-
group_list = [i.id for i in user.groups]
+ query = db.query(DialogModel)
+ query = query.filter(DialogModel.tenant_id == user_id)
+ query = query.union(
+ db.query(DialogModel).join(
+ group_dialog_table,
+ DialogModel.id == group_dialog_table.c.dialog_id
+ ).filter(
+ group_dialog_table.c.group_id.in_(group_list)
+ )
+ )
+ if keyword:
+ query = query.filter(DialogModel.name.like('%{}%'.format(keyword)))
+ total = query.count()
+ if page_size:
+ query = query.limit(page_size).offset((page_index - 1) * page_size)
- dialog_list = db.query(DialogModel).filter(DialogModel.tenant_id == user_id).all()
- kld_set = set([i.id for i in dialog_list])
- for group in db.query(GroupModel).filter(GroupModel.id.in_(group_list)).all():
- for k in group.dialogs:
- if k.id not in kld_set:
- dialog_list.append(k)
- kld_set.add(k.id)
+ rows = []
+ user_id_set = set()
+ for kld in query.all():
+ user_id_set.add(kld.tenant_id)
+ rows.append(kld.to_json())
+ print(rows)
+ user_dict = {i.id: i.to_dict() for i in db.query(UserModel).filter(UserModel.id.in_(user_id_set)).all()}
+ for r in rows:
+ r["user"] = user_dict.get(r["user_id"], {})
+ return {"total": total, "rows": rows}
- return {"rows": [kld.to_json() for kld in dialog_list]}
\ No newline at end of file
+
+async def update_session_history(db, data: dict, user_id):
+ session_id = data.get("id")
+ if not session_id:
+ logger.error("鏇存柊鍥炶瘽璁板綍澶辫触锛亄}".format(data))
+ return
+ data["create_date"] = datetime.strptime(data["create_date"], '%a, %d %b %Y %H:%M:%S %Z')
+ data["update_date"] = datetime.strptime(data["update_date"], '%a, %d %b %Y %H:%M:%S %Z')
+ conversation = db.query(ConversationModel).filter(ConversationModel.id == session_id).first()
+ if not conversation:
+ try:
+ data["tenant_id"] = user_id
+ conversation_model = ConversationModel(**data)
+ db.add(conversation_model)
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ else:
+ try:
+ # data["tenant_id"] = user_id
+ del data["id"]
+ db.query(ConversationModel).filter(ConversationModel.id == session_id).update(data)
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+
+
+async def get_session_history(db, user_id, dialog_id):
+ 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()
+ return [i.to_json() for i in session_list]
--
Gitblit v1.8.0