From 40408073a234dc2bdd917ff7f1fe4d2edf001032 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期三, 18 十二月 2024 14:10:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/service/dialog.py | 102 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 85 insertions(+), 17 deletions(-)
diff --git a/app/service/dialog.py b/app/service/dialog.py
index ea75db8..83d192b 100644
--- a/app/service/dialog.py
+++ b/app/service/dialog.py
@@ -1,37 +1,69 @@
from datetime import datetime
-from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel
+from sqlalchemy import or_
+
+from app.config.const import Dialog_STATSU_DELETE
+from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel, group_dialog_table, LabelWorkerModel, \
+ LabelModel
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, label, status, page_size, page_index):
+ 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)))
else:
- user = db.query(UserModel).filter(UserModel.id == user_id).first()
+ if label:
+ query = query.filter(or_(DialogModel.id.in_(id_list)))
- group_list = [i.id for i in user.groups]
+ if keyword:
+ query = query.filter(DialogModel.name.like('%{}%'.format(keyword)))
- 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)
+ if status:
+ # print(status)
+ query = query.filter(DialogModel.status == status)
+ 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)
- return {"rows": [kld.to_json() for kld in dialog_list]}
+ 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}
-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)
@@ -42,7 +74,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()
@@ -56,3 +88,39 @@
ConversationModel.dialog_id.__eq__(dialog_id)).order_by(
ConversationModel.update_time.desc()).all()
return [i.to_json() for i in session_list]
+
+
+
+async def create_dialog_service(db, dialog_id, dialog_name, description, icon, dialog_type, mode, user_id):
+ try:
+ dialog_model = DialogModel(id=dialog_id,name=dialog_name, description=description,icon=icon, dialog_type=dialog_type, tenant_id=user_id, mode=mode,update_date=datetime.now(),create_date=datetime.now())
+ db.add(dialog_model)
+ db.commit()
+ db.refresh(dialog_model)
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ return False
+ return True
+
+
+async def update_dialog_status_service(db, dialog_id, status):
+ try:
+ db.query(DialogModel).filter_by(id=dialog_id).update({"status":status, "update_date": datetime.now()})
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ return False
+ return True
+
+
+async def delete_dialog_service(db, dialog_id):
+ try:
+ db.query(DialogModel).filter_by(id=dialog_id).update({"status":Dialog_STATSU_DELETE, "update_date": datetime.now()})
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ return False
+ return True
\ No newline at end of file
--
Gitblit v1.8.0