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/user.py | 141 +++++++++++++++++++++++++++++++++++------------
1 files changed, 105 insertions(+), 36 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index 9ceb047..21d2869 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -1,30 +1,35 @@
+import time
from datetime import datetime
from app.api import pwd_context
from app.config.config import settings
+from app.config.const import RAGFLOW, BISHENG, DIFY
from app.models import RoleModel, GroupModel, AgentType, role_resource_table
+from app.models.menu_model import WebMenuModel, MenuCapacityModel
from app.models.user_model import UserModel
from Log import logger
+from app.service.auth import UserAppDao
from app.service.bisheng import BishengService
-from app.service.common.app_register import AppRegisterDao
+from app.service.v2.app_register import AppRegisterDao
+from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
from app.service.service_token import get_ragflow_token, get_bisheng_token, get_ragflow_new_token
-async def get_user_list(db, page_index: int, page_size: int, keyword: str, role_key:str, user_id):
- query = db.query(UserModel).filter(UserModel.permission!="admin")
+async def get_user_list(db, page_index: int, page_size: int, keyword: str, role_key: str, user_id):
+ query = db.query(UserModel).filter(UserModel.permission != "admin")
# if role_key != "admin":
# query.filter(UserModel.creator==user_id)
if keyword:
query = query.filter(UserModel.group_name.like('%{}%'.format(keyword)))
users = query.order_by(UserModel.id.desc()).limit(page_size).offset(
(page_index - 1) * page_size).all()
- return {"total": query.count(), "rows": [user.to_json() for user in users]}
+ return {"total": query.count(), "rows": [user.to_json() for user in users]}
async def edit_user_status(db, status: str, user_id: int):
try:
- db.query(UserModel).filter(UserModel.id == user_id).update({"status":status})
+ db.query(UserModel).filter(UserModel.id == user_id).update({"status": status})
db.commit()
except Exception as e:
logger.error(e)
@@ -35,7 +40,7 @@
async def delete_user_data(db, user_id: str):
try:
- db.query(UserModel).filter(UserModel.id == user_id, UserModel.permission!="admin").delete()
+ db.query(UserModel).filter(UserModel.id == user_id, UserModel.permission != "admin").delete()
db.commit()
except Exception as e:
logger.error(e)
@@ -46,38 +51,65 @@
async def create_user(db, user_name, email, phone, login_name, password, roles, groups, user_id):
try:
- bisheng_service = BishengService(settings.sgb_base_url)
- ragflow_service = RagflowService(settings.fwr_base_url)
-
- # 娉ㄥ唽鍒版瘯鏄�
- try:
- bisheng_info = await bisheng_service.register(user_name, password)
- except Exception as e:
- logger.error(f"Failed to register with Bisheng: {str(e)}")
- return False
-
- # 娉ㄥ唽鍒皉agflow
- try:
- ragflow_info = await ragflow_service.register(user_name, password)
- except Exception as e:
- logger.error(f"Failed to register with Ragflow: {str(e)}")
- return False
+ # bisheng_service = BishengService(settings.sgb_base_url)
+ # ragflow_service = RagflowService(settings.fwr_base_url)
+ #
+ # # 娉ㄥ唽鍒版瘯鏄�
+ # try:
+ # bisheng_info = await bisheng_service.register(user_name, password)
+ # except Exception as e:
+ # logger.error(f"Failed to register with Bisheng: {str(e)}")
+ # return False
+ #
+ # # 娉ㄥ唽鍒皉agflow
+ # try:
+ # ragflow_info = await ragflow_service.register(user_name, password)
+ # except Exception as e:
+ # logger.error(f"Failed to register with Ragflow: {str(e)}")
+ # return False
+ app_register = AppRegisterDao(db).get_apps()
+ register_dict = {}
+ for app in app_register:
+ if app["id"] == RAGFLOW:
+ service = RagflowService(settings.fwr_base_url)
+ elif app["id"] == BISHENG:
+ service = BishengService(settings.sgb_base_url)
+ elif app["id"] == DIFY:
+ service = DifyService(settings.dify_base_url)
+ else:
+ logger.error("鏈煡娉ㄥ唽搴旂敤---")
+ continue
+ try:
+ name = app["id"] + str(int(time.time()))
+ register_info = await service.register(name, password)
+ # print(register_info)
+ register_dict[app['id']] = {"id": register_info.get("id"), "name": name,
+ "email": register_info.get("email")}
+ except Exception as e:
+ logger.error(e)
+ return False
# 瀛樺偍鐢ㄦ埛淇℃伅
hashed_password = pwd_context.hash(password)
- user_model = UserModel(username=user_name, hashed_password=hashed_password, email=email,ragflow_id=ragflow_info.get("id"),bisheng_id=bisheng_info.get("user_id"),
- phone=phone,login_name=login_name)
+ user_model = UserModel(username=user_name, hashed_password=hashed_password, email=email,
+ ## ragflow_id=ragflow_info.get("id"),bisheng_id=bisheng_info.get("user_id"),
+ phone=phone, login_name=login_name)
+ pwd = user_model.encrypted_password(password)
user_model.roles = [db.get(RoleModel, roleId) for roleId in roles]
+ user_model.password = pwd
if groups:
user_model.groups = [db.get(GroupModel, groupId) for groupId in groups]
user_model.creator = user_id
db.add(user_model)
db.commit()
db.refresh(user_model)
+ u_id = user_model.id
+ for k, v in register_dict.items():
+ await UserAppDao(db).update_and_insert_data(v.get("name"), pwd, v.get("email"), u_id, str(v.get("id")), k)
except Exception as e:
logger.error(e)
- db.rollback()
+ # db.rollback()
return False
return True
@@ -100,21 +132,21 @@
return True
-async def edit_user_pwd(db, user_id, current_user_id ,new_password="000000"):
+async def edit_user_pwd(db, user_id, current_user_id, new_password="000000"):
try:
user = db.query(UserModel).filter(UserModel.id == user_id).first()
pwd = user.decrypted_password()
- for app_type in AppRegisterDao(db).get_app():
- if app_type == AgentType.RAGFLOW:
- token = await get_ragflow_new_token(db, user_id, app_type)
+ for app in AppRegisterDao(db).get_apps():
+ if app.get("id") == RAGFLOW:
+ token = await get_ragflow_new_token(db, user_id, 1)
ragflow_service = RagflowService(settings.fwr_base_url)
await ragflow_service.set_user_password(token, pwd, new_password)
- elif app_type == AgentType.BISHENG:
- token = get_bisheng_token(db, current_user_id)
+ elif app.get("id") == BISHENG:
+ token = await get_bisheng_token(db, current_user_id)
bisheng_service = BishengService(settings.sgb_base_url)
await bisheng_service.change_password_public(token, user.username, pwd, new_password)
else:
- logger.error("娉ㄥ唽鏈煡搴旂敤锛歿}".format(app_type))
+ logger.error("娉ㄥ唽鏈煡搴旂敤锛歿}".format(app.get("id")))
# hashed_password = pwd_context.hash(password)
hashed_password = user.encrypted_password(new_password)
@@ -148,7 +180,7 @@
if user.permission == "admin":
permissions = ["*:*:*"]
- return {"permissions": list(permissions), "dept": dept , "roles": roles, "user": user.to_dict()}
+ return {"permissions": list(permissions), "dept": dept, "roles": roles, "user": user.to_dict()}
async def role_resource(role_set, role_list, permissions, roles):
@@ -167,6 +199,7 @@
dept_set = set()
user = db.query(UserModel).filter_by(id=user_id).first()
parent_id = ""
+
async def role_resource(role_set, permissions, roles):
nonlocal parent_id
for role in roles:
@@ -192,14 +225,50 @@
parent_ogt = parent_ogt.parent
tmp_dit = {}
for permission in permissions.values():
- tmp_dit[permission["parentId"]] = tmp_dit.get(permission["parentId"], []) +[permission]
+ tmp_dit[permission["parentId"]] = tmp_dit.get(permission["parentId"], []) + [permission]
+
def get_child(parent_id):
res = permissions[parent_id]
res["children"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
return res
- print(parent_id)
- print(tmp_dit)
return {"routers": [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]}
+async def get_user_menus(db, user_id):
+ dialog_list = []
+ agent_list = []
+ menu_dict = {}
+ res = []
+ user = db.query(UserModel).filter_by(id=user_id).first()
+ for group in user.groups:
+ for dialog in group.dialogs:
+ dialog_list.append(dialog.id)
+ for agent in group.agents:
+ agent_list.append(agent.id)
+ menu_list = db.query(WebMenuModel.id, WebMenuModel.title, WebMenuModel.describe, WebMenuModel.icon, WebMenuModel.desc,
+ WebMenuModel.img, MenuCapacityModel.capacity_id, MenuCapacityModel.capacity_type).outerjoin(
+ MenuCapacityModel, WebMenuModel.id == MenuCapacityModel.menu_id).all()
+
+ for menu in menu_list:
+ menu_dict[menu.id] = menu_dict.get(menu.id, []) + [menu]
+ # print(dialog_list)
+ for menus in menu_dict.values():
+
+ for m in menus:
+ if user.permission == "admin":
+ continue
+ elif not m.capacity_type or m.capacity_type == 1 and m.capacity_id not in dialog_list:
+ break
+ elif not m.capacity_type or m.capacity_type == 2 and m.capacity_id not in agent_list:
+ break
+ else:
+ res.append({
+ 'id': menus[0].id,
+ 'title': menus[0].title,
+ 'icon': menus[0].icon,
+ 'img': menus[0].img,
+ 'desc': menus[0].desc,
+ 'dialog': menus[0].describe
+ })
+ return res
--
Gitblit v1.8.0