Public Access
adminandClaude Sonnet 4.6
dbc26bcc30
Matcher improvements (matcher.py): - Plural normalization: 'tortillas'→'tortilla', 'thighs'→'thigh' so subset recall check works without stemmer - Precision floor lowered 0.45→0.30: allows 'Bacon'→'Wright Brand Bacon' (1/3=0.33) while exclusion words still block category contaminants - _EXCLUSION_WORDS now normalized through same singularizer for consistency LLM second-pass (llm_matcher.py): - run_llm_match_job(): for each still-unmatched ingredient, collects top-12 candidates from grocery catalog ranked by fuzzy×precision (same metric as AUTO matcher), then asks Ollama to pick the best match - Candidate scoring: combined = (partial_token_sort_ratio/100) × precision ensures "McCormick Black Pepper" outranks "Dr Pepper" for 'Black Pepper' - Stores picks as source='auto_llm' (confidence=0.750) - Ollama Cloud endpoint: https://ollama.com/v1, model: kimi-k2.6:cloud Migration 0010: adds 'auto_llm' to ingredient_match_source_enum Config: OLLAMA_BASE_URL / OLLAMA_API_KEY / OLLAMA_MODEL settings Docker-compose: wires all three Ollama + Spoonacular env vars to backend/scheduler Scraper service: calls run_llm_match_job after run_match_job on every scrape Results: AUTO matcher went from 36→25 unmatched (plural normalization fix), LLM added 3 more (Black Pepper, Zucchini, Chicken Thighs). Remaining 22 are genuine Lucky CA catalog gaps (standalone olive oil, dried spices, etc. not in Swiftly weekly ad). Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
108 lines
3.3 KiB
YAML
108 lines
3.3 KiB
YAML
version: "3.8"
|
|
|
|
services:
|
|
backend:
|
|
build:
|
|
context: ./backend
|
|
dockerfile: Dockerfile
|
|
expose:
|
|
- "8000"
|
|
environment:
|
|
- DATABASE_URL=postgresql://mealplanner:${POSTGRES_PASSWORD}@db:5432/mealplanner
|
|
- SENDGRID_API_KEY=${SENDGRID_API_KEY}
|
|
- SPOONACULAR_API_KEY=${SPOONACULAR_API_KEY}
|
|
- OLLAMA_BASE_URL=${OLLAMA_BASE_URL:-https://ollama.com/v1}
|
|
- OLLAMA_API_KEY=${OLLAMA_API_KEY}
|
|
- OLLAMA_MODEL=${OLLAMA_MODEL:-kimi-k2.6:cloud}
|
|
- LUCKY_CA_URL=${LUCKY_CA_URL:-https://luckysupermarkets.com}
|
|
- LUCKY_STORE_ID=${LUCKY_STORE_ID:-757}
|
|
- SWIFTLY_API_BASE=${SWIFTLY_API_BASE:-https://prod.swiftlyapi.net}
|
|
- SWIFTLY_CATEGORIES_URL=${SWIFTLY_CATEGORIES_URL:-https://luckysupermarkets.com/categories}
|
|
- AI_IMAGE_ENABLED=${AI_IMAGE_ENABLED:-false}
|
|
- LOG_LEVEL=${LOG_LEVEL:-INFO}
|
|
- SECRET_KEY=${SECRET_KEY}
|
|
- ADMIN_TOKEN=${ADMIN_TOKEN}
|
|
- SESSION_PASSWORD=${SESSION_PASSWORD}
|
|
- EMAIL_BACKEND=${EMAIL_BACKEND:-console}
|
|
- ADMIN_EMAIL=${ADMIN_EMAIL:-}
|
|
- APP_BASE_URL=${APP_BASE_URL:-http://localhost}
|
|
depends_on:
|
|
db:
|
|
condition: service_healthy
|
|
restart: unless-stopped
|
|
healthcheck:
|
|
test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
|
|
interval: 30s
|
|
timeout: 10s
|
|
retries: 3
|
|
|
|
scheduler:
|
|
build:
|
|
context: ./backend
|
|
dockerfile: Dockerfile
|
|
command: python -m app.scheduler
|
|
environment:
|
|
- DATABASE_URL=postgresql://mealplanner:${POSTGRES_PASSWORD}@db:5432/mealplanner
|
|
- SENDGRID_API_KEY=${SENDGRID_API_KEY}
|
|
- SPOONACULAR_API_KEY=${SPOONACULAR_API_KEY}
|
|
- OLLAMA_BASE_URL=${OLLAMA_BASE_URL:-https://ollama.com/v1}
|
|
- OLLAMA_API_KEY=${OLLAMA_API_KEY}
|
|
- OLLAMA_MODEL=${OLLAMA_MODEL:-kimi-k2.6:cloud}
|
|
- LUCKY_CA_URL=${LUCKY_CA_URL:-https://luckysupermarkets.com}
|
|
- LUCKY_STORE_ID=${LUCKY_STORE_ID:-757}
|
|
- SWIFTLY_API_BASE=${SWIFTLY_API_BASE:-https://prod.swiftlyapi.net}
|
|
- SWIFTLY_CATEGORIES_URL=${SWIFTLY_CATEGORIES_URL:-https://luckysupermarkets.com/categories}
|
|
- AI_IMAGE_ENABLED=${AI_IMAGE_ENABLED:-false}
|
|
- LOG_LEVEL=${LOG_LEVEL:-INFO}
|
|
- SECRET_KEY=${SECRET_KEY}
|
|
- ADMIN_TOKEN=${ADMIN_TOKEN}
|
|
- SESSION_PASSWORD=${SESSION_PASSWORD}
|
|
- EMAIL_BACKEND=${EMAIL_BACKEND:-console}
|
|
- ADMIN_EMAIL=${ADMIN_EMAIL:-}
|
|
- APP_BASE_URL=${APP_BASE_URL:-http://localhost}
|
|
depends_on:
|
|
db:
|
|
condition: service_healthy
|
|
restart: unless-stopped
|
|
|
|
frontend:
|
|
build:
|
|
context: ./frontend
|
|
dockerfile: Dockerfile
|
|
expose:
|
|
- "80"
|
|
depends_on:
|
|
- backend
|
|
restart: unless-stopped
|
|
|
|
db:
|
|
image: postgres:15-alpine
|
|
volumes:
|
|
- postgres_data:/var/lib/postgresql/data
|
|
environment:
|
|
- POSTGRES_USER=mealplanner
|
|
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
|
- POSTGRES_DB=mealplanner
|
|
restart: unless-stopped
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "pg_isready -U mealplanner -d mealplanner"]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 5
|
|
|
|
nginx:
|
|
image: nginx:alpine
|
|
ports:
|
|
- "8081:80"
|
|
- "8444:443"
|
|
volumes:
|
|
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
|
|
- ./nginx/ssl:/etc/nginx/ssl:ro
|
|
depends_on:
|
|
- frontend
|
|
- backend
|
|
restart: unless-stopped
|
|
|
|
volumes:
|
|
postgres_data:
|