mirror of
https://github.com/got-feedBack/feedBack.git
synced 2026-07-21 20:31:21 +00:00
b3215694e7
The packaged desktop app died at startup:
File ".../Resources/slopsmith/server.py", line 71, in <module>
import appstate
ModuleNotFoundError: No module named 'appstate'
feedback-desktop's scripts/bundle-slopsmith.sh copies a HARDCODED list of core
files into the bundle -- server.py, VERSION, lib/, data/, static/,
plugins/__init__.py. The root-level appstate.py (#833) and routers/ (#834)
shipped fine in Docker, passed every test, and were silently dropped from the
packaged app.
Both now live under lib/, the one core directory every packaging path already
copies wholesale -- Dockerfile `COPY lib/`, docker-compose.yml, and the desktop
bundler's `cp -r lib` -- and that all three put on sys.path (on Windows via the
embeddable-Python ._pth, where PYTHONPATH is ignored: build-windows.sh writes
`../slopsmith` and `../slopsmith/lib`). No feedback-desktop change and no new
release are needed for this to take effect.
lib/ is also the CORRECT home under Principle V, and always was once the design
settled: with the injection seam, appstate.py constructs nothing and does no
import-time IO, and a route module only builds an APIRouter. The premise that
forced root placement -- "appstate opens sqlite at import" -- stopped being true
when configure() replaced ownership. The Dockerfile / .dockerignore /
docker-compose.yml entries added for the root layout are reverted; nothing else
in core changes (git mv, so --follow survives).
tests/test_packaging.py is the guard: it walks server.py's module-level imports,
keeps the ones resolving inside this repo, and fails if any lives outside a
directory the packagers copy -- with the ModuleNotFoundError spelled out. So the
next root-level core module can't ship broken. Negative-checked: restoring
appstate.py to the root fails it; the message names the file and the four
packaging files a root module would have to teach.
(It also has to skip `origin in {"built-in","frozen"}` -- on 3.14 the frozen
stdlib reports origin="frozen", and Path("frozen").resolve() lands inside the
repo, which flagged `os` and `stat` as first-party.)
Verified: the bundler's copy replicated exactly into a temp dir and booted with
PYTHONPATH=<bundle>:<bundle>/lib -- `import server`, `import appstate`,
`import routers.audio_effects` all resolve, appstate.meta_db is server.meta_db,
143 routes. The same simulation against origin/main reproduces the production
ModuleNotFoundError. pytest 2398 passed (2348 + 50 new); route table still
identical to origin/main (paths, methods, order); docker build context reaches
lib/appstate.py and lib/routers/ with no __pycache__; native uvicorn boot smoke
serves /api/version, /api/library, the moved audio-effects router, and all three
migrated plugins' src/ graphs; eslint 0 errors.
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
32 lines
1.4 KiB
Python
32 lines
1.4 KiB
Python
"""FastAPI route modules extracted from ``server.py`` (R3).
|
|
|
|
Each module here exposes a module-level ``router`` (a ``fastapi.APIRouter``)
|
|
that ``server.py`` mounts with ``app.include_router(...)`` at the point in the
|
|
file where those routes used to be defined — FastAPI matches routes in
|
|
registration order, so keeping the mount site preserves it.
|
|
|
|
**Routers must never ``import server``.** They reach core singletons through
|
|
the injected seam instead::
|
|
|
|
import appstate
|
|
|
|
@router.get("/api/thing")
|
|
def get_thing():
|
|
return appstate.meta_db.thing()
|
|
|
|
and always as a **module attribute, at call time** — never
|
|
``from appstate import meta_db``, which freezes the binding and defeats both a
|
|
later ``appstate.configure()`` and ``monkeypatch.setattr``. See ``appstate.py``.
|
|
|
|
Dependencies flow one way: ``server -> routers -> appstate``.
|
|
|
|
**Why this lives under ``lib/``.** ``lib/`` is the only core directory every
|
|
packaging path already copies wholesale — the Dockerfile (``COPY lib/``),
|
|
``docker-compose.yml``, and feedback-desktop's ``bundle-slopsmith.sh``
|
|
(``cp -r lib``) — and all three put it on ``sys.path``. A root-level package
|
|
ships in Docker but is silently dropped from the packaged desktop app, whose
|
|
bundler copies a hardcoded file list. Route modules import nothing at module
|
|
scope beyond FastAPI and ``appstate``, so they do no import-time IO and satisfy
|
|
Principle V's rule for ``lib/``.
|
|
"""
|