refac
This commit is contained in:
@@ -337,7 +337,7 @@ async def get_all_models(request, refresh: bool = False, user: UserModel = None)
|
|||||||
return models
|
return models
|
||||||
|
|
||||||
|
|
||||||
def check_model_access(user, model):
|
def check_model_access(user, model, db=None):
|
||||||
if model.get("arena"):
|
if model.get("arena"):
|
||||||
if not has_access(
|
if not has_access(
|
||||||
user.id,
|
user.id,
|
||||||
@@ -345,16 +345,17 @@ def check_model_access(user, model):
|
|||||||
access_control=model.get("info", {})
|
access_control=model.get("info", {})
|
||||||
.get("meta", {})
|
.get("meta", {})
|
||||||
.get("access_control", {}),
|
.get("access_control", {}),
|
||||||
|
db=db,
|
||||||
):
|
):
|
||||||
raise Exception("Model not found")
|
raise Exception("Model not found")
|
||||||
else:
|
else:
|
||||||
model_info = Models.get_model_by_id(model.get("id"))
|
model_info = Models.get_model_by_id(model.get("id"), db=db)
|
||||||
if not model_info:
|
if not model_info:
|
||||||
raise Exception("Model not found")
|
raise Exception("Model not found")
|
||||||
elif not (
|
elif not (
|
||||||
user.id == model_info.user_id
|
user.id == model_info.user_id
|
||||||
or has_access(
|
or has_access(
|
||||||
user.id, type="read", access_control=model_info.access_control
|
user.id, type="read", access_control=model_info.access_control, db=db
|
||||||
)
|
)
|
||||||
):
|
):
|
||||||
raise Exception("Model not found")
|
raise Exception("Model not found")
|
||||||
@@ -373,7 +374,9 @@ def get_filtered_models(models, user, db=None):
|
|||||||
}
|
}
|
||||||
|
|
||||||
filtered_models = []
|
filtered_models = []
|
||||||
user_group_ids = {group.id for group in Groups.get_groups_by_member_id(user.id, db=db)}
|
user_group_ids = {
|
||||||
|
group.id for group in Groups.get_groups_by_member_id(user.id, db=db)
|
||||||
|
}
|
||||||
for model in models:
|
for model in models:
|
||||||
if model.get("arena"):
|
if model.get("arena"):
|
||||||
if has_access(
|
if has_access(
|
||||||
|
|||||||
Reference in New Issue
Block a user