Skip to content

Commit fa5cd91

Browse files
committed
chore: cleanup error messages
1 parent 1d9410f commit fa5cd91

File tree

5 files changed

+62
-62
lines changed

5 files changed

+62
-62
lines changed

mlflow_oidc_auth/routers/group_permissions.py

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ async def list_groups(username: str = Depends(get_username)) -> JSONResponse:
9595

9696
except Exception as e:
9797
logger.error(f"Error listing groups: {str(e)}")
98-
raise HTTPException(status_code=500, detail=f"Failed to retrieve groups: {str(e)}")
98+
raise HTTPException(status_code=500, detail=f"Failed to retrieve groups")
9999

100100

101101
@group_permissions_router.get(
@@ -135,7 +135,7 @@ async def get_group_users(
135135
return [GroupUser(username=user.username, is_admin=user.is_admin) for user in users]
136136
except Exception as e:
137137
logger.error(f"Error getting group users: {str(e)}")
138-
raise HTTPException(status_code=404, detail=f"Group not found or error retrieving users: {str(e)}")
138+
raise HTTPException(status_code=404, detail=f"Group not found or error retrieving users")
139139

140140

141141
@group_permissions_router.get(
@@ -200,7 +200,7 @@ async def get_group_experiments(
200200

201201
except Exception as e:
202202
logger.error(f"Error retrieving group experiment permissions: {str(e)}")
203-
raise HTTPException(status_code=500, detail=f"Failed to retrieve group experiment permissions: {str(e)}")
203+
raise HTTPException(status_code=500, detail=f"Failed to retrieve group experiment permissions")
204204

205205

206206
@group_permissions_router.post(
@@ -245,7 +245,7 @@ async def create_group_experiment_permission(
245245
)
246246
except Exception as e:
247247
logger.error(f"Error creating group experiment permission: {str(e)}")
248-
raise HTTPException(status_code=500, detail=f"Failed to create group experiment permission: {str(e)}")
248+
raise HTTPException(status_code=500, detail=f"Failed to create group experiment permission")
249249

250250

251251
@group_permissions_router.patch(
@@ -287,7 +287,7 @@ async def update_group_experiment_permission(
287287
return JSONResponse(content={"status": "success", "message": f"Experiment permission updated for group {group_name} on experiment {experiment_id}"})
288288
except Exception as e:
289289
logger.error(f"Error updating group experiment permission: {str(e)}")
290-
raise HTTPException(status_code=500, detail=f"Failed to update group experiment permission: {str(e)}")
290+
raise HTTPException(status_code=500, detail=f"Failed to update group experiment permission")
291291

292292

293293
@group_permissions_router.delete(
@@ -322,7 +322,7 @@ async def delete_group_experiment_permission(
322322
return JSONResponse(content={"status": "success", "message": f"Experiment permission deleted for group {group_name} on experiment {experiment_id}"})
323323
except Exception as e:
324324
logger.error(f"Error deleting group experiment permission: {str(e)}")
325-
raise HTTPException(status_code=500, detail=f"Failed to delete group experiment permission: {str(e)}")
325+
raise HTTPException(status_code=500, detail=f"Failed to delete group experiment permission")
326326

327327

328328
@group_permissions_router.get(
@@ -384,7 +384,7 @@ async def get_group_registered_models(
384384

385385
except Exception as e:
386386
logger.error(f"Error retrieving group registered model permissions: {str(e)}")
387-
raise HTTPException(status_code=500, detail=f"Failed to retrieve group registered model permissions: {str(e)}")
387+
raise HTTPException(status_code=500, detail=f"Failed to retrieve group registered model permissions")
388388

389389

390390
@group_permissions_router.post(
@@ -435,7 +435,7 @@ async def create_group_registered_model_permission(
435435
)
436436
except Exception as e:
437437
logger.error(f"Error creating group registered model permission: {str(e)}")
438-
raise HTTPException(status_code=500, detail=f"Failed to create group registered model permission: {str(e)}")
438+
raise HTTPException(status_code=500, detail=f"Failed to create group registered model permission")
439439

440440

441441
@group_permissions_router.patch(
@@ -483,7 +483,7 @@ async def update_group_registered_model_permission(
483483
return JSONResponse(content={"status": "success", "message": f"Registered model permission updated for group {group_name} on model {name}"})
484484
except Exception as e:
485485
logger.error(f"Error updating group registered model permission: {str(e)}")
486-
raise HTTPException(status_code=500, detail=f"Failed to update group registered model permission: {str(e)}")
486+
raise HTTPException(status_code=500, detail=f"Failed to update group registered model permission")
487487

488488

489489
@group_permissions_router.delete(
@@ -524,7 +524,7 @@ async def delete_group_registered_model_permission(
524524
return JSONResponse(content={"status": "success", "message": f"Registered model permission deleted for group {group_name} on model {name}"})
525525
except Exception as e:
526526
logger.error(f"Error deleting group registered model permission: {str(e)}")
527-
raise HTTPException(status_code=500, detail=f"Failed to delete group registered model permission: {str(e)}")
527+
raise HTTPException(status_code=500, detail=f"Failed to delete group registered model permission")
528528

529529

530530
@group_permissions_router.get(
@@ -583,7 +583,7 @@ async def get_group_prompts(
583583
return JSONResponse(content=formatted_prompts)
584584
except Exception as e:
585585
logger.error(f"Error getting group prompt permissions: {str(e)}")
586-
raise HTTPException(status_code=500, detail=f"Failed to get group prompt permissions: {str(e)}")
586+
raise HTTPException(status_code=500, detail=f"Failed to get group prompt permissions")
587587

588588

589589
@group_permissions_router.post(
@@ -635,7 +635,7 @@ async def create_group_prompt_permission(
635635
)
636636
except Exception as e:
637637
logger.error(f"Error creating group prompt permission: {str(e)}")
638-
raise HTTPException(status_code=500, detail=f"Failed to create group prompt permission: {str(e)}")
638+
raise HTTPException(status_code=500, detail=f"Failed to create group prompt permission")
639639

640640

641641
@group_permissions_router.patch(
@@ -682,7 +682,7 @@ async def update_group_prompt_permission(
682682
return JSONResponse(content={"status": "success", "message": f"Prompt permission updated for group {group_name} on prompt {prompt_name}"})
683683
except Exception as e:
684684
logger.error(f"Error updating group prompt permission: {str(e)}")
685-
raise HTTPException(status_code=500, detail=f"Failed to update group prompt permission: {str(e)}")
685+
raise HTTPException(status_code=500, detail=f"Failed to update group prompt permission")
686686

687687

688688
@group_permissions_router.delete(
@@ -722,7 +722,7 @@ async def delete_group_prompt_permission(
722722
return JSONResponse(content={"status": "success", "message": f"Prompt permission deleted for group {group_name} on prompt {prompt_name}"})
723723
except Exception as e:
724724
logger.error(f"Error deleting group prompt permission: {str(e)}")
725-
raise HTTPException(status_code=500, detail=f"Failed to delete group prompt permission: {str(e)}")
725+
raise HTTPException(status_code=500, detail=f"Failed to delete group prompt permission")
726726

727727

728728
@group_permissions_router.get(
@@ -742,7 +742,7 @@ async def get_group_experiment_pattern_permissions(
742742
return JSONResponse(content=[pattern.to_json() for pattern in patterns])
743743
except Exception as e:
744744
logger.error(f"Error getting group experiment pattern permissions: {str(e)}")
745-
raise HTTPException(status_code=500, detail=f"Failed to get group experiment pattern permissions: {str(e)}")
745+
raise HTTPException(status_code=500, detail=f"Failed to get group experiment pattern permissions")
746746

747747

748748
@group_permissions_router.post(
@@ -766,7 +766,7 @@ async def create_group_experiment_pattern_permission(
766766
return JSONResponse(content={"status": "success", "message": f"Experiment pattern permission created for group {group_name}"}, status_code=201)
767767
except Exception as e:
768768
logger.error(f"Error creating group experiment pattern permission: {str(e)}")
769-
raise HTTPException(status_code=500, detail=f"Failed to create group experiment pattern permission: {str(e)}")
769+
raise HTTPException(status_code=500, detail=f"Failed to create group experiment pattern permission")
770770

771771

772772
@group_permissions_router.get(
@@ -787,7 +787,7 @@ async def get_group_experiment_pattern_permission(
787787
return JSONResponse(content={"pattern": pattern.to_json()})
788788
except Exception as e:
789789
logger.error(f"Error getting group experiment pattern permission: {str(e)}")
790-
raise HTTPException(status_code=500, detail=f"Failed to get group experiment pattern permission: {str(e)}")
790+
raise HTTPException(status_code=500, detail=f"Failed to get group experiment pattern permission")
791791

792792

793793
@group_permissions_router.patch(
@@ -811,7 +811,7 @@ async def update_group_experiment_pattern_permission(
811811
return JSONResponse(content={"status": "success", "message": f"Experiment pattern permission updated for group {group_name}"})
812812
except Exception as e:
813813
logger.error(f"Error updating group experiment pattern permission: {str(e)}")
814-
raise HTTPException(status_code=500, detail=f"Failed to update group experiment pattern permission: {str(e)}")
814+
raise HTTPException(status_code=500, detail=f"Failed to update group experiment pattern permission")
815815

816816

817817
@group_permissions_router.delete(
@@ -832,7 +832,7 @@ async def delete_group_experiment_pattern_permission(
832832
return JSONResponse(content={"status": "success", "message": f"Experiment pattern permission deleted for group {group_name}"})
833833
except Exception as e:
834834
logger.error(f"Error deleting group experiment pattern permission: {str(e)}")
835-
raise HTTPException(status_code=500, detail=f"Failed to delete group experiment pattern permission: {str(e)}")
835+
raise HTTPException(status_code=500, detail=f"Failed to delete group experiment pattern permission")
836836

837837

838838
@group_permissions_router.get(
@@ -852,7 +852,7 @@ async def get_group_registered_model_pattern_permissions(
852852
return JSONResponse(content=[pattern.to_json() for pattern in patterns])
853853
except Exception as e:
854854
logger.error(f"Error getting group registered model pattern permissions: {str(e)}")
855-
raise HTTPException(status_code=500, detail=f"Failed to get group registered model pattern permissions: {str(e)}")
855+
raise HTTPException(status_code=500, detail=f"Failed to get group registered model pattern permissions")
856856

857857

858858
@group_permissions_router.post(
@@ -876,7 +876,7 @@ async def create_group_registered_model_pattern_permission(
876876
return JSONResponse(content={"status": "success", "message": f"Registered model pattern permission created for group {group_name}"}, status_code=201)
877877
except Exception as e:
878878
logger.error(f"Error creating group registered model pattern permission: {str(e)}")
879-
raise HTTPException(status_code=500, detail=f"Failed to create group registered model pattern permission: {str(e)}")
879+
raise HTTPException(status_code=500, detail=f"Failed to create group registered model pattern permission")
880880

881881

882882
@group_permissions_router.get(
@@ -897,7 +897,7 @@ async def get_group_registered_model_pattern_permission(
897897
return JSONResponse(content={"pattern": pattern.to_json()})
898898
except Exception as e:
899899
logger.error(f"Error getting group registered model pattern permission: {str(e)}")
900-
raise HTTPException(status_code=500, detail=f"Failed to get group registered model pattern permission: {str(e)}")
900+
raise HTTPException(status_code=500, detail=f"Failed to get group registered model pattern permission")
901901

902902

903903
@group_permissions_router.patch(
@@ -921,7 +921,7 @@ async def update_group_registered_model_pattern_permission(
921921
return JSONResponse(content={"status": "success", "message": f"Registered model pattern permission updated for group {group_name}"})
922922
except Exception as e:
923923
logger.error(f"Error updating group registered model pattern permission: {str(e)}")
924-
raise HTTPException(status_code=500, detail=f"Failed to update group registered model pattern permission: {str(e)}")
924+
raise HTTPException(status_code=500, detail=f"Failed to update group registered model pattern permission")
925925

926926

927927
@group_permissions_router.delete(
@@ -942,7 +942,7 @@ async def delete_group_registered_model_pattern_permission(
942942
return JSONResponse(content={"status": "success", "message": f"Registered model pattern permission deleted for group {group_name}"})
943943
except Exception as e:
944944
logger.error(f"Error deleting group registered model pattern permission: {str(e)}")
945-
raise HTTPException(status_code=500, detail=f"Failed to delete group registered model pattern permission: {str(e)}")
945+
raise HTTPException(status_code=500, detail=f"Failed to delete group registered model pattern permission")
946946

947947

948948
@group_permissions_router.get(
@@ -962,7 +962,7 @@ async def get_group_prompt_pattern_permissions(
962962
return JSONResponse(content=[pattern.to_json() for pattern in patterns])
963963
except Exception as e:
964964
logger.error(f"Error getting group prompt pattern permissions: {str(e)}")
965-
raise HTTPException(status_code=500, detail=f"Failed to get group prompt pattern permissions: {str(e)}")
965+
raise HTTPException(status_code=500, detail=f"Failed to get group prompt pattern permissions")
966966

967967

968968
@group_permissions_router.post(
@@ -986,7 +986,7 @@ async def create_group_prompt_pattern_permission(
986986
return JSONResponse(content={"status": "success", "message": f"Prompt pattern permission created for group {group_name}"}, status_code=201)
987987
except Exception as e:
988988
logger.error(f"Error creating group prompt pattern permission: {str(e)}")
989-
raise HTTPException(status_code=500, detail=f"Failed to create group prompt pattern permission: {str(e)}")
989+
raise HTTPException(status_code=500, detail=f"Failed to create group prompt pattern permission")
990990

991991

992992
@group_permissions_router.get(
@@ -1007,7 +1007,7 @@ async def get_group_prompt_pattern_permission(
10071007
return JSONResponse(content={"pattern": pattern.to_json()})
10081008
except Exception as e:
10091009
logger.error(f"Error getting group prompt pattern permission: {str(e)}")
1010-
raise HTTPException(status_code=500, detail=f"Failed to get group prompt pattern permission: {str(e)}")
1010+
raise HTTPException(status_code=500, detail=f"Failed to get group prompt pattern permission")
10111011

10121012

10131013
@group_permissions_router.patch(
@@ -1031,7 +1031,7 @@ async def update_group_prompt_pattern_permission(
10311031
return JSONResponse(content={"status": "success", "message": f"Prompt pattern permission updated for group {group_name}"})
10321032
except Exception as e:
10331033
logger.error(f"Error updating group prompt pattern permission: {str(e)}")
1034-
raise HTTPException(status_code=500, detail=f"Failed to update group prompt pattern permission: {str(e)}")
1034+
raise HTTPException(status_code=500, detail=f"Failed to update group prompt pattern permission")
10351035

10361036

10371037
@group_permissions_router.delete(
@@ -1052,4 +1052,4 @@ async def delete_group_prompt_pattern_permission(
10521052
return JSONResponse(content={"status": "success", "message": f"Prompt pattern permission deleted for group {group_name}"})
10531053
except Exception as e:
10541054
logger.error(f"Error deleting group prompt pattern permission: {str(e)}")
1055-
raise HTTPException(status_code=500, detail=f"Failed to delete group prompt pattern permission: {str(e)}")
1055+
raise HTTPException(status_code=500, detail=f"Failed to delete group prompt pattern permission")

mlflow_oidc_auth/routers/trash.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ async def list_deleted_experiments(
8888

8989
except Exception as e:
9090
logger.error(f"Error listing deleted experiments for admin '{admin_username}': {str(e)}")
91-
return JSONResponse(status_code=500, content={"error": f"Failed to retrieve deleted experiments: {str(e)}"})
91+
return JSONResponse(status_code=500, content={"error": "Failed to retrieve deleted experiments."})
9292

9393

9494
@trash_router.post(
@@ -159,7 +159,7 @@ async def permanently_delete_all_trashed_entities(
159159
time_delta = _parse_time_delta(older_than)
160160
except MlflowException as e:
161161
logger.error(f"Invalid time format '{older_than}': {str(e)}")
162-
return JSONResponse(status_code=400, content={"error": f"Invalid time format: {str(e)}"})
162+
return JSONResponse(status_code=400, content={"error": f"Invalid time format"})
163163

164164
# Get deleted runs that match the time criteria
165165
try:
@@ -309,7 +309,7 @@ def fetch_runs(token=None):
309309

310310
except Exception as e:
311311
logger.error(f"Error in cleanup operation for admin '{admin_username}': {str(e)}")
312-
return JSONResponse(status_code=500, content={"error": f"Cleanup operation failed: {str(e)}"})
312+
return JSONResponse(status_code=500, content={"error": f"Cleanup operation failed"})
313313

314314

315315
def _parse_time_delta(older_than: str) -> int:

0 commit comments

Comments
 (0)