jyapayne/dify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix dataset operator (#6064)

Browse source 
Co-authored-by: JzoNg <jzongcode@gmail.com>
This commit is contained in:
Joe 2024-07-09 17:47:54 +08:00 • committed by GitHub
commit ce930f19b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
46 changed files with 1072 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

22
api/services/account_service.py
View file

@ -369,6 +369,28 @@ class TenantService:
return updated_accounts
@staticmethod
def get_dataset_operator_members(tenant: Tenant) -> list[Account]:
"""Get dataset admin members"""
query = (
db.session.query(Account, TenantAccountJoin.role)
.select_from(Account)
.join(
TenantAccountJoin, Account.id == TenantAccountJoin.account_id
)
.filter(TenantAccountJoin.tenant_id == tenant.id)
.filter(TenantAccountJoin.role == 'dataset_operator')
)
# Initialize an empty list to store the updated accounts
updated_accounts = []
for account, role in query:
account.role = role
updated_accounts.append(account)
return updated_accounts
@staticmethod
def has_roles(tenant: Tenant, roles: list[TenantAccountJoinRole]) -> bool:
"""Check if user has any of the given roles for a tenant"""