Shoraky commited on
Commit
e130b68
·
1 Parent(s): d30c646

Allow admins to load other users' session results

Browse files
Files changed (1) hide show
  1. app.py +5 -5
app.py CHANGED
@@ -737,8 +737,8 @@ def cancel_session_job(session_id: UUID):
737
  logger.exception("Unable to clean cancelled analysis staging files: %s", client_id)
738
 
739
 
740
- def session_row(session_id, user_id):
741
- row = backend(f"/{session_id}", user_id)
742
  if row["path"] != f"sessions/{session_id}":
743
  raise HTTPException(409, "Session uses a different storage layout")
744
  return row
@@ -876,7 +876,7 @@ def delete_session(session_id: UUID, request: Request):
876
 
877
  @app.get("/api/sessions/{session_id}")
878
  def results(session_id: UUID, request: Request):
879
- row = session_row(session_id, request.state.user_id)
880
  path = hf_hub_download(repo_id=os.environ["STORAGE_REPO_ID"], repo_type="dataset",
881
  filename=f'{row["path"]}/results.json', token=os.environ["HF_TOKEN"])
882
  reports = json.loads(Path(path).read_text(encoding="utf-8"))
@@ -976,7 +976,7 @@ def results(session_id: UUID, request: Request):
976
 
977
  @app.api_route("/storage/{session_id}/videos/{filename}", methods=["GET", "HEAD"])
978
  def video(session_id: UUID, filename: str, request: Request):
979
- row = session_row(session_id, request.state.user_id)
980
  if Path(filename).name != filename or "\\" in filename:
981
  raise HTTPException(404, "Video not found")
982
  path = hf_hub_download(repo_id=os.environ["STORAGE_REPO_ID"], repo_type="dataset",
@@ -986,7 +986,7 @@ def video(session_id: UUID, filename: str, request: Request):
986
 
987
  @app.api_route("/storage/{session_id}/posters/{filename}", methods=["GET", "HEAD"])
988
  def video_poster(session_id: UUID, filename: str, request: Request):
989
- row = session_row(session_id, request.state.user_id)
990
  if Path(filename).name != filename or "\\" in filename or not filename.endswith(".webp"):
991
  raise HTTPException(404, "Preview not found")
992
  try:
 
737
  logger.exception("Unable to clean cancelled analysis staging files: %s", client_id)
738
 
739
 
740
+ def session_row(session_id, user_id, is_admin=False):
741
+ row = backend(f"/{session_id}", user_id, is_admin=is_admin)
742
  if row["path"] != f"sessions/{session_id}":
743
  raise HTTPException(409, "Session uses a different storage layout")
744
  return row
 
876
 
877
  @app.get("/api/sessions/{session_id}")
878
  def results(session_id: UUID, request: Request):
879
+ row = session_row(session_id, request.state.user_id, request.state.is_admin)
880
  path = hf_hub_download(repo_id=os.environ["STORAGE_REPO_ID"], repo_type="dataset",
881
  filename=f'{row["path"]}/results.json', token=os.environ["HF_TOKEN"])
882
  reports = json.loads(Path(path).read_text(encoding="utf-8"))
 
976
 
977
  @app.api_route("/storage/{session_id}/videos/{filename}", methods=["GET", "HEAD"])
978
  def video(session_id: UUID, filename: str, request: Request):
979
+ row = session_row(session_id, request.state.user_id, request.state.is_admin)
980
  if Path(filename).name != filename or "\\" in filename:
981
  raise HTTPException(404, "Video not found")
982
  path = hf_hub_download(repo_id=os.environ["STORAGE_REPO_ID"], repo_type="dataset",
 
986
 
987
  @app.api_route("/storage/{session_id}/posters/{filename}", methods=["GET", "HEAD"])
988
  def video_poster(session_id: UUID, filename: str, request: Request):
989
+ row = session_row(session_id, request.state.user_id, request.state.is_admin)
990
  if Path(filename).name != filename or "\\" in filename or not filename.endswith(".webp"):
991
  raise HTTPException(404, "Preview not found")
992
  try: