Skip to content

fix: Model permission of workspace manager #3496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhanweizhang7 merged 1 commit into from
Jul 7, 2025
Merged

fix: Model permission of workspace manager #3496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions apps/models_provider/views/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class ModelSetting(APIView):
request=ModelCreateAPI.get_request(),
responses=ModelCreateAPI.get_response())
@has_permissions(PermissionConstants.MODEL_CREATE.get_workspace_permission(),
PermissionConstants.MODEL_EDIT.get_workspace_permission_workspace_manage_role(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
@log(menu='model', operate='Create model',
get_operation_object=lambda r, k: {'name': r.date.get('name')},
Expand Down Expand Up @@ -97,6 +98,7 @@ def post(self, request: Request, workspace_id: str):
responses=ModelListResponse.get_response(),
tags=[_('Model')]) # type: ignore
@has_permissions(PermissionConstants.MODEL_READ.get_workspace_permission(),
PermissionConstants.MODEL_READ.get_workspace_permission_workspace_manage_role(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
def get(self, request: Request, workspace_id: str):
return result.success(
Expand All @@ -116,8 +118,9 @@ class Operate(APIView):
parameters=GetModelApi.get_parameters(),
responses=ModelEditApi.get_response(),
tags=[_('Model')]) # type: ignore
@has_permissions(PermissionConstants.MODEL_EDIT.get_workspace_permission(),
@has_permissions(PermissionConstants.MODEL_EDIT.get_workspace_model_permission(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
PermissionConstants.MODEL_EDIT.get_workspace_permission_workspace_manage_role(),
ViewPermission([RoleConstants.USER.get_workspace_role()],
[PermissionConstants.MODEL.get_workspace_model_permission()],
CompareConstants.AND),)
Expand All @@ -139,6 +142,7 @@ def put(self, request: Request, workspace_id, model_id: str):
responses=DefaultModelResponse.get_response(),
tags=[_('Model')]) # type: ignore
@has_permissions(PermissionConstants.MODEL_DELETE.get_workspace_model_permission(),
PermissionConstants.MODEL_DELETE.get_workspace_permission_workspace_manage_role(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), ViewPermission([RoleConstants.USER.get_workspace_role()],
[PermissionConstants.MODEL.get_workspace_model_permission()],
CompareConstants.AND),)
Expand All @@ -158,6 +162,7 @@ def delete(self, request: Request, workspace_id: str, model_id: str):
responses=GetModelApi.get_response(),
tags=[_('Model')]) # type: ignore
@has_permissions(PermissionConstants.MODEL_READ.get_workspace_model_permission(),
PermissionConstants.MODEL_READ.get_workspace_permission_workspace_manage_role(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), ViewPermission([RoleConstants.USER.get_workspace_role()],
[PermissionConstants.MODEL.get_workspace_model_permission()],
CompareConstants.AND),)
Expand All @@ -178,6 +183,7 @@ class ModelParamsForm(APIView):
responses=ProvideApi.ModelParamsForm.get_response(),
tags=[_('Model')]) # type: ignore
@has_permissions(PermissionConstants.MODEL_READ.get_workspace_model_permission(),
PermissionConstants.MODEL_READ.get_workspace_permission_workspace_manage_role(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), ViewPermission([RoleConstants.USER.get_workspace_role()],
[PermissionConstants.MODEL.get_workspace_model_permission()],
CompareConstants.AND),)
Expand All @@ -193,7 +199,8 @@ def get(self, request: Request, workspace_id: str, model_id: str):
request=GetModelApi.get_request(),
responses=ProvideApi.ModelParamsForm.get_response(),
tags=[_('Model')]) # type: ignore
@has_permissions(PermissionConstants.MODEL_READ.get_workspace_model_permission(),
@has_permissions(PermissionConstants.MODEL_EDIT.get_workspace_model_permission(),
PermissionConstants.MODEL_EDIT.get_workspace_permission_workspace_manage_role(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), ViewPermission([RoleConstants.USER.get_workspace_role()],
[PermissionConstants.MODEL.get_workspace_model_permission()],
CompareConstants.AND),)
Expand All @@ -218,6 +225,7 @@ class ModelMeta(APIView):
responses=GetModelApi.get_response(),
tags=[_('Model')]) # type: ignore
@has_permissions(PermissionConstants.MODEL_READ.get_workspace_model_permission(),
PermissionConstants.MODEL_READ.get_workspace_permission_workspace_manage_role(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), ViewPermission([RoleConstants.USER.get_workspace_role()],
[PermissionConstants.MODEL.get_workspace_model_permission()],
CompareConstants.AND),)
Expand All @@ -237,6 +245,7 @@ class PauseDownload(APIView):
responses=DefaultModelResponse.get_response(),
tags=[_('Model')]) # type: ignore
@has_permissions(PermissionConstants.MODEL_CREATE.get_workspace_model_permission(),
PermissionConstants.MODEL_CREATE.get_workspace_permission_workspace_manage_role(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), ViewPermission([RoleConstants.USER.get_workspace_role()],
[PermissionConstants.MODEL.get_workspace_model_permission()],
CompareConstants.AND),)
Expand All @@ -259,6 +268,7 @@ class WorkspaceSharedModelSetting(APIView):
) # type: ignore
@has_permissions(
PermissionConstants.MODEL_READ.get_workspace_permission(),
PermissionConstants.MODEL_READ.get_workspace_permission_workspace_manage_role(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
RoleConstants.USER.get_workspace_role(),
)
Expand Down
Loading