* Extract session pipeline framework, refactor verification, add UsageProcessor skeleton Pluggable framework under services/session_pipeline/ (contract + lib + per-processor runner) so multiple processors can read /data/user_sessions/<key>/*.jsonl on their own cadence with full failure isolation. Verification flow becomes the first plugin; a no-op UsageProcessor reserves the second slot pending a separate brainstorm on extraction logic + storage shape. Schema v28→v29: rename session_extraction_state → session_processor_state with composite PK (processor_name, session_file). Existing rows copied over with processor_name='verification'; legacy table dropped. Migration is idempotent and no-ops the copy step on fresh installs that came up at the new schema. Endpoint: /api/admin/run-verification-detector replaced by parametrized /api/admin/run-session-processor?processor=<name>. Audit action format follows. Scheduler JOBS: verification-detector entry split into session-processor:verification + session-processor:usage. SCHEDULER_VERIFICATION_DETECTOR_INTERVAL retained for operator compatibility (drives both cadence and health-check grace window); SCHEDULER_USAGE_PROCESSOR_INTERVAL added. * Address PR #232 review: scan dead branch + per-processor lock - `SessionProcessorStateRepository.scan_unprocessed_for` dead else: both branches surfaced every jsonl, the SELECT was unused, runner MD5-rehashed every stable session per tick. Replaced with an mtime precheck — stable sessions (mtime <= processed_at) are filtered at scan; modified files still surface for the runner's authoritative `file_hash` invalidation. Naive-local comparison matches the existing health-check idiom (DuckDB TIMESTAMP strips tz on storage). - Per-processor advisory lock around `_run_processor` in `/api/admin/run-session-processor`. Scheduler tick + manual admin POST could otherwise both run, both call create_evidence on overlapping detections, and accumulate duplicate verification_evidence rows (the dedup short-circuit only covers create+contradiction, not evidence per ADR Decision 3). Non-blocking acquire → 409 Conflict on concurrent invocation; release in finally so a runner exception doesn't wedge the processor. Tests: two new scan unit tests (mtime filter + post-mark mtime bump), 409 endpoint test, lock-released-on-exception test. Two existing tests updated for the new "filtered at scan" stat shape (previously asserted skipped == 1, now scanned == 0). * Address PR #232 review #2: parallel scheduler tick + last_run on terminal state Two pre-existing scaffold bugs in services/scheduler/__main__.py amplified by adding more session-pipeline jobs: 1. Serial for-loop over jobs with synchronous httpx.post(timeout=900) — a 10-minute verification run blocked every other job (data-refresh, health-check, usage, corporate-memory) for the whole window. The PR's stated isolation guarantee held inside the runner but broke at the scheduler dispatch layer. 2. last_run advanced only when _call_api returned True. Permanent-failure jobs hot-looped on every tick (30s) instead of cadence (15min). Fix: ThreadPoolExecutor.submit per due job + per-job in_flight set so a long-running job can't be re-launched on subsequent ticks. last_run advances unconditionally in finally; errors still surface via _call_api logging + audit_log on the receiving side. _run_job extracted to module-level for unit testing. New tests: - TestRunJobBookkeeping: advances on success / failure / unhandled raise - TestRunLoopParallelism: in_flight protection prevents duplicate launches across ticks for a single slow job --------- Co-authored-by: Minas Arustamyan <arustamyan.minas@gmail.com>
302 lines
13 KiB
Python
302 lines
13 KiB
Python
"""Scheduler service — replaces systemd timers.
|
||
|
||
Lightweight sidecar that fires scheduled jobs over HTTP against the main
|
||
app. Authenticates with ``SCHEDULER_API_TOKEN`` (shared-secret synthetic
|
||
admin — see ``app.auth.scheduler_token``); falls back to no-auth in
|
||
LOCAL_DEV_MODE.
|
||
|
||
Schedules are strings parsed by ``src.scheduler.is_table_due`` — accepts
|
||
"every 15m", "every 1h", "daily 03:00", "daily 07:00,13:00".
|
||
|
||
Why every job is HTTP and nothing runs in-process: the scheduler container
|
||
shares ``/data/state/system.duckdb`` with the app container, but DuckDB
|
||
permits only one writer per file across processes. An in-process call
|
||
from the scheduler raced the app's long-lived handle and 500-ed on
|
||
``Could not set lock on file``. Going through HTTP makes the app the sole
|
||
writer; the scheduler is reduced to a pure cron clock.
|
||
|
||
Usage: python -m services.scheduler
|
||
"""
|
||
|
||
import logging
|
||
import os
|
||
import signal
|
||
import threading
|
||
import time
|
||
from concurrent.futures import ThreadPoolExecutor
|
||
from datetime import datetime, timezone
|
||
|
||
import httpx
|
||
|
||
from app.logging_config import setup_logging
|
||
from src.scheduler import is_table_due
|
||
|
||
setup_logging(__name__)
|
||
logger = logging.getLogger(__name__)
|
||
|
||
API_URL = os.environ.get("API_URL", "http://localhost:8000")
|
||
SCHEDULER_API_TOKEN = os.environ.get("SCHEDULER_API_TOKEN", "")
|
||
|
||
_token_warning_emitted = False
|
||
|
||
|
||
def _get_auth_token() -> str:
|
||
"""Return the bearer token for API calls.
|
||
|
||
Production: ``SCHEDULER_API_TOKEN`` is a shared secret generated by the
|
||
Terraform startup script and written to ``/opt/agnes/.env``. Both the
|
||
``app`` and ``scheduler`` containers source the same .env via Docker
|
||
Compose ``env_file:``, so the secret is symmetric. The app validates
|
||
incoming Bearer tokens against this env var (constant-time compare in
|
||
``app.auth.scheduler_token``) and resolves matches to a synthetic
|
||
``scheduler@system.local`` user that is a member of the Admin group.
|
||
|
||
Dev / LOCAL_DEV_MODE: leave it unset. The scheduler returns the empty
|
||
string and calls the API without an ``Authorization`` header — the
|
||
API's dev-bypass auto-authenticates the request as the dev user.
|
||
"""
|
||
global _token_warning_emitted
|
||
if SCHEDULER_API_TOKEN:
|
||
return SCHEDULER_API_TOKEN
|
||
if not _token_warning_emitted:
|
||
logger.warning(
|
||
"SCHEDULER_API_TOKEN is not set — calling the API without "
|
||
"Authorization. Required in production; in LOCAL_DEV_MODE "
|
||
"the dev-bypass auto-authenticates and this is fine."
|
||
)
|
||
_token_warning_emitted = True
|
||
return ""
|
||
|
||
|
||
# --- Env parsing ------------------------------------------------------------
|
||
|
||
_DEFAULTS = {
|
||
"SCHEDULER_DATA_REFRESH_INTERVAL": 15 * 60, # seconds
|
||
"SCHEDULER_HEALTH_CHECK_INTERVAL": 5 * 60,
|
||
"SCHEDULER_SCRIPT_RUN_INTERVAL": 1 * 60,
|
||
"SCHEDULER_TICK_SECONDS": 30,
|
||
# LLM pipeline cadences (#176, #179 review). Defaults preserve the
|
||
# 10m / 15m / 17m coprime offset so the three jobs don't fire on the
|
||
# same tick and stack their API + DB load. The verification-detector
|
||
# default (900s) is also the source of truth for the health-check
|
||
# staleness grace window in app/api/health.py — single env var drives
|
||
# both, so an operator changing the cadence moves both.
|
||
"SCHEDULER_SESSION_COLLECTOR_INTERVAL": 10 * 60,
|
||
# Drives the verification session-processor cadence AND the
|
||
# health-check staleness grace window in app/api/health.py
|
||
# (single env var → both, so an operator changing the cadence moves
|
||
# both). Name retained post session-pipeline refactor for operator
|
||
# compatibility — existing docker-compose env files keep working.
|
||
"SCHEDULER_VERIFICATION_DETECTOR_INTERVAL": 15 * 60,
|
||
"SCHEDULER_USAGE_PROCESSOR_INTERVAL": 10 * 60,
|
||
"SCHEDULER_CORPORATE_MEMORY_INTERVAL": 17 * 60,
|
||
}
|
||
|
||
|
||
def _read_positive_int(name: str) -> int:
|
||
"""Read an env var as a positive integer or fall back to the default.
|
||
|
||
Treats unset env (``None``) as "use default". Treats explicitly empty
|
||
string (``""``) as an operator typo and raises — silently defaulting
|
||
on a literal ``FOO=`` in the env_file would mask configuration bugs.
|
||
"""
|
||
raw = os.environ.get(name)
|
||
if raw is None:
|
||
if name not in _DEFAULTS:
|
||
raise ValueError(f"Unknown scheduler env var: {name}")
|
||
return _DEFAULTS[name]
|
||
if raw == "":
|
||
raise ValueError(f"{name}='' must be a positive integer (seconds)")
|
||
try:
|
||
value = int(raw)
|
||
except (TypeError, ValueError):
|
||
raise ValueError(f"{name}={raw!r} must be a positive integer (seconds)")
|
||
if value <= 0:
|
||
raise ValueError(f"{name}={value} must be > 0 (seconds)")
|
||
return value
|
||
|
||
|
||
def _seconds_to_schedule(seconds: int) -> str:
|
||
"""Convert a seconds value to the closest 'every Nm' / 'every Nh' string.
|
||
|
||
Uses ceiling division so a non-multiple-of-60 input never produces a
|
||
schedule that fires MORE often than the operator configured (90s →
|
||
'every 2m', not 'every 1m'). Sub-minute inputs clamp to 'every 1m'
|
||
because the schedule grammar has minute-level resolution.
|
||
"""
|
||
if seconds % 3600 == 0 and seconds >= 3600:
|
||
return f"every {seconds // 3600}h"
|
||
# Ceiling division: -(-x // y) is the standard trick.
|
||
minutes = max(1, -(-seconds // 60))
|
||
return f"every {minutes}m"
|
||
|
||
|
||
def resolved_tick_seconds() -> int:
|
||
"""Read + validate SCHEDULER_TICK_SECONDS in isolation (test helper)."""
|
||
return _read_positive_int("SCHEDULER_TICK_SECONDS")
|
||
|
||
|
||
def build_jobs() -> list[tuple[str, str, str, str, int]]:
|
||
"""Build the JOBS list from env, applying defaults and validation.
|
||
|
||
Tuple shape: (name, schedule_string, endpoint, method, http_timeout_sec).
|
||
Marketplaces stays hardcoded — promoting it to env is out of #77 scope.
|
||
"""
|
||
refresh = _read_positive_int("SCHEDULER_DATA_REFRESH_INTERVAL")
|
||
health = _read_positive_int("SCHEDULER_HEALTH_CHECK_INTERVAL")
|
||
scripts = _read_positive_int("SCHEDULER_SCRIPT_RUN_INTERVAL")
|
||
sess = _read_positive_int("SCHEDULER_SESSION_COLLECTOR_INTERVAL")
|
||
verify = _read_positive_int("SCHEDULER_VERIFICATION_DETECTOR_INTERVAL")
|
||
usage = _read_positive_int("SCHEDULER_USAGE_PROCESSOR_INTERVAL")
|
||
corpmem = _read_positive_int("SCHEDULER_CORPORATE_MEMORY_INTERVAL")
|
||
tick = _read_positive_int("SCHEDULER_TICK_SECONDS")
|
||
smallest = min(refresh, health, scripts, sess, verify, usage, corpmem)
|
||
if tick > smallest:
|
||
raise ValueError(
|
||
f"SCHEDULER_TICK_SECONDS={tick} must be <= the smallest job "
|
||
f"interval ({smallest}s) so jobs don't consistently miss their "
|
||
f"cadence by up to one tick"
|
||
)
|
||
return [
|
||
("data-refresh", _seconds_to_schedule(refresh), "/api/sync/trigger", "POST", 120),
|
||
("health-check", _seconds_to_schedule(health), "/api/health", "GET", 30),
|
||
("script-runner", _seconds_to_schedule(scripts), "/api/scripts/run-due", "POST", 600),
|
||
("marketplaces", "daily 03:00", "/api/marketplaces/sync-all", "POST", 900),
|
||
# LLM pipeline (#176, #179 review). Cadences are deliberately offset
|
||
# (10m / 15m / 17m by default — all coprime modulo the 30s tick) so
|
||
# the three LLM-driven jobs don't fire on the same tick and stack
|
||
# their API + DB load. Driven by env so an operator can throttle
|
||
# without a code change; the verification-detector cadence is the
|
||
# single source of truth for the health-check staleness grace
|
||
# window in app/api/health.py (which uses 2x the cadence).
|
||
("session-collector", _seconds_to_schedule(sess), "/api/admin/run-session-collector", "POST", 300),
|
||
# session-pipeline processors — independent loops, each invoked on
|
||
# its own cadence via the parametrized run-session-processor endpoint.
|
||
# Adding a third processor in the future is one line here + one entry
|
||
# in services/session_processors/__init__.py registry.
|
||
("session-processor:verification", _seconds_to_schedule(verify),
|
||
"/api/admin/run-session-processor?processor=verification", "POST", 900),
|
||
("session-processor:usage", _seconds_to_schedule(usage),
|
||
"/api/admin/run-session-processor?processor=usage", "POST", 300),
|
||
("corporate-memory", _seconds_to_schedule(corpmem), "/api/admin/run-corporate-memory", "POST", 900),
|
||
]
|
||
|
||
_running = True
|
||
|
||
|
||
def _signal_handler(sig, frame):
|
||
global _running
|
||
logger.info(f"Received signal {sig}, shutting down...")
|
||
_running = False
|
||
|
||
|
||
def _call_api(endpoint: str, method: str, timeout_sec: int) -> bool:
|
||
"""Call the main app API. Returns True on success."""
|
||
url = f"{API_URL}{endpoint}"
|
||
headers = {}
|
||
token = _get_auth_token()
|
||
if token:
|
||
headers["Authorization"] = f"Bearer {token}"
|
||
try:
|
||
if method == "POST":
|
||
resp = httpx.post(url, headers=headers, timeout=timeout_sec)
|
||
else:
|
||
resp = httpx.get(url, headers=headers, timeout=timeout_sec)
|
||
if resp.status_code < 400:
|
||
logger.info(f"Job {endpoint}: {resp.status_code}")
|
||
return True
|
||
else:
|
||
logger.warning(f"Job {endpoint}: HTTP {resp.status_code} - {resp.text[:200]}")
|
||
return False
|
||
except Exception as e:
|
||
logger.error(f"Job {endpoint} failed: {e}")
|
||
try:
|
||
from src.observability import get_posthog
|
||
get_posthog().capture_exception(
|
||
e,
|
||
distinct_id="system",
|
||
properties={"job": endpoint, "method": method, "component": "scheduler"},
|
||
)
|
||
except Exception:
|
||
logger.exception("PostHog capture_exception failed in scheduler")
|
||
return False
|
||
|
||
|
||
def run():
|
||
signal.signal(signal.SIGTERM, _signal_handler)
|
||
signal.signal(signal.SIGINT, _signal_handler)
|
||
|
||
jobs = build_jobs()
|
||
tick = resolved_tick_seconds()
|
||
logger.info(
|
||
"Scheduler started. API_URL=%s, %d jobs, tick=%ds. Schedules: %s",
|
||
API_URL, len(jobs), tick,
|
||
{name: schedule for name, schedule, *_ in jobs},
|
||
)
|
||
|
||
last_run: dict[str, str | None] = {name: None for name, *_ in jobs}
|
||
|
||
# Per-tick concurrency: one thread per job slot, so a 900s verification
|
||
# run can't block the 60s health-check or the 30s data-refresh from
|
||
# firing on their own cadences (PR #232 review fix). Pure I/O workload
|
||
# (httpx) — GIL is irrelevant. `in_flight` prevents the same job being
|
||
# re-launched on a subsequent tick while the previous invocation is
|
||
# still running; otherwise a 10-min run during which 20 ticks fire
|
||
# would queue 20 duplicate POSTs against the same processor (the
|
||
# admin endpoint's per-processor lock would 409 most of them, but
|
||
# they'd still be wasted requests + audit-log noise).
|
||
in_flight: set[str] = set()
|
||
in_flight_lock = threading.Lock()
|
||
executor = ThreadPoolExecutor(max_workers=max(4, len(jobs)))
|
||
|
||
while _running:
|
||
now_iso = datetime.now(timezone.utc).isoformat()
|
||
for name, schedule, endpoint, method, timeout_sec in jobs:
|
||
if not is_table_due(schedule, last_run[name]):
|
||
continue
|
||
with in_flight_lock:
|
||
if name in in_flight:
|
||
# Previous tick's invocation hasn't returned yet; skip.
|
||
continue
|
||
in_flight.add(name)
|
||
logger.info("Running job: %s (%s)", name, schedule)
|
||
executor.submit(
|
||
_run_job, name, endpoint, method, timeout_sec, now_iso,
|
||
last_run, in_flight, in_flight_lock,
|
||
)
|
||
time.sleep(tick)
|
||
|
||
logger.info("Scheduler stopping; waiting for in-flight jobs.")
|
||
executor.shutdown(wait=True)
|
||
logger.info("Scheduler stopped.")
|
||
|
||
|
||
def _run_job(
|
||
name: str,
|
||
endpoint: str,
|
||
method: str,
|
||
timeout: int,
|
||
now_iso: str,
|
||
last_run: dict[str, "str | None"],
|
||
in_flight: set[str],
|
||
in_flight_lock: threading.Lock,
|
||
) -> None:
|
||
"""Execute one scheduled job + bookkeeping. Lifted out of run() so it's
|
||
unit-testable.
|
||
|
||
Advances last_run on terminal state (success OR failure) so a permanently
|
||
failing job retries on its cadence (e.g. 15 min), not on every scheduler
|
||
tick (default 30s). Pre-fix behavior caused a hot-loop on persistent 5xx —
|
||
30× more requests + LLM tokens than the operator configured. Errors still
|
||
surface via _call_api's logging + audit_log on the receiving side.
|
||
"""
|
||
try:
|
||
_call_api(endpoint, method, timeout)
|
||
finally:
|
||
last_run[name] = now_iso
|
||
with in_flight_lock:
|
||
in_flight.discard(name)
|
||
|
||
|
||
if __name__ == "__main__":
|
||
run()
|