From 351cd801ebf0da665c521448c978da100b4aaf03 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 05 十二月 2024 15:21:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/service/dialog.py | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/app/service/dialog.py b/app/service/dialog.py
index 3af1363..8e1d265 100644
--- a/app/service/dialog.py
+++ b/app/service/dialog.py
@@ -1,38 +1,40 @@
from datetime import datetime
-from app.api.user import user_list
-from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel
+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):
+ 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]
-
- 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)
-
- return {"rows": [kld.to_json() for kld in dialog_list]}
+ 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)
+ )
+ )
+ return {"rows": [kld.to_json() for kld in query.all()]}
-async def update_session_history(db, data: dict, user_id, is_new):
+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')
- if is_new:
+ conversation = db.query(ConversationModel).filter(ConversationModel.id == session_id).first()
+ if not conversation:
try:
data["tenant_id"] = user_id
conversation_model = ConversationModel(**data)
@@ -43,7 +45,7 @@
db.rollback()
else:
try:
- data["tenant_id"] = user_id
+ # data["tenant_id"] = user_id
del data["id"]
db.query(ConversationModel).filter(ConversationModel.id == session_id).update(data)
db.commit()
--
Gitblit v1.8.0