Skip to content

Python tool for aircraft Doppler audio geolocation using historical ADS-B flight data (Source-available)

fix(#10): preserve terminal result on API cancellation race

Cinna Davisc4783d2e6e25
diff --git a/src/dopplergeist/jobs.py b/src/dopplergeist/jobs.py
index 0b953e4..4f1edc3 100644
--- a/src/dopplergeist/jobs.py
+++ b/src/dopplergeist/jobs.py
@@ -268,7 +268,10 @@ class JobManager:
process = self._processes.get(job_id)
if process:
self._stop(process)
- return result(directory, "cancelled", message="Cancelled by the user; partial artifacts are preserved.", **_evidence(self.get(job_id)))
+ current = self.get(job_id)
+ if current["status"] in TERMINAL:
+ return current
+ return result(directory, "cancelled", message="Cancelled by the user; partial artifacts are preserved.", **_evidence(current))
def resume(self, job_id):
"""Explicitly continue a stopped job after its complete audio checkpoint."""
diff --git a/tests/test_job_cancel_api_race.py b/tests/test_job_cancel_api_race.py
new file mode 100644
index 0000000..45346ba
--- /dev/null
+++ b/tests/test_job_cancel_api_race.py
@@ -0,0 +1,29 @@
+from dopplergeist.jobs import JobManager, read_json, result
+
+
+def test_api_cancel_preserves_terminal_result_written_while_stopping(tmp_path, monkeypatch):
+ manager = JobManager(tmp_path)
+ try:
+ job_id = "a" * 32
+ directory = tmp_path / job_id
+ directory.mkdir()
+ result(directory, "running", stage="search", progress=0.5)
+ manager._processes[job_id] = object()
+
+ expected = {
+ "schema_version": 1,
+ "job_id": job_id,
+ "status": "inconclusive",
+ "reason_code": "no_events",
+ "message": "No events.",
+ }
+
+ def worker_commits_before_exit(_process):
+ result(directory, "inconclusive", reason_code="no_events", message="No events.")
+
+ monkeypatch.setattr(manager, "_stop", worker_commits_before_exit)
+
+ assert manager.cancel(job_id) == expected
+ assert read_json(directory / "result.json") == expected
+ finally:
+ manager.close()