mirror of
https://github.com/PlaneQuery/OpenAirframes.git
synced 2026-09-17 19:32:14 +02:00
fix: stop a failed Transport Canada build from erasing release history
- fall back to a single-day rebuild only on FileNotFoundError; a rate limit, schema change or truncated download previously took the same path and republished one day as the whole dataset, which the next run then read back as its base - move the monotonic download_date assert out of the try so corruption cannot select the destructive branch - walk back through releases like the ADS-B reader, so one missing optional asset does not strand the accumulation - authenticate release reads and verify downloaded asset size - read the previous CSV with keep_default_na=False so literal NA values round-trip - write the download atomically and reject non-zip responses Generated-by: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -20,7 +20,8 @@ if not zip_path.exists():
|
||||
url = "https://wwwapps.tc.gc.ca/saf-sec-sur/2/ccarcs-riacc/download/ccarcsdb.zip"
|
||||
from urllib.request import Request, urlopen
|
||||
|
||||
# CCARCS rejects default urllib agents.
|
||||
# CCARCS 403s a default urllib agent. Any browser-like UA works; the exact
|
||||
# version string is not load-bearing.
|
||||
req = Request(
|
||||
url,
|
||||
headers={
|
||||
@@ -34,23 +35,39 @@ if not zip_path.exists():
|
||||
|
||||
with urlopen(req, timeout=120) as r:
|
||||
body = r.read()
|
||||
zip_path.write_bytes(body)
|
||||
# TC serves an HTML maintenance page with a 200, which would otherwise be cached
|
||||
# under a .zip name and re-read on every later run.
|
||||
if body[:2] != b"PK":
|
||||
raise RuntimeError(f"{url} did not return a zip (got {body[:40]!r})")
|
||||
tmp_path = zip_path.with_suffix(".part")
|
||||
tmp_path.write_bytes(body)
|
||||
tmp_path.replace(zip_path)
|
||||
|
||||
OUT_ROOT = Path("data/openairframes")
|
||||
OUT_ROOT.mkdir(parents=True, exist_ok=True)
|
||||
from derive_from_tc_ccarcs import convert_tc_ccarcs_to_df
|
||||
# Row-fingerprint dedup is source-agnostic; reused rather than forked.
|
||||
# Named for FAA but column-agnostic: fingerprints every column except download_date.
|
||||
from derive_from_faa_master_txt import concat_faa_historical_df
|
||||
from get_latest_release import get_latest_aircraft_tc_csv_df
|
||||
df_new = convert_tc_ccarcs_to_df(zip_path, date_str)
|
||||
|
||||
# Only a genuine first run may rebuild from a single day. Every other failure -- a rate
|
||||
# limit, a schema change, a truncated download -- must stop the run, because this file
|
||||
# becomes tomorrow's base and silently republishing one day erases the whole history.
|
||||
try:
|
||||
df_base, start_date_str = get_latest_aircraft_tc_csv_df()
|
||||
df_base = concat_faa_historical_df(df_base, df_new)
|
||||
assert df_base['download_date'].is_monotonic_increasing, "download_date is not monotonic increasing"
|
||||
except Exception as e:
|
||||
print(f"No existing Transport Canada release found, using only new data: {e}")
|
||||
df_base = df_new
|
||||
except FileNotFoundError as e:
|
||||
print(f"No existing Transport Canada release found, bootstrapping from today only: {e}")
|
||||
df_base = None
|
||||
start_date_str = date_str
|
||||
|
||||
if df_base is not None:
|
||||
missing = set(df_base.columns) ^ set(df_new.columns)
|
||||
if missing:
|
||||
raise SystemExit(f"Column set changed since the last release: {sorted(missing)}")
|
||||
df_base = concat_faa_historical_df(df_base, df_new)
|
||||
assert df_base['download_date'].is_monotonic_increasing, "download_date is not monotonic increasing"
|
||||
else:
|
||||
df_base = df_new
|
||||
|
||||
df_base.to_csv(OUT_ROOT / f"openairframes_tc_{start_date_str}_{date_str}.csv", index=False)
|
||||
|
||||
Reference in New Issue
Block a user