rag-gateway.git

			@@ -1,24 +1,15 @@
			import time
			import uuid
			from datetime import datetime
			from traceback import print_tb

			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, USER_STATSU_DELETE, ROLE_STATUS_ON, DEPT_STATUS_ON, \
			Dialog_STATSU_ON
			Dialog_STATSU_ON, USER_STATSU_ON
			from app.models import RoleModel, GroupModel, AgentType, role_resource_table, DialogModel, OrganizationModel, \
			ResourceModel
			from app.models.menu_model import WebMenuModel, MenuCapacityModel
			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_new_token, get_dify_token
			from app.utils.password_handle import generate_password



			async def get_user_list(db, page_index: int, page_size: int, keyword: str, role_key: str, user_id):
			@@ -57,10 +48,13 @@

			async def create_user(db, user_name, email, phone, login_name, password, roles, groups, user_id):
			try:
			app_register = AppRegisterDao(db).get_apps()

			register_dict = {}
			token = ""

			"""
			app_password = await generate_password()
			app_register = AppRegisterDao(db).get_apps()
			for app in app_register:
			if app["id"] == RAGFLOW:
			service = RagflowService(settings.fwr_base_url)
			@@ -81,37 +75,37 @@
			except Exception as e:
			logger.error(e)
			return False

			"""
			# 存储用户信息
			hashed_password = pwd_context.hash(password)

			sync_flag = str(uuid.uuid4())
			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(app_password)
			phone=phone, login_name=login_name,sync_flag=sync_flag)
			# pwd = user_model.encrypted_password(app_password)
			# user_model.password = pwd
			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
			user_app_dao = UserAppDao(db)
			for k, v in register_dict.items():
			await user_app_dao.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()
			return False
			return True
			return ''
			return sync_flag


			async def edit_user_data(db, user_id, email, phone, login_name, roles, groups):
			try:
			print(121221)
			print(roles)
			user = db.query(UserModel).filter(UserModel.id == user_id).first()
			user.email = email
			user.phone = phone
			@@ -119,9 +113,8 @@
			user.email = email
			user.updated_at = datetime.now()
			user.roles = [db.get(RoleModel, roleId) for roleId in roles]
			# user.groups = [db.get(GroupModel, groupId) for groupId in groups]
			user.groups = [db.get(GroupModel, groupId) for groupId in groups]
			db.commit()
			print(4343)
			except Exception as e:
			logger.error(e)
			db.rollback()
			@@ -132,20 +125,7 @@
			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_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:
			# 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.get("id")))
			user.hashed_password = pwd_context.hash(new_password)
			# user.password = user.encrypted_password(new_password)
			db.commit()
			except Exception as e:
			logger.error(e)
			@@ -231,12 +211,9 @@

			await role_resource(role_set, permissions, user.roles)
			for ogt in user.organizations:
			print(ogt.name)
			if ogt.status != DEPT_STATUS_ON:
			continue
			print(ogt.name)
			if ogt.roles:
			print(9877)
			await role_resource(role_set, permissions,ogt.roles)
			parent_ogt = ogt.parent
			while parent_ogt:
			@@ -248,8 +225,6 @@
			break
			# print(permissions.keys())
			def get_parent(parent, permissions):
			# print(parent.id)
			# nonlocal permissions
			if parent.id not in permissions:

			permissions[parent.id] = parent # .to_router_dict()
			@@ -294,7 +269,7 @@
			menu_list = db.query(WebMenuModel.id, WebMenuModel.title, WebMenuModel.describe, WebMenuModel.icon, WebMenuModel.desc,WebMenuModel.rank,
			WebMenuModel.img, MenuCapacityModel.capacity_id, MenuCapacityModel.capacity_type, MenuCapacityModel.chat_id.label("agentId"), MenuCapacityModel.chat_type).outerjoin(
			MenuCapacityModel, WebMenuModel.id == MenuCapacityModel.menu_id).outerjoin(
			DialogModel, MenuCapacityModel.capacity_id == DialogModel.id).filter(DialogModel.status=="1").all()
			DialogModel, MenuCapacityModel.capacity_id == DialogModel.id).filter(DialogModel.status==USER_STATSU_ON).all()

			for menu in menu_list:
			menu_dict[menu.id] = menu_dict.get(menu.id, []) + [menu]
			@@ -331,8 +306,8 @@
			knowledge_dict = {}
			user = db.query(UserModel).filter_by(id=user_id).first()
			parent_id = ""
			# print(111111111111111)
			async def role_resource(role_set, permissions, roles):

			async def role_resource_type(role_set, permissions, roles, type):
			nonlocal parent_id
			for role in roles:
			if role.id not in role_set:
			@@ -340,34 +315,24 @@

			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()
			permission_dict = r.to_router_dict()
			permission_dict["type"] = type
			permissions[r.id] = permission_dict

			await role_resource(role_set, permissions, user.roles)
			await role_resource_type(role_set, permissions, user.roles, "user")
			for ogt in user.organizations:
			if ogt.roles:
			await role_resource(role_set, permissions, ogt.roles)
			await role_resource_type(role_set, permissions, ogt.roles, "org")
			parent_ogt = ogt.parent
			while parent_ogt:

			if parent_ogt.id not in dept_set:
			await role_resource(role_set, permissions, parent_ogt.roles)
			await role_resource_type(role_set, permissions, parent_ogt.roles, "org")
			dept_set.add(parent_ogt.id)

			parent_ogt = parent_ogt.parent
			else:
			break

			# 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, [])]
			res["menus"] = list(permissions.values())
			@@ -384,7 +349,7 @@
			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]
			res["rows"] = [i.to_dict() for i in user.organizations if i.status == DEPT_STATUS_ON]
			return res