refac
Co-Authored-By: Classic298 <27028174+Classic298@users.noreply.github.com>
This commit is contained in:
1 parent
7abe11346a
commit
4807866a1c
2 files changed
+76
-58
No files matched your search
@@ -169,20 +169,37 @@ class ToolsTable:
|
|||||||
for tool in tools
|
for tool in tools
|
||||||
}
|
}
|
||||||
|
|
||||||
async def get_tools(self, defer_content: bool = False, db: AsyncSession | None = None) -> list[ToolUserModel]:
|
async def get_tools(
|
||||||
|
self,
|
||||||
|
defer_content: bool = False,
|
||||||
|
db: AsyncSession | None = None,
|
||||||
|
user_id: str | None = None,
|
||||||
|
user_group_ids: set[str] | None = None,
|
||||||
|
permission: str = 'read',
|
||||||
|
) -> list[ToolUserModel]:
|
||||||
async with get_async_db_context(db) as db:
|
async with get_async_db_context(db) as db:
|
||||||
if defer_content:
|
# Skip Tool.content (plugin source, potentially large) via a
|
||||||
# Skip Tool.content (plugin source, potentially large) via a
|
# column select; Row attributes satisfy from_attributes.
|
||||||
# column select; Row attributes satisfy from_attributes.
|
stmt = (
|
||||||
result = await db.execute(
|
select(Tool.id, Tool.user_id, Tool.name, Tool.specs, Tool.meta, Tool.updated_at, Tool.created_at)
|
||||||
select(
|
if defer_content
|
||||||
Tool.id, Tool.user_id, Tool.name, Tool.specs, Tool.meta, Tool.updated_at, Tool.created_at
|
else select(Tool)
|
||||||
).order_by(Tool.updated_at.desc())
|
).order_by(Tool.updated_at.desc())
|
||||||
|
|
||||||
|
if user_id is not None:
|
||||||
|
if user_group_ids is None:
|
||||||
|
user_group_ids = {group.id for group in await Groups.get_groups_by_member_id(user_id, db=db)}
|
||||||
|
stmt = AccessGrants.has_permission_filter(
|
||||||
|
db=db,
|
||||||
|
query=stmt,
|
||||||
|
DocumentModel=Tool,
|
||||||
|
filter={'user_id': user_id, 'group_ids': user_group_ids},
|
||||||
|
resource_type='tool',
|
||||||
|
permission=permission,
|
||||||
)
|
)
|
||||||
all_tools = result.all()
|
|
||||||
else:
|
result = await db.execute(stmt)
|
||||||
result = await db.execute(select(Tool).order_by(Tool.updated_at.desc()))
|
all_tools = result.all() if defer_content else result.scalars().all()
|
||||||
all_tools = result.scalars().all()
|
|
||||||
|
|
||||||
user_ids = list(set(tool.user_id for tool in all_tools))
|
user_ids = list(set(tool.user_id for tool in all_tools))
|
||||||
tool_ids = [tool.id for tool in all_tools]
|
tool_ids = [tool.id for tool in all_tools]
|
||||||
@@ -217,20 +234,15 @@ class ToolsTable:
|
|||||||
defer_content: bool = False,
|
defer_content: bool = False,
|
||||||
db: AsyncSession | None = None,
|
db: AsyncSession | None = None,
|
||||||
) -> list[ToolUserModel]:
|
) -> list[ToolUserModel]:
|
||||||
tools = await self.get_tools(defer_content=defer_content, db=db)
|
|
||||||
user_groups = await Groups.get_groups_by_member_id(user_id, db=db)
|
user_groups = await Groups.get_groups_by_member_id(user_id, db=db)
|
||||||
user_group_ids = {group.id for group in user_groups}
|
user_group_ids = {group.id for group in user_groups}
|
||||||
|
return await self.get_tools(
|
||||||
# One grants query for all non-owned tools instead of one per tool
|
defer_content=defer_content,
|
||||||
accessible_ids = await AccessGrants.get_accessible_resource_ids(
|
|
||||||
user_id=user_id,
|
|
||||||
resource_type='tool',
|
|
||||||
resource_ids=[tool.id for tool in tools if tool.user_id != user_id],
|
|
||||||
permission=permission,
|
|
||||||
user_group_ids=user_group_ids,
|
|
||||||
db=db,
|
db=db,
|
||||||
|
user_id=user_id,
|
||||||
|
user_group_ids=user_group_ids,
|
||||||
|
permission=permission,
|
||||||
)
|
)
|
||||||
return [tool for tool in tools if tool.user_id == user_id or tool.id in accessible_ids]
|
|
||||||
|
|
||||||
async def get_tool_valves_by_id(self, id: str, db: AsyncSession | None = None) -> dict | None:
|
async def get_tool_valves_by_id(self, id: str, db: AsyncSession | None = None) -> dict | None:
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -71,11 +71,22 @@ async def get_tools(
|
|||||||
db: AsyncSession = Depends(get_async_session),
|
db: AsyncSession = Depends(get_async_session),
|
||||||
):
|
):
|
||||||
tools = []
|
tools = []
|
||||||
|
bypass_access_control = user.role == 'admin' and BYPASS_ADMIN_ACCESS_CONTROL
|
||||||
|
user_group_ids = (
|
||||||
|
set()
|
||||||
|
if bypass_access_control
|
||||||
|
else {group.id for group in await Groups.get_groups_by_member_id(user.id, db=db)}
|
||||||
|
)
|
||||||
|
|
||||||
# Local Tools
|
# Local Tools
|
||||||
if ENABLE_PLUGINS:
|
if ENABLE_PLUGINS:
|
||||||
tools_cache = get_tools_cache(request)
|
tools_cache = get_tools_cache(request)
|
||||||
for tool in await Tools.get_tools(defer_content=True, db=db):
|
for tool in await Tools.get_tools(
|
||||||
|
defer_content=True,
|
||||||
|
db=db,
|
||||||
|
user_id=None if bypass_access_control else user.id,
|
||||||
|
user_group_ids=user_group_ids,
|
||||||
|
):
|
||||||
tool_module = tools_cache.get(tool.id)
|
tool_module = tools_cache.get(tool.id)
|
||||||
has_user_valves = (
|
has_user_valves = (
|
||||||
hasattr(tool_module, 'UserValves')
|
hasattr(tool_module, 'UserValves')
|
||||||
@@ -166,31 +177,19 @@ async def get_tools(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
if not (user.role == 'admin' and BYPASS_ADMIN_ACCESS_CONTROL):
|
if not bypass_access_control:
|
||||||
user_group_ids = {group.id for group in await Groups.get_groups_by_member_id(user.id, db=db)}
|
tools = [
|
||||||
filtered_tools = []
|
tool
|
||||||
for tool in tools:
|
for tool in tools
|
||||||
if tool.user_id == user.id:
|
if not str(tool.id).startswith('server:')
|
||||||
filtered_tools.append(tool)
|
or await has_access(
|
||||||
elif str(tool.id).startswith('server:'):
|
user.id,
|
||||||
if await has_access(
|
'read',
|
||||||
user.id,
|
server_access_grants.get(str(tool.id), []),
|
||||||
'read',
|
user_group_ids,
|
||||||
server_access_grants.get(str(tool.id), []),
|
|
||||||
user_group_ids,
|
|
||||||
db=db,
|
|
||||||
):
|
|
||||||
filtered_tools.append(tool)
|
|
||||||
elif await AccessGrants.has_access(
|
|
||||||
user_id=user.id,
|
|
||||||
resource_type='tool',
|
|
||||||
resource_id=tool.id,
|
|
||||||
permission='read',
|
|
||||||
user_group_ids=user_group_ids,
|
|
||||||
db=db,
|
db=db,
|
||||||
):
|
)
|
||||||
filtered_tools.append(tool)
|
]
|
||||||
tools = filtered_tools
|
|
||||||
|
|
||||||
if query:
|
if query:
|
||||||
q = query.casefold()
|
q = query.casefold()
|
||||||
@@ -209,17 +208,23 @@ async def get_tool_list(user=Depends(get_verified_user), db: AsyncSession = Depe
|
|||||||
if not ENABLE_PLUGINS:
|
if not ENABLE_PLUGINS:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
if user.role == 'admin' and BYPASS_ADMIN_ACCESS_CONTROL:
|
bypass_access_control = user.role == 'admin' and BYPASS_ADMIN_ACCESS_CONTROL
|
||||||
tools = await Tools.get_tools(defer_content=True, db=db)
|
user_group_ids = (
|
||||||
else:
|
set()
|
||||||
tools = await Tools.get_tools_by_user_id(user.id, 'read', defer_content=True, db=db)
|
if bypass_access_control
|
||||||
|
else {group.id for group in await Groups.get_groups_by_member_id(user.id, db=db)}
|
||||||
user_group_ids = {group.id for group in await Groups.get_groups_by_member_id(user.id, db=db)}
|
)
|
||||||
|
tools = await Tools.get_tools(
|
||||||
|
defer_content=True,
|
||||||
|
db=db,
|
||||||
|
user_id=None if bypass_access_control else user.id,
|
||||||
|
user_group_ids=user_group_ids,
|
||||||
|
)
|
||||||
|
|
||||||
result = []
|
result = []
|
||||||
for tool in tools:
|
for tool in tools:
|
||||||
has_write = (
|
has_write = (
|
||||||
(user.role == 'admin' and BYPASS_ADMIN_ACCESS_CONTROL)
|
bypass_access_control
|
||||||
or user.id == tool.user_id
|
or user.id == tool.user_id
|
||||||
or any(
|
or any(
|
||||||
g.permission == 'write'
|
g.permission == 'write'
|
||||||
@@ -334,10 +339,11 @@ async def export_tools(
|
|||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
||||||
)
|
)
|
||||||
|
|
||||||
if user.role == 'admin' and BYPASS_ADMIN_ACCESS_CONTROL:
|
bypass_access_control = user.role == 'admin' and BYPASS_ADMIN_ACCESS_CONTROL
|
||||||
return await Tools.get_tools(db=db)
|
return await Tools.get_tools(
|
||||||
else:
|
db=db,
|
||||||
return await Tools.get_tools_by_user_id(user.id, 'read', db=db)
|
user_id=None if bypass_access_control else user.id,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
############################
|
############################
|
||||||
|
|||||||
Reference in new issue
Block a user