5f5d71d500
Split the INC-only loader into a dataset-agnostic engine (pipeline.py, renamed from import_tickets.py) parameterized by a Dataset config, with thin per-type entrypoints inc/import_inc.py and crq/import_crq.py. CRQ shares INC's identical 32-column source schema and CDC change stream, so the engine is fully shared. - pipeline.py: Dataset config (name/table/prefixes/key_regex/post_apply); INC keeps the capture_history post-apply hook, CRQ has none yet. geocode_locations now unions tickets.crq (geocoding is cross-dataset: one gazetteer/budget). - crq/import_crq.py: drains automations/crq/changes/ from isptickets into tickets.crq (data layer + map; SLA/dashboard/history deferred). - migrations/13_crq_columns.sql: CRQ mirror of 03 — typed STORED generated columns + indexes on tickets.crq (reuses tickets.eat_ts()). - Deployment: Dockerfile/run_ingest.sh run both via `python -m`; pyproject packages inc/crq. Docs (README, implementation, deployment-and-operations, n8n export ref, phase-1) updated for the split + the one-time CRQ seed runbook. tickets.crq already exists (mig 01, LIKE tickets.inc) and is unioned into reporting.fn_tickets_for_map + resolve_ticket_geoms, so CRQ appears on the existing Tickets map once seeded. Verified locally: ruff-clean new files, engine lists/parses both streams against live S3 (crq=52 files, inc unaffected). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
26 lines
1 KiB
Docker
26 lines
1 KiB
Docker
# fleettickets — INC + CRQ ticket ingestion image (Coolify-deployable).
|
|
# A small batch/cron worker: it has no web server. Coolify keeps the container
|
|
# running (CMD below) and fires the ingests via two Scheduled Tasks:
|
|
# python -m inc.import_inc --from-bucket --apply (cron: */20 6-20 * * *)
|
|
# python -m crq.import_crq --from-bucket --apply (cron: */20 6-20 * * *)
|
|
# (run from /app so the inc/ and crq/ packages + pipeline.py/shared.py import.)
|
|
# Env (set in Coolify): DATABASE_URL, RUSTFS_*, GEOCODER_*. S3 is via boto3 — no
|
|
# aws CLI needed. psycopg2-binary ships its own libpq, so no build toolchain.
|
|
FROM python:3.12-slim
|
|
|
|
ENV PYTHONUNBUFFERED=1 \
|
|
PIP_NO_CACHE_DIR=1 \
|
|
TZ=Africa/Nairobi
|
|
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends tzdata \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
WORKDIR /app
|
|
|
|
# Install from pyproject.toml (single source of truth for deps — no manual mirror).
|
|
COPY . .
|
|
RUN pip install .
|
|
|
|
# Keep the container alive so Coolify Scheduled Tasks can exec into it.
|
|
CMD ["tail", "-f", "/dev/null"]
|