From 9c275b214f9619a64cd2998596ce696610185eb4 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 19 十一月 2024 10:05:56 +0800
Subject: [PATCH] 增加删除
---
app/service/group.py | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/app/service/group.py b/app/service/group.py
index 7519f65..361062d 100644
--- a/app/service/group.py
+++ b/app/service/group.py
@@ -1,38 +1,28 @@
-from sqlalchemy.testing.pickleable import Order
-
from app.config.config import settings
+from app.models import CanvasModel, DialogModel, KnowledgeModel
from app.models.group_model import GroupModel
from app.models.user_model import UserModel
from app.service.ragflow import RagflowService
-from app.service.token import get_ragflow_token
-from app.Log import logger
+from app.service.service_token import get_ragflow_token
+from Log import logger
-async def group_list(db, page_size: int, page_index: int, keyword: str):
+async def group_list(db, page_size: int, page_index: int, keyword: str, role_key:str, user_id):
logger.info("-------------------------group_list----------------------------------")
- query = db.query(GroupModel)
+ query = db.query(GroupModel).filter(GroupModel.creator==user_id)
+ # if role_key != "admin":
+ # query.filter(GroupModel.creator==user_id)
if keyword:
query = query.filter(GroupModel.group_name.like('%{}%'.format(keyword)))
items = query.order_by(GroupModel.id.desc()).limit(page_size).offset(
(page_index - 1) * page_size).all()
- # items_list = [item.to_dict() for item in items]
- # groups = [i["id"] for i in items_list]
- # group_dict = {}
- # for group_user in db.query(GroupModel.group_id, UserModel.id, UserModel.username).outerjoin(UserModel,
- # UserModel.id == UserGroupModel.user_id).filter(
- # GroupModel.group_id.in_(groups)).all():
- # if group_user.group_id in group_dict:
- # group_dict[group_user.group_id].append({"user_id": group_user.id, "user_name": group_user.username})
- # else:
- # group_dict[group_user.group_id] = [{"user_id": group_user.id, "user_name": group_user.username}]
- # for item in items_list:
- # item["users"] = group_dict.get(item["id"], [])
+
return {"total": query.count(), "items": [item.to_json() for item in items]}
-async def create_group(db, group_name: str, group_description: str):
+async def create_group(db, group_name: str, group_description: str, user_id):
try:
- group_model = GroupModel(group_name=group_name, group_description=group_description)
+ group_model = GroupModel(group_name=group_name, group_description=group_description, creator=user_id)
db.add(group_model)
db.commit()
db.refresh(group_model)
@@ -70,7 +60,7 @@
in_group_user = []
user_list = [u.id for i in
db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).all() for u in i.users]
- for u in db.query(UserModel.id, UserModel.username).order_by(UserModel.id.desc()).all():
+ for u in db.query(UserModel.id, UserModel.username).filter(UserModel.permission!="admin").order_by(UserModel.id.desc()).all():
if u.id in user_list:
in_group_user.append({"user_id": u.id, "user_name": u.username})
else:
@@ -81,14 +71,15 @@
async def save_user_to_group(db, user_id, group_id, user_list):
group_user_list = [u.id for i in
db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).all() for u in i.users]
- # print(group_user_list)
new_users = set([i for i in user_list if i not in group_user_list])
delete_user = [i for i in group_user_list if i not in user_list]
+ print(new_users)
if new_users:
user_dict = {i.id: {"rg_id": i.ragflow_id, "email": i.email} for i in
db.query(UserModel.id, UserModel.email, UserModel.ragflow_id).filter(
UserModel.id.in_(user_list)).all()}
+ print(user_dict)
ragflow_service = RagflowService(settings.fwr_base_url)
token = get_ragflow_token(db, user_id)
@@ -118,4 +109,16 @@
except Exception as e:
logger.error(e)
return False
+ return True
+
+async def save_group_resource(db, user_id, group_id, agents, dialogs, knowledges):
+ try:
+ group = db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).first()
+ group.agents = [db.get(CanvasModel, user) for user in agents]
+ group.dialogs = [db.get(DialogModel, user) for user in dialogs]
+ group.knowledges = [db.get(KnowledgeModel, user) for user in knowledges]
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ return False
return True
\ No newline at end of file
--
Gitblit v1.8.0