2112023b6e
* Phase 4: async pipeline (Celery+Redis), Postgres job state, local-fs blob storage, API-key auth, Prometheus metrics Co-Authored-By: adrian kuman firmansah <adriancuman@gmail.com> * Phase 4: fix sync-mode rollback orphaning blobs + use is_relative_to for path-escape check Devin Review on PR #3 found two real bugs: 1. Sync path mark_failed was rolled back by the request-scoped session. When the pipeline raised an exception in ?sync=true mode, _run_inline modified the FastAPI session and re-raised; get_session caught the exception, called session.rollback(), and wiped both the create() and the mark_failed() writes. The blob was already on disk, so it was permanently orphaned with no DB record. Fix: commit the pending row immediately after create(), and run all subsequent state transitions in independent session_scope blocks (matching the worker task pattern). 2. _resolve used str.startswith for path-escape detection, which lets a sibling directory whose name begins with the storage root pass (e.g. /app/blobs_evil vs /app/blobs). Switched to Path.is_relative_to. Added regression tests for both. Co-Authored-By: adrian kuman firmansah <adriancuman@gmail.com> * Phase 4: honor queue_enabled setting + resolve base_dir for path comparisons Two more bugs found by Devin Review: 3. queue_enabled was declared in config and documented in .env.example but never read by the route. A fresh dev install with QUEUE_ENABLED=false (the default) would still enqueue, then fail with a Redis connection error. Fixed by making the ?sync= query param default to None and resolving to (not queue_enabled) inside the route. Tests now set QUEUE_ENABLED=true so the async flow stays exercised, and a new test verifies the inline fallback when the queue is disabled. 4. LocalFsBlobStorage stored base_dir as-is. _resolve resolved its candidate paths, so the empty-dir cleanup loop in delete() compared a resolved candidate against an unresolved base_dir and broke on the first iteration (no cleanup ever happened). Fixed by resolving base_dir once in __init__ so every path comparison is apples-to-apples. Co-Authored-By: adrian kuman firmansah <adriancuman@gmail.com> * Phase 4: derive ocr_jobs_total from DB so worker writes are visible at /metrics Devin Review correctly noted the Counter-based JOBS_TOTAL would never increment in production because the worker runs in a separate process from the API and the registry is process-local. Replaced JOBS_TOTAL with a custom Collector that issues SELECT status, COUNT(*) FROM jobs GROUP BY status on every /metrics scrape. Result: the metric stays accurate regardless of which process wrote the row. Also corrected the metrics.py docstring (the old comment claimed the counter was 'incremented by the worker', which was the bug). Removed the JOBS_TOTAL.inc() calls from the sync route — the DB collector covers both paths now. JOB_PROCESSING_SECONDS stays as an API-process histogram with an updated docstring noting its scope; cross-process latency belongs to derived dashboards over jobs.created_at/updated_at. Added regression test test_metrics_jobs_total_reflects_worker_writes. Co-Authored-By: adrian kuman firmansah <adriancuman@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: adrian kuman firmansah <adriancuman@gmail.com>
91 lines
2.4 KiB
YAML
91 lines
2.4 KiB
YAML
# Phase 4 stack: API + Celery worker + Redis (broker/result backend) +
|
|
# Postgres (job state). Object storage is intentionally NOT here — the
|
|
# `BlobStorage` interface uses the local filesystem mounted at /app/storage.
|
|
services:
|
|
api:
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile
|
|
image: ocr-sprint-service:dev
|
|
container_name: ocr-sprint-api
|
|
command:
|
|
[
|
|
"sh",
|
|
"-c",
|
|
"alembic upgrade head && uvicorn ocr_sprint.main:app --host 0.0.0.0 --port 8000",
|
|
]
|
|
ports:
|
|
- "8000:8000"
|
|
environment:
|
|
APP_ENV: docker
|
|
APP_LOG_LEVEL: INFO
|
|
OCR_USE_GPU: "false"
|
|
STORAGE_LOCAL_DIR: /app/storage
|
|
BLOB_STORAGE_DIR: /app/storage/blobs
|
|
REDIS_URL: redis://redis:6379/0
|
|
DATABASE_URL: postgresql+psycopg://ocr:ocr@postgres:5432/ocr_sprint
|
|
QUEUE_ENABLED: "true"
|
|
volumes:
|
|
- blob-storage:/app/storage/blobs
|
|
- paddle-models:/home/app/.paddleocr
|
|
depends_on:
|
|
postgres:
|
|
condition: service_healthy
|
|
redis:
|
|
condition: service_healthy
|
|
restart: unless-stopped
|
|
|
|
worker:
|
|
image: ocr-sprint-service:dev
|
|
container_name: ocr-sprint-worker
|
|
command: ["celery", "-A", "ocr_sprint.worker.celery_app", "worker", "-l", "info", "--concurrency=1"]
|
|
environment:
|
|
APP_ENV: docker
|
|
APP_LOG_LEVEL: INFO
|
|
OCR_USE_GPU: "false"
|
|
BLOB_STORAGE_DIR: /app/storage/blobs
|
|
REDIS_URL: redis://redis:6379/0
|
|
DATABASE_URL: postgresql+psycopg://ocr:ocr@postgres:5432/ocr_sprint
|
|
volumes:
|
|
- blob-storage:/app/storage/blobs
|
|
- paddle-models:/home/app/.paddleocr
|
|
depends_on:
|
|
postgres:
|
|
condition: service_healthy
|
|
redis:
|
|
condition: service_healthy
|
|
api:
|
|
condition: service_started
|
|
restart: unless-stopped
|
|
|
|
redis:
|
|
image: redis:7-alpine
|
|
container_name: ocr-sprint-redis
|
|
healthcheck:
|
|
test: ["CMD", "redis-cli", "ping"]
|
|
interval: 5s
|
|
timeout: 3s
|
|
retries: 5
|
|
restart: unless-stopped
|
|
|
|
postgres:
|
|
image: postgres:16-alpine
|
|
container_name: ocr-sprint-postgres
|
|
environment:
|
|
POSTGRES_USER: ocr
|
|
POSTGRES_PASSWORD: ocr
|
|
POSTGRES_DB: ocr_sprint
|
|
volumes:
|
|
- postgres-data:/var/lib/postgresql/data
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "pg_isready -U ocr -d ocr_sprint"]
|
|
interval: 5s
|
|
timeout: 3s
|
|
retries: 10
|
|
restart: unless-stopped
|
|
|
|
volumes:
|
|
blob-storage:
|
|
paddle-models:
|
|
postgres-data:
|