Skip to content

Commit 4c41a40

Browse files
committed
feat: add user role permissions to workspace operations
1 parent c8a5048 commit 4c41a40

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

apps/models_provider/views/model.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class ModelSetting(APIView):
6565
request=ModelCreateAPI.get_request(),
6666
responses=ModelCreateAPI.get_response())
6767
@has_permissions(PermissionConstants.MODEL_CREATE.get_workspace_permission(),
68-
RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
68+
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
6969
@log(menu='model', operate='Create model',
7070
get_operation_object=lambda r, k: {'name': r.date.get('name')},
7171
get_details=get_edit_model_details,
@@ -95,7 +95,7 @@ def post(self, request: Request, workspace_id: str):
9595
responses=ModelListResponse.get_response(),
9696
tags=[_('Model')]) # type: ignore
9797
@has_permissions(PermissionConstants.MODEL_READ.get_workspace_permission(),
98-
RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
98+
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
9999
def get(self, request: Request, workspace_id: str):
100100
return result.success(
101101
ModelSerializer.Query(
@@ -114,7 +114,7 @@ class Operate(APIView):
114114
responses=ModelEditApi.get_response(),
115115
tags=[_('Model')]) # type: ignore
116116
@has_permissions(PermissionConstants.MODEL_EDIT.get_workspace_permission(),
117-
RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
117+
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
118118
@log(menu='model', operate='Update model',
119119
get_operation_object=lambda r, k: get_model_operation_object(k.get('model_id')),
120120
get_details=get_edit_model_details,
@@ -133,7 +133,7 @@ def put(self, request: Request, workspace_id, model_id: str):
133133
responses=DefaultModelResponse.get_response(),
134134
tags=[_('Model')]) # type: ignore
135135
@has_permissions(PermissionConstants.MODEL_DELETE.get_workspace_permission(),
136-
RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
136+
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
137137
@log(menu='model', operate='Delete model',
138138
get_operation_object=lambda r, k: get_model_operation_object(k.get('model_id')),
139139
)
@@ -150,7 +150,7 @@ def delete(self, request: Request, workspace_id: str, model_id: str):
150150
responses=GetModelApi.get_response(),
151151
tags=[_('Model')]) # type: ignore
152152
@has_permissions(PermissionConstants.MODEL_READ.get_workspace_permission(),
153-
RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
153+
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
154154
def get(self, request: Request, workspace_id: str, model_id: str):
155155
return result.success(
156156
ModelSerializer.Operate(
@@ -168,7 +168,7 @@ class ModelParamsForm(APIView):
168168
responses=ProvideApi.ModelParamsForm.get_response(),
169169
tags=[_('Model')]) # type: ignore
170170
@has_permissions(PermissionConstants.MODEL_READ.get_workspace_permission(),
171-
RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
171+
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
172172
def get(self, request: Request, workspace_id: str, model_id: str):
173173
return result.success(
174174
ModelSerializer.ModelParams(data={'id': model_id}).get_model_params())
@@ -182,7 +182,7 @@ def get(self, request: Request, workspace_id: str, model_id: str):
182182
responses=ProvideApi.ModelParamsForm.get_response(),
183183
tags=[_('Model')]) # type: ignore
184184
@has_permissions(PermissionConstants.MODEL_READ.get_workspace_permission(),
185-
RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
185+
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
186186
@log(menu='model', operate='Save model parameter form',
187187
get_operation_object=lambda r, k: get_model_operation_object(k.get('model_id')),
188188
)
@@ -204,7 +204,7 @@ class ModelMeta(APIView):
204204
responses=GetModelApi.get_response(),
205205
tags=[_('Model')]) # type: ignore
206206
@has_permissions(PermissionConstants.MODEL_READ.get_workspace_permission(),
207-
RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
207+
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
208208
def get(self, request: Request, workspace_id: str, model_id: str):
209209
return result.success(
210210
ModelSerializer.Operate(data={'id': model_id, 'workspace_id': workspace_id}).one_meta(with_valid=True))
@@ -221,7 +221,7 @@ class PauseDownload(APIView):
221221
responses=DefaultModelResponse.get_response(),
222222
tags=[_('Model')]) # type: ignore
223223
@has_permissions(PermissionConstants.MODEL_CREATE.get_workspace_permission(),
224-
RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
224+
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
225225
def put(self, request: Request, workspace_id: str, model_id: str):
226226
return result.success(
227227
ModelSerializer.Operate(data={'id': model_id, 'workspace_id': workspace_id}).pause_download())
@@ -239,7 +239,7 @@ class SharedModel(APIView):
239239
responses=ModelListResponse.get_response(),
240240
tags=[_('Shared Model')]
241241
) # type: ignore
242-
@has_permissions(PermissionConstants.MODEL_READ, RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
242+
@has_permissions(PermissionConstants.MODEL_READ, RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role())
243243
def get(self, request: Request, workspace_id: str):
244244
return result.success(
245245
SharedModelSerializer(data={'workspace_id': workspace_id}).get_share_model_list())

0 commit comments

Comments
 (0)