Skip to content

raise exceptions instead of returning response + fail to 501 for historical=True #12

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
swelborn merged 4 commits into from
Jul 6, 2026
Merged

raise exceptions instead of returning response + fail to 501 for historical=True #12

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a4a24b
raise instead of returning response
Jul 6, 2026
4ef776a
if exc.status != 414 --> should be 404
Jul 6, 2026
32a55af
remove fake historical implementation and raise 501
Jul 6, 2026
d66ab05
raise httpexceptions instead of RuntimeError
Jul 6, 2026
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
30 changes: 12 additions & 18 deletions app/s3df/compute_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
from slurmrestd_client.models.slurm_v0041_post_job_submit_request_jobs_inner_memory_per_cpu import (
SlurmV0041PostJobSubmitRequestJobsInnerMemoryPerCpu,
)
from fastapi import HTTPException, Response
from fastapi import HTTPException
from pydantic import ConfigDict, ValidationError

from ..routers.compute import models as compute_models
Expand Down Expand Up @@ -495,19 +495,14 @@ async def get_job(
if resp and resp.jobs:
return _job_from_slurm_info(resp.jobs[0], include_spec)
except ApiException as exc:
if exc.status != 414:
raise RuntimeError(f"Slurm get_job failed: {exc}") from exc
if exc.status != 404:
logger.exception("Slurm get_job failed for job %s", job_id)
raise HTTPException(status_code=500, detail="Slurm get_job failed") from exc

if historical:
# Fall back to job history endpoint
try:
resp = api.slurm_v0041_get_job_history(job_id, _headers=headers)
if resp and resp.jobs:
return _job_from_slurm_info(resp.jobs[0], include_spec)
except ApiException as exc:
raise RuntimeError(f"Slurm job history failed: {exc}") from exc
raise HTTPException(status_code=501, detail="Historical job lookup is not implemented yet")

raise RuntimeError(f"Job {job_id} not found")
raise HTTPException(status_code=404, detail=f"Job {job_id} not found")

# -- get_jobs -----------------------------------------------------------

Expand All @@ -524,15 +519,14 @@ async def get_jobs(
"""POST /compute/status/{resource_id}"""
api, headers = self._get_slurm_context(user)

if historical:
raise HTTPException(status_code=501, detail="Historical job listing is not implemented yet")

try:
if historical:
# resp = api.slurm_v0041_get_jobs_history(_headers=headers)
# return a 501 not implemented as we don't want to hit the slurmdb
return Response(status_code=501, content="Historical job listing is not implemented yet")
else:
resp = api.slurm_v0041_get_jobs(_headers=headers)
resp = api.slurm_v0041_get_jobs(_headers=headers)
except ApiException as exc:
raise RuntimeError(f"Slurm get_jobs failed: {exc}") from exc
logger.exception("Slurm get_jobs failed")
raise HTTPException(status_code=500, detail="Slurm get_jobs failed") from exc


jobs = resp.jobs or []
Expand Down
Loading