From 08c8e8c9a4d65677de6a493446a605d70efee631 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 10 十二月 2024 16:32:07 +0800
Subject: [PATCH] 12.10 16
---
app/service/group.py | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/service/group.py b/app/service/group.py
index d7845fa..b142c84 100644
--- a/app/service/group.py
+++ b/app/service/group.py
@@ -3,7 +3,7 @@
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.service.service_token import get_ragflow_token
from Log import logger
@@ -60,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:
@@ -71,16 +71,17 @@
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)
+ token = await get_ragflow_token(db, user_id)
try:
for old_user in group_user_list:
@@ -94,6 +95,7 @@
for user1 in new_users:
for user2 in new_users:
if user1 != user2:
+ print(user1, user2)
await ragflow_service.add_user_tenant(token, user_dict[user1]["rg_id"],
user_dict[user2]["email"],
user_dict[user2]["rg_id"])
--
Gitblit v1.8.0