n.siegfried
66da5b708a
The api crash-looped because DATABASE_URL had an un-encoded special-char
password (@/!), so SQLAlchemy parsed part of the password as the host
("...@db" → name resolution failure).
db.py now prefers building the connection from POSTGRES_USER/PASSWORD/DB via
SQLAlchemy URL.create(), which encodes the password automatically — any
password works with no manual escaping. DATABASE_URL remains an optional
override (still must be hand-encoded if used). docker-compose now passes the
POSTGRES_* vars to the api container; DEPLOYMENT.md updated (incl. a Portainer
env-vars note).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
63 lines
2.1 KiB
Python
63 lines
2.1 KiB
Python
"""Database engine and session setup.
|
|
|
|
Connection precedence:
|
|
1. POSTGRES_USER + POSTGRES_PASSWORD + POSTGRES_DB (preferred) — the URL is
|
|
built with SQLAlchemy's URL.create(), which encodes the password for you,
|
|
so passwords with special characters (@ ! # : / …) need NO manual escaping.
|
|
Host/port default to POSTGRES_HOST=db / POSTGRES_PORT=5432.
|
|
2. DATABASE_URL — a full SQLAlchemy URL, if you'd rather supply one directly
|
|
(you must URL-encode any special characters in the password yourself).
|
|
3. Neither set → a local SQLite file, so the API runs anywhere without Postgres.
|
|
|
|
The schema is identical either way (SQLAlchemy handles dialect differences).
|
|
"""
|
|
import os
|
|
from sqlalchemy import create_engine, URL
|
|
from sqlalchemy.orm import sessionmaker, DeclarativeBase
|
|
|
|
# Load a local .env if present (dev convenience).
|
|
try:
|
|
from dotenv import load_dotenv
|
|
load_dotenv()
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
def _resolve_url():
|
|
user = os.getenv("POSTGRES_USER")
|
|
pw = os.getenv("POSTGRES_PASSWORD")
|
|
dbname = os.getenv("POSTGRES_DB")
|
|
if user and pw and dbname:
|
|
# Build from components — password is encoded automatically.
|
|
return URL.create(
|
|
"postgresql+psycopg",
|
|
username=user, password=pw,
|
|
host=os.getenv("POSTGRES_HOST", "db"),
|
|
port=int(os.getenv("POSTGRES_PORT", "5432")),
|
|
database=dbname,
|
|
)
|
|
return os.getenv("DATABASE_URL") or "sqlite:///./wpsuite.db"
|
|
|
|
|
|
DATABASE_URL = _resolve_url()
|
|
|
|
# SQLite needs this flag from FastAPI's threadpool; Postgres ignores it.
|
|
_is_sqlite = isinstance(DATABASE_URL, str) and DATABASE_URL.startswith("sqlite")
|
|
connect_args = {"check_same_thread": False} if _is_sqlite else {}
|
|
|
|
engine = create_engine(DATABASE_URL, connect_args=connect_args, pool_pre_ping=True, future=True)
|
|
SessionLocal = sessionmaker(bind=engine, autoflush=False, autocommit=False, future=True)
|
|
|
|
|
|
class Base(DeclarativeBase):
|
|
pass
|
|
|
|
|
|
def get_db():
|
|
"""FastAPI dependency that yields a session and always closes it."""
|
|
db = SessionLocal()
|
|
try:
|
|
yield db
|
|
finally:
|
|
db.close()
|