From 057f034d4cd728c1bd0284e7c6b4a47739d5220d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 12 十二月 2024 19:57:41 +0800
Subject: [PATCH] yonghu
---
app/service/user.py | 98 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 82 insertions(+), 16 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index 21d2869..a86047f 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -2,18 +2,19 @@
from datetime import datetime
from app.api import pwd_context
+from app.api.dialog import dialog_list
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 import RoleModel, GroupModel, AgentType, role_resource_table, DialogModel
from app.models.menu_model import WebMenuModel, MenuCapacityModel
-from app.models.user_model import UserModel
+from app.models.user_model import UserModel, UserAppModel
from Log import logger
from app.service.auth import UserAppDao
from app.service.bisheng import BishengService
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
+from app.service.service_token import get_ragflow_token, get_bisheng_token, get_new_token, get_dify_token
async def get_user_list(db, page_index: int, page_size: int, keyword: str, role_key: str, user_id):
@@ -21,7 +22,7 @@
# if role_key != "admin":
# query.filter(UserModel.creator==user_id)
if keyword:
- query = query.filter(UserModel.group_name.like('%{}%'.format(keyword)))
+ query = query.filter(UserModel.username.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]}
@@ -69,19 +70,21 @@
# return False
app_register = AppRegisterDao(db).get_apps()
register_dict = {}
+ token = ""
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:
+ token = await get_dify_token()
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)
+ register_info = await service.register(name, password, token)
# print(register_info)
register_dict[app['id']] = {"id": register_info.get("id"), "name": name,
"email": register_info.get("email")}
@@ -132,13 +135,13 @@
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="basic123456"):
try:
user = db.query(UserModel).filter(UserModel.id == user_id).first()
pwd = user.decrypted_password()
for app in AppRegisterDao(db).get_apps():
if app.get("id") == RAGFLOW:
- token = await get_ragflow_new_token(db, user_id, 1)
+ token = await get_new_token(db, user_id, app.get("id"))
ragflow_service = RagflowService(settings.fwr_base_url)
await ragflow_service.set_user_password(token, pwd, new_password)
elif app.get("id") == BISHENG:
@@ -147,10 +150,8 @@
await bisheng_service.change_password_public(token, user.username, pwd, new_password)
else:
logger.error("娉ㄥ唽鏈煡搴旂敤锛歿}".format(app.get("id")))
- # hashed_password = pwd_context.hash(password)
- hashed_password = user.encrypted_password(new_password)
-
- user.password = hashed_password
+ user.hashed_password = pwd_context.hash(new_password)
+ user.password = user.encrypted_password(new_password)
db.commit()
except Exception as e:
logger.error(e)
@@ -176,7 +177,7 @@
if parent_ogt.id not in dept_set:
await role_resource(role_set, roles, permissions, parent_ogt.roles)
dept_set.add(parent_ogt.id)
- parent_ogt = parent_ogt.parent
+ parent_ogt = parent_ogt.parent
if user.permission == "admin":
permissions = ["*:*:*"]
@@ -222,7 +223,7 @@
if parent_ogt.id not in dept_set:
await role_resource(role_set, permissions, parent_ogt.roles)
dept_set.add(parent_ogt.id)
- parent_ogt = parent_ogt.parent
+ parent_ogt = parent_ogt.parent
tmp_dit = {}
for permission in permissions.values():
tmp_dit[permission["parentId"]] = tmp_dit.get(permission["parentId"], []) + [permission]
@@ -247,8 +248,9 @@
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()
+ WebMenuModel.img, MenuCapacityModel.capacity_id, MenuCapacityModel.capacity_type, DialogModel.agent_id.label("agentId")).outerjoin(
+ MenuCapacityModel, WebMenuModel.id == MenuCapacityModel.menu_id).outerjoin(
+ DialogModel, MenuCapacityModel.capacity_id == DialogModel.id).filter(DialogModel.status=="1").all()
for menu in menu_list:
menu_dict[menu.id] = menu_dict.get(menu.id, []) + [menu]
@@ -269,6 +271,70 @@
'icon': menus[0].icon,
'img': menus[0].img,
'desc': menus[0].desc,
- 'dialog': menus[0].describe
+ 'dialog': menus[0].describe,
+ 'agentId': menus[0].agentId
})
return res
+
+
+async def get_user_permission(db, user_id):
+ res = {}
+ permissions = {}
+ role_set = set()
+ dept_set = set()
+ agent_dict = {}
+ knowledge_dict = {}
+ user = db.query(UserModel).filter_by(id=user_id).first()
+ parent_id = ""
+ print(111111111111111)
+ async def role_resource(role_set, permissions, roles):
+ nonlocal parent_id
+ for role in roles:
+ if role.id not in role_set:
+ role_set.add(role.id)
+
+ for r in role.resources:
+ if r.resource_type_id != "1":
+ if not r.resource_id:
+ parent_id = r.id
+ continue
+ permissions[r.id] = r.to_router_dict()
+
+ await role_resource(role_set, permissions, user.roles)
+ for ogt in user.organizations:
+ if ogt.roles:
+ await role_resource(role_set, permissions, user.roles)
+ parent_ogt = ogt.parent
+ while parent_ogt:
+
+ if parent_ogt.id not in dept_set:
+ await role_resource(role_set, permissions, parent_ogt.roles)
+ dept_set.add(parent_ogt.id)
+
+ parent_ogt = parent_ogt.parent
+
+ tmp_dit = {}
+ for permission in permissions.values():
+ 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
+
+ res["menus"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
+ for group in user.groups:
+ for klg in group.knowledges:
+ knowledge_dict[klg.id] = klg.to_json()
+ for dialog in group.dialogs:
+ agent_dict[dialog.id] = dialog.to_json()
+ res["knowledge"] = list(knowledge_dict.values())
+ res["dialog"] = list(agent_dict.values())
+ return res
+
+
+async def get_user_dept(db, user_id):
+ res = {}
+ user = db.query(UserModel).filter_by(id=user_id).first()
+ res["rows"] = [i.to_dict() for i in user.organizations]
+ return res
\ No newline at end of file
--
Gitblit v1.8.0