49992b3a26
Migrate from pip-install-e + setuptools to a uv workspace with a
committed uv.lock for deterministic deps. Switch both members to
hatchling, and move package sources into nested standard layout
(l4d2host/l4d2host/, l4d2web/l4d2web/) so builds work from a
read-only source tree — setuptools wrote egg-info to source under
the old layout, which broke uv sync on the root-owned /opt/left4me/src.
Local dev install: `pip install -e ./l4d2host -e ./l4d2web` -> `uv sync`.
.envrc switches from `layout python python3.13` to `use uv`. Python
pinned to 3.13 via .python-version.
l4d2web now declares its cross-dep on l4d2host explicitly via
[tool.uv.sources] (workspace = true). l4d2web/alembic.ini and
l4d2web/alembic/ stay at the project root (standard alembic layout).
Test fixes:
- tests/__init__.py added to both test dirs so pytest doesn't shadow
l4d2host as a namespace package via outer-dir walk.
- 3 CWD-relative paths in tests (l4d2web/static/css/{tokens,layout}.css
and js/sse.js) anchored to Path(__file__) so they survive layout
changes.
- Two test_install.py tests now monkeypatch HOME to tmp_path so they
stop silently mutating ~/.steam/sdk32 on every run.
628 tests pass under sandboxed `uv run pytest`.
Per docs/superpowers/plans/2026-05-15-uv-workspace-execution.md;
prereq for the ckn-bw bundle's uv-sync action (queued).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
58 lines
1.5 KiB
Python
58 lines
1.5 KiB
Python
from contextlib import contextmanager
|
|
import os
|
|
|
|
from flask import current_app, has_app_context
|
|
from sqlalchemy import create_engine
|
|
from sqlalchemy.orm import Session, sessionmaker
|
|
|
|
|
|
_engine = None
|
|
_engine_url = None
|
|
_Session = None
|
|
|
|
|
|
def get_database_url() -> str:
|
|
if has_app_context():
|
|
return str(current_app.config["DATABASE_URL"])
|
|
return os.getenv("DATABASE_URL", "sqlite:///l4d2web.db")
|
|
|
|
|
|
def get_engine():
|
|
global _engine
|
|
global _engine_url
|
|
global _Session
|
|
|
|
db_url = get_database_url()
|
|
if _engine is None or _engine_url != db_url:
|
|
connect_args = {"check_same_thread": False} if db_url.startswith("sqlite") else {}
|
|
_engine = create_engine(db_url, connect_args=connect_args)
|
|
if db_url.startswith("sqlite"):
|
|
with _engine.connect() as conn:
|
|
conn.exec_driver_sql("PRAGMA journal_mode=WAL;")
|
|
conn.exec_driver_sql("PRAGMA busy_timeout=5000;")
|
|
_engine_url = db_url
|
|
_Session = sessionmaker(bind=_engine, expire_on_commit=False)
|
|
return _engine
|
|
|
|
|
|
def init_db() -> None:
|
|
from l4d2web.models import Base
|
|
|
|
Base.metadata.create_all(bind=get_engine())
|
|
|
|
|
|
@contextmanager
|
|
def session_scope() -> Session:
|
|
global _Session
|
|
if _Session is None:
|
|
get_engine()
|
|
assert _Session is not None
|
|
session = _Session()
|
|
try:
|
|
yield session
|
|
session.commit()
|
|
except Exception:
|
|
session.rollback()
|
|
raise
|
|
finally:
|
|
session.close()
|