abdullahsamra commited on
Commit
8fc592c
·
1 Parent(s): ac5e306

Return completed job results from status endpoint

Browse files
Files changed (1) hide show
  1. api.py +8 -1
api.py CHANGED
@@ -477,6 +477,7 @@ def run_generate_job(job_id: str, req_data: Dict[str, Any], base_url: str):
477
  result_payload = {
478
  "job_id": job_id,
479
  "status": "completed",
 
480
  "preset": req.preset,
481
  "docking_mode": req.docking_mode,
482
  "summary": {
@@ -825,8 +826,14 @@ def submit_generate(req: GenerateRequest, background_tasks: BackgroundTasks, req
825
  def get_job_status(job_id: str, request: Request):
826
  base_url = get_public_base_url(request)
827
  status = read_job_status(job_id, base_url=base_url)
828
- return rewrite_public_urls(status, base_url)
829
 
 
 
 
 
 
 
 
830
  @app.post("/jobs/{job_id}/cancel", status_code=202)
831
  def cancel_job(job_id: str, request: Request):
832
  base_url = get_public_base_url(request)
 
477
  result_payload = {
478
  "job_id": job_id,
479
  "status": "completed",
480
+ "stage": "completed",
481
  "preset": req.preset,
482
  "docking_mode": req.docking_mode,
483
  "summary": {
 
826
  def get_job_status(job_id: str, request: Request):
827
  base_url = get_public_base_url(request)
828
  status = read_job_status(job_id, base_url=base_url)
 
829
 
830
+ if status.get("status") == "completed":
831
+ result_path = JOBS_DIR / job_id / "generated_results.json"
832
+ if result_path.exists():
833
+ payload = json.loads(result_path.read_text(encoding="utf-8"))
834
+ return rewrite_public_urls(payload, base_url)
835
+
836
+ return rewrite_public_urls(status, base_url)
837
  @app.post("/jobs/{job_id}/cancel", status_code=202)
838
  def cancel_job(job_id: str, request: Request):
839
  base_url = get_public_base_url(request)