Fixes to the sqlalchemy adapter
This commit is contained in:
parent
9a2cde95d0
commit
6035010036
3 changed files with 12 additions and 11 deletions
|
|
@ -1,11 +1,12 @@
|
|||
from sqlalchemy.orm import joinedload
|
||||
|
||||
from cognee.modules.users.models import User
|
||||
from cognee.infrastructure.databases.relational import get_relational_engine
|
||||
|
||||
from sqlalchemy.future import select
|
||||
|
||||
async def get_default_user(session):
|
||||
|
||||
stmt = select(User).where(User.email == "default_user@example.com")
|
||||
stmt = select(User).options(joinedload(User.groups)).where(User.email == "default_user@example.com")
|
||||
result = await session.execute(stmt)
|
||||
user = result.scalars().first()
|
||||
return user
|
||||
|
|
@ -24,7 +24,7 @@ class User(SQLAlchemyBaseUserTableUUID, Principal):
|
|||
from fastapi_users import schemas
|
||||
|
||||
class UserRead(schemas.BaseUser[uuid_UUID]):
|
||||
pass
|
||||
groups: list[uuid_UUID] # Add groups attribute
|
||||
|
||||
class UserCreate(schemas.BaseUserCreate):
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -15,18 +15,18 @@ class PermissionDeniedException(Exception):
|
|||
|
||||
|
||||
async def check_permissions_on_documents(user: User, permission_type: str, document_ids: list[str], session):
|
||||
|
||||
logging.info("This is the user: %s", user.__dict__)
|
||||
try:
|
||||
user_group_ids = [group.id for group in user.groups]
|
||||
|
||||
result = await session.execute(
|
||||
select(ACL).filter(
|
||||
ACL.principal_id.in_([user.id, *user_group_ids]),
|
||||
ACL.permission.name == permission_type
|
||||
)
|
||||
acls = await session.execute(
|
||||
select(ACL)
|
||||
.join(ACL.permission)
|
||||
.where(ACL.principal_id.in_([user.id, *user_group_ids]))
|
||||
.where(ACL.permission.has(name=permission_type))
|
||||
)
|
||||
acls = result.scalars().all()
|
||||
|
||||
resource_ids = [resource.resource_id for acl in acls for resource in acl.resources]
|
||||
resource_ids = [resource.resource_id for acl in acls.scalars().all() for resource in acl.resources]
|
||||
has_permissions = all(document_id in resource_ids for document_id in document_ids)
|
||||
|
||||
if not has_permissions:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue