fix: fix CRUD

mlflow_oidc_auth/views.py

@@ -53,6 +53,12 @@
 _logger = logging.getLogger(__name__)
 
 
+def _get_experiment_id(request_data: dict) -> str:
+    experiment_id = request_data.get("experiment_id")
+    if "experiment_id" not in request_data:
+        experiment_id = mlflow_client.get_experiment_by_name(request_data.get("experiment_name")).experiment_id
+    return experiment_id
+
 def _get_request_param(param: str) -> str:
     if request.method == "GET":
         args = request.args
@@ -208,16 +214,12 @@ def make_basic_auth_response() -> Response:
 
 def create_experiment_permission():
     request_data = request.get_json()
-    # Get the experiment
-    experiment = mlflow_client.get_experiment_by_name(request_data.get("experiment_name"))
-
-    # # Update the experiment
     store.create_experiment_permission(
-        experiment.experiment_id,
+        _get_experiment_id(request_data),
         request_data.get("user_name"),
         request_data.get("new_permission"),
     )
-    return "Experiment permission has been created."
+    return jsonify({"message": "Experiment permission has been created."})
 
 
 # Experiment views
@@ -517,29 +519,21 @@ def _password_generation():
 
 def update_experiment_permission():
     request_data = request.get_json()
-    # Get the experiment
-    experiment_id = request_data.get("experiment_id", mlflow_client.get_experiment_by_name(request_data.get("experiment_name")).experiment_id)
-
-    # # Update the experiment
     store.update_experiment_permission(
-        experiment_id,
+        _get_experiment_id(request_data),
         request_data.get("user_name"),
         request_data.get("new_permission"),
     )
-    return "Experiment permission has been changed."
+    return jsonify({"message": "Experiment permission has been changed."})
 
 
 def delete_experiment_permission():
     request_data = request.get_json()
-    # Get the experiment
-    experiment = mlflow_client.get_experiment_by_name(request_data.get("experiment_name"))
-
-    # # Update the experiment
     store.delete_experiment_permission(
-        experiment.experiment_id,
+        _get_experiment_id(request_data),
         request_data.get("user_name"),
     )
-    return "Experiment permission has been deleted."
+    return jsonify({"message": "Experiment permission has been deleted."})
 
 
 def create_model_permission():
@@ -550,7 +544,7 @@ def create_model_permission():
         request_data.get("user_name"),
         request_data.get("new_permission"),
     )
-    return "Model permission has been created."
+    return jsonify({"message": "Model permission has been created."})
 
 
 def get_model_permission():
@@ -571,7 +565,7 @@ def update_model_permission():
         request_data.get("user_name"),
         request_data.get("new_permission"),
     )
-    return "Model permission has been changed."
+    return jsonify({"message": "Model permission has been changed."})
 
 
 def delete_model_permission():
@@ -581,4 +575,4 @@ def delete_model_permission():
         request_data.get("model_name"),
         request_data.get("user_name"),
     )
-    return "Model permission has been deleted."
+    return jsonify({"message": "Model permission has been deleted."})

web-ui/src/app/features/admin-page/components/details/experiment-permission-details/experiment-permission-details.component.ts

@@ -60,10 +60,10 @@ export class ExperimentPermissionDetailsComponent implements OnInit {
       .afterClosed()
       .pipe(
         switchMap((data) => this.permissionDataService.updateExperimentPermission({
-          user_name: data.name,
+          user_name: event.username,
           experiment_id: this.experimentId,
           new_permission: data.permission,
-        }) )
+        }))
       )
       .subscribe((data) => {
         console.log(data)
@@ -83,7 +83,8 @@ export class ExperimentPermissionDetailsComponent implements OnInit {
   }
 
   revokePermissionForUser(item: any) {
-    this.permissionDataService.updateExperimentPermission(item.username)
+    this.permissionDataService.deleteExperimentPermission(
+      { experiment_id: this.experimentId, user_name: item.username })
       .subscribe(console.log);
   }
 
@@ -94,7 +95,7 @@ export class ExperimentPermissionDetailsComponent implements OnInit {
           { data: { users } })
           .afterClosed()),
         filter(Boolean),
-        switchMap(({ user, permission }) => this.permissionDataService.updateExperimentPermission({
+        switchMap(({ user, permission }) => this.permissionDataService.createExperimentPermission({
           experiment_id: this.experimentId,
           new_permission: permission,
           user_name: user,

web-ui/src/app/features/admin-page/components/details/model-permission-details/model-permission-details.component.ts

@@ -49,7 +49,9 @@ export class ModelPermissionDetailsComponent implements OnInit {
   }
 
   revokePermissionForUser(item: any) {
-    this.permissionDataService.deleteModelPermission(item.id)
+    this.permissionDataService.deleteModelPermission(
+      { model_name: this.modelId, user_name: item.username }
+    )
       .subscribe(console.log);
   }
 
@@ -102,9 +104,9 @@ export class ModelPermissionDetailsComponent implements OnInit {
           { data: { users } })
           .afterClosed()),
         filter(Boolean),
-        switchMap(({ user }) => this.permissionDataService.updateModelPermission({
+        switchMap(({ user, permission }) => this.permissionDataService.createModelPermission({
           model_name: this.modelId,
-          new_permission: 'edit',
+          new_permission: permission,
           user_name: user,
         })),
         switchMap(() => this.loadUsersForModel(this.modelId)),

web-ui/src/app/features/admin-page/components/details/user-permission-details/user-permission-details.component.ts

@@ -56,7 +56,7 @@ export class UserPermissionDetailsComponent implements OnInit {
             entities: models.map(({ name }) => name),
             userName: this.userId,
           }
-          }).afterClosed()
+        }).afterClosed()
         ),
         filter(Boolean),
         switchMap(({ entity, permission, user }) => this.permissionDataService.createModelPermission({
@@ -77,11 +77,10 @@ export class UserPermissionDetailsComponent implements OnInit {
             entities: experiments.map(({ name }) => name),
             userName: this.userId,
           }
-          }).afterClosed()
+        }).afterClosed()
         ),
         filter(Boolean),
         switchMap(({ entity, permission, user }) => {
-          debugger
           return this.permissionDataService.createExperimentPermission({
             user_name: this.userId,
             experiment_name: entity,

web-ui/src/app/shared/interfaces/permission-data.interface.ts

@@ -1,5 +1,6 @@
 export interface CreateExperimentPermissionRequestBodyModel {
-  experiment_name: string;
+  experiment_name?: string;
+  experiment_id?: string;
   user_name: string;
   new_permission: string;
 }

web-ui/src/app/shared/services/data/permission-data.service.ts

@@ -21,20 +21,24 @@ export class PermissionDataService {
     return this.http.post(API_URL.CREATE_EXPERIMENT_PERMISSION, body, { responseType: 'text' });
   }
 
+  updateExperimentPermission(body: { user_name: string, experiment_id: string, new_permission: string }) {
+    return this.http.post(API_URL.UPDATE_EXPERIMENT_PERMISSION, body, { responseType: 'text' });
+  }
+
+  deleteExperimentPermission(body: { experiment_id: string, user_name: string }) {
+    return this.http.post(API_URL.DELETE_EXPERIMENT_PERMISSION, body, { responseType: 'text' });
+  }
+
   createModelPermission(body: CreateModelPermissionRequestBodyModel) {
     return this.http.post(API_URL.CREATE_MODEL_PERMISSION, body);
   }
 
   updateModelPermission(body: { user_name: string, model_name: string, new_permission: string }) {
-    return this.http.post(API_URL.UPDATE_MODEL_PERMISSION, body,  {responseType: 'text'});
-  }
-
-  updateExperimentPermission(body: { user_name: string, experiment_id: string, new_permission: string }) {
-    return this.http.post(API_URL.UPDATE_EXPERIMENT_PERMISSION, body, { responseType: 'text' });
+    return this.http.post(API_URL.UPDATE_MODEL_PERMISSION, body, { responseType: 'text' });
   }
 
-  deleteModelPermission(body: any) {
-    return this.http.post(API_URL.DELETE_EXPERIMENT_PERMISSION, body);
+  deleteModelPermission(body: { model_name: string, user_name: string }) {
+    return this.http.post(API_URL.DELETE_MODEL_PERMISSION, body, { responseType: 'text' });
   }
 
 }