b8f74bd027
- Changed terminology in `config.yaml` from "SLA deadline" to "readiness target" to clarify that jobs still run after the specified time. - Updated `README.md` to reflect the new readiness target concept, emphasizing that jobs started after the target are still executed and reported. - Modified `pipeline` logic to incorporate the new readiness target, ensuring accurate tracking of jobs that begin after the target time. - Enhanced reporting in the run report to include counts of jobs that started after the readiness target, improving transparency in job execution outcomes.
108 lines
3.8 KiB
Python
108 lines
3.8 KiB
Python
"""Per-run output layout: one JSON file per job plus a daily run report.
|
|
|
|
The single-field CLI wrote `output/<date>_field<id>.json`, which collides as
|
|
soon as one field has two diseases. The batch instead writes one file per
|
|
(field, disease) pair under a per-day directory, plus a `_run_report.json`
|
|
that is the actual operational artifact: it says whether the morning's run
|
|
succeeded, and if not, exactly which jobs failed and why.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
from datetime import date
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
from pipeline.job import JobResult, json_default
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Keys always present in the report's totals, even at zero, so a dashboard or
|
|
# script reading the report does not need to guess which statuses exist.
|
|
_STATUSES = (
|
|
"ok",
|
|
"no_risk",
|
|
"dry_run",
|
|
"failed",
|
|
"skipped_existing",
|
|
)
|
|
|
|
|
|
def run_dir(output_dir: Path, as_of: date) -> Path:
|
|
return output_dir / as_of.isoformat()
|
|
|
|
|
|
def write_job_output(output_dir: Path, as_of: date, payload: dict[str, Any]) -> Path:
|
|
"""Write one job's full payload to output/<as_of>/<output_stem>.json."""
|
|
target_dir = run_dir(output_dir, as_of)
|
|
target_dir.mkdir(parents=True, exist_ok=True)
|
|
path = target_dir / f"{payload['output_stem']}.json"
|
|
with path.open("w", encoding="utf-8") as fh:
|
|
json.dump(payload, fh, ensure_ascii=False, indent=2, default=json_default)
|
|
return path
|
|
|
|
|
|
def _job_report_entry(result: JobResult) -> dict[str, Any]:
|
|
job = result.job
|
|
return {
|
|
"field_id": job.field_id,
|
|
"crop": job.crop_english,
|
|
"disease": job.disease_english,
|
|
"organic": job.organic,
|
|
"station": job.station,
|
|
"status": result.status,
|
|
"duration_s": round(result.duration_s, 2),
|
|
"recommended_count": result.recommended_count,
|
|
"allowed_products_empty": result.allowed_products_empty,
|
|
"message": result.message,
|
|
"error_type": result.error_type,
|
|
"error_message": result.error_message,
|
|
}
|
|
|
|
|
|
def write_run_report(
|
|
output_dir: Path,
|
|
as_of: date,
|
|
results: list[JobResult],
|
|
*,
|
|
jobs_started_after_deadline: int = 0,
|
|
) -> dict[str, Any]:
|
|
"""
|
|
Write output/<as_of>/_run_report.json: totals by status plus per-job
|
|
diagnostics.
|
|
|
|
This is the operational artifact for the daily run: it names exactly
|
|
which jobs succeeded, which were skipped and why, and which failed and
|
|
with what error, so the exit code alone never has to carry that
|
|
information. `jobs_started_after_deadline` counts jobs that began after
|
|
the readiness target (they are still run). `ok_with_empty_allowed_products`
|
|
is tracked separately from a bare count of `ok` jobs because, once the
|
|
`products` table has organic entries for every crop, a sudden jump in
|
|
that number is the fastest signal that the prefilter or the Weaviate
|
|
allowlist filter has regressed (see pipeline/stages/vector.py).
|
|
"""
|
|
totals = {status: 0 for status in _STATUSES}
|
|
for result in results:
|
|
totals[result.status] = totals.get(result.status, 0) + 1
|
|
|
|
empty_allowed_products = sum(1 for r in results if r.allowed_products_empty)
|
|
|
|
report: dict[str, Any] = {
|
|
"as_of": as_of.isoformat(),
|
|
"job_count": len(results),
|
|
"jobs_started_after_deadline": jobs_started_after_deadline,
|
|
"totals": totals,
|
|
"ok_with_empty_allowed_products": empty_allowed_products,
|
|
"jobs": [_job_report_entry(r) for r in results],
|
|
}
|
|
|
|
target_dir = run_dir(output_dir, as_of)
|
|
target_dir.mkdir(parents=True, exist_ok=True)
|
|
path = target_dir / "_run_report.json"
|
|
with path.open("w", encoding="utf-8") as fh:
|
|
json.dump(report, fh, ensure_ascii=False, indent=2)
|
|
logger.info("Wrote run report -> %s", path)
|
|
return report
|