0f35a0c484
Consolidated merge of feat/tag-suggestions branch. Original 64-commit history was lost to git-object corruption in a Nextcloud-synced checkout; this single commit captures the equivalent diff. Includes: - pgvector-backed tag suggestion infra (WD14 + SigLIP centroids, ml-worker container, Celery tasks, suggestion service, accept/reject endpoints + modal UI with green/red chip buttons) - Character/fandom integrity: title-case normalization on every write path, fandom-id backfill, maintenance task + settings button, migrations g26041901 + h26041901 to canonicalize legacy rows with case-only duplicate merging - Tag-underscores + modal polish: WD14 name canonicalization at emit + accept + add/bulk-add paths, migration i26041901 for legacy-row rename-or-merge across character/fandom/NULL kinds, suggestion-accept refresh parity via awaited loadTags, persistent chip tint
142 lines
4.0 KiB
YAML
142 lines
4.0 KiB
YAML
services:
|
|
# Redis message broker for Celery
|
|
redis:
|
|
image: redis:7-alpine
|
|
ports:
|
|
- "6379:6379"
|
|
volumes:
|
|
- redis_data:/data
|
|
healthcheck:
|
|
test: ["CMD", "redis-cli", "ping"]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 5
|
|
restart: unless-stopped
|
|
|
|
# PostgreSQL database
|
|
postgres:
|
|
image: pgvector/pgvector:pg16
|
|
environment:
|
|
POSTGRES_USER: ${DB_USER:-imagerepo}
|
|
POSTGRES_PASSWORD: ${DB_PASS:-postgres}
|
|
POSTGRES_DB: ${DB_NAME:-imagerepo}
|
|
volumes:
|
|
- postgres_data:/var/lib/postgresql/data
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-imagerepo}"]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 5
|
|
restart: unless-stopped
|
|
|
|
# Flask web application
|
|
web:
|
|
build: .
|
|
ports:
|
|
- "5000:5000"
|
|
environment:
|
|
- TZ=${TZ:-America/New_York}
|
|
- DB_USER=${DB_USER:-imagerepo}
|
|
- DB_PASS=${DB_PASS:-postgres}
|
|
- DB_HOST=postgres
|
|
- DB_PORT=5432
|
|
- DB_NAME=${DB_NAME:-imagerepo}
|
|
- CELERY_BROKER_URL=redis://redis:6379/0
|
|
- CELERY_RESULT_BACKEND=redis://redis:6379/0
|
|
volumes:
|
|
- ./imagerepo/images:/images
|
|
- ./import:/import
|
|
- ./migrations:/app/migrations # For dev
|
|
depends_on:
|
|
postgres:
|
|
condition: service_healthy
|
|
redis:
|
|
condition: service_healthy
|
|
restart: unless-stopped
|
|
|
|
# Celery worker for processing import tasks (heavy processing)
|
|
# Handles: import, thumbnail, sidecar, default queues
|
|
worker:
|
|
build: .
|
|
command: celery -A app.celery_app:celery worker --loglevel=info -Q import,thumbnail,sidecar,default --concurrency=${CELERY_WORKER_CONCURRENCY:-2}
|
|
environment:
|
|
- TZ=${TZ:-America/New_York}
|
|
- DB_USER=${DB_USER:-imagerepo}
|
|
- DB_PASS=${DB_PASS:-postgres}
|
|
- DB_HOST=postgres
|
|
- DB_PORT=5432
|
|
- DB_NAME=${DB_NAME:-imagerepo}
|
|
- CELERY_BROKER_URL=redis://redis:6379/0
|
|
- CELERY_RESULT_BACKEND=redis://redis:6379/0
|
|
- CELERY_WORKER_CONCURRENCY=${CELERY_WORKER_CONCURRENCY:-2}
|
|
volumes:
|
|
- ./imagerepo/images:/images
|
|
- ./import:/import
|
|
depends_on:
|
|
postgres:
|
|
condition: service_healthy
|
|
redis:
|
|
condition: service_healthy
|
|
restart: unless-stopped
|
|
|
|
# Celery scheduler: Beat (periodic tasks) + Worker (maintenance/scan queues)
|
|
# Handles: maintenance, scan queues + periodic task scheduling
|
|
# This ensures maintenance tasks aren't blocked by large import queues
|
|
scheduler:
|
|
build: .
|
|
command: celery -A app.celery_app:celery worker --beat --loglevel=info -Q maintenance,scan --concurrency=1
|
|
environment:
|
|
- TZ=${TZ:-America/New_York}
|
|
- DB_USER=${DB_USER:-imagerepo}
|
|
- DB_PASS=${DB_PASS:-postgres}
|
|
- DB_HOST=postgres
|
|
- DB_PORT=5432
|
|
- DB_NAME=${DB_NAME:-imagerepo}
|
|
- CELERY_BROKER_URL=redis://redis:6379/0
|
|
- CELERY_RESULT_BACKEND=redis://redis:6379/0
|
|
- IMPORT_EVERY_SECONDS=${IMPORT_EVERY_SECONDS:-28800}
|
|
volumes:
|
|
- ./imagerepo/images:/images
|
|
- ./import:/import
|
|
depends_on:
|
|
postgres:
|
|
condition: service_healthy
|
|
redis:
|
|
condition: service_healthy
|
|
restart: unless-stopped
|
|
|
|
# ML inference worker (CPU-only): WD14 tagging + SigLIP embeddings
|
|
# Handles: ml queue
|
|
ml-worker:
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile.ml
|
|
command: celery -A app.celery_app:celery worker --loglevel=info -Q ml --concurrency=1
|
|
environment:
|
|
- TZ=${TZ:-America/New_York}
|
|
- DB_USER=${DB_USER:-imagerepo}
|
|
- DB_PASS=${DB_PASS:-postgres}
|
|
- DB_HOST=postgres
|
|
- DB_PORT=5432
|
|
- DB_NAME=${DB_NAME:-imagerepo}
|
|
- CELERY_BROKER_URL=redis://redis:6379/0
|
|
- CELERY_RESULT_BACKEND=redis://redis:6379/0
|
|
- ML_MODEL_DIR=/models
|
|
volumes:
|
|
- ./imagerepo/images:/images:ro
|
|
depends_on:
|
|
postgres:
|
|
condition: service_healthy
|
|
redis:
|
|
condition: service_healthy
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
cpus: '4.0'
|
|
memory: 8G
|
|
restart: unless-stopped
|
|
|
|
volumes:
|
|
redis_data:
|
|
postgres_data:
|