refactor: give the frontend its own directory and split the API into routers
The Site's page sat at the repository root while its scripts lived in local/static, a split with no reason behind it. They are together in web/ now, with the page as index.html, which is also what the image serves. app.py held the adapters, the configuration, the shared query helpers and nineteen routes; customer.py held fourteen more but could not import from it without a cycle, so it was wired by passing nine callables into install_routes. Configuration and shared helpers move to local/runtime.py, the rules for attaching artwork to an order move to local/artwork.py where a customer correction and an operator final-file set can share them, and the routes become seven routers under local/api. app.py is 48 lines that create the application, apply the middleware and include them. Routers import downwards only. Three faults came out of the extraction and are worth recording, because each passed a check that looked sufficient. ast reports a function's line at the def, so every decorator on the line above fell outside the extracted range: twelve routes and the security middleware were defined but never registered, and the files still imported and parsed cleanly. Names the old closure renamed on the way in, and a Jsonb import, were missing in three modules. A name-resolution pass over every new module found those; the route count matching the original exactly, 32, is what confirmed the first. The release gate's marker for the fake payment adapter pointed at app.py and the adapter moved to runtime.py, so the gate passed while the condition it guards was unchanged. That is the same silent decay 2.5 set out to fix. A test now asserts every marker still matches something in its file, so the next move fails loudly. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -7,7 +7,7 @@ ARG PYTHON_BASE_IMAGE=python:3.12-slim@sha256:2f17fc044b579bab302c2e8054d3a686e2
|
||||
ARG NGINX_BASE_IMAGE=nginx:alpine@sha256:62ff2089abf5a9ed33bd232895bef5e22f7bb4b200675cec49a5ebc48e3d4ac8
|
||||
FROM ${PYTHON_BASE_IMAGE} AS policy
|
||||
WORKDIR /build
|
||||
COPY dtf-site.html /build/dtf-site.html
|
||||
COPY web /build/web
|
||||
COPY local /build/local
|
||||
COPY deploy /build/deploy
|
||||
ENV NGINX_TEMPLATE=/build/deploy/nginx.conf.template
|
||||
@@ -22,8 +22,8 @@ LABEL org.opencontainers.image.title="DTF Site and Kanban" \
|
||||
org.opencontainers.image.source="DTF System repository"
|
||||
ENV WEB_INDEX=index.html PUBLIC_HOST=invalid.example S3_PUBLIC_ENDPOINT=https://invalid.example
|
||||
COPY --from=policy /build/default.conf.template /etc/nginx/templates/default.conf.template
|
||||
COPY dtf-site.html /usr/share/nginx/html/index.html
|
||||
COPY local/static/ /usr/share/nginx/html/
|
||||
COPY web/ /usr/share/nginx/html/
|
||||
|
||||
# The official entrypoint renders the server configuration at startup and Nginx
|
||||
# writes its PID/cache files. Keep the service non-root while granting it
|
||||
# ownership of only those runtime locations. This works in Docker Swarm,
|
||||
|
||||
@@ -38,7 +38,7 @@ SOURCE_BLOCKERS = {
|
||||
# matching when R2 support landed; they were removed rather than left to rot.
|
||||
# What remains is the real blocker: no production payment or messaging adapter
|
||||
# exists, so these lines must change before a release can be meaningful.
|
||||
'local/app.py': (
|
||||
'local/runtime.py': (
|
||||
'payment = FakePayment()',
|
||||
),
|
||||
'local/worker.py': (
|
||||
|
||||
@@ -50,6 +50,26 @@ def valid_config():
|
||||
return values
|
||||
|
||||
|
||||
class SourceMarkerTests(unittest.TestCase):
|
||||
"""A marker that stops matching weakens the gate without failing it.
|
||||
|
||||
This is how four markers silently died when the runtime gained R2 support,
|
||||
and how the payment one died again when it moved to runtime.py. Assert that
|
||||
every marker still points at something real.
|
||||
"""
|
||||
|
||||
def test_every_marker_is_found_in_its_file(self):
|
||||
from deploy.production_preflight import ROOT, SOURCE_BLOCKERS
|
||||
for relative, markers in SOURCE_BLOCKERS.items():
|
||||
path = ROOT / relative
|
||||
self.assertTrue(path.exists(), f'{relative} no longer exists')
|
||||
text = path.read_text()
|
||||
for marker in markers:
|
||||
self.assertIn(marker, text,
|
||||
f'{relative} no longer contains {marker!r}: the gate '
|
||||
'would pass without the condition being resolved')
|
||||
|
||||
|
||||
class ProductionPreflightTests(unittest.TestCase):
|
||||
def test_structurally_complete_metadata_passes(self):
|
||||
self.assertEqual(config_errors(valid_config()), [])
|
||||
@@ -80,7 +100,7 @@ class ProductionPreflightTests(unittest.TestCase):
|
||||
|
||||
def test_fake_checkout_is_explicitly_blocked(self):
|
||||
errors = source_errors()
|
||||
self.assertTrue(any('local/app.py remains local-only' in error for error in errors))
|
||||
self.assertTrue(any('local/runtime.py remains local-only' in error for error in errors))
|
||||
self.assertTrue(any('local/worker.py remains local-only' in error for error in errors))
|
||||
|
||||
def test_secret_reuse_and_incoherent_limits_are_rejected(self):
|
||||
|
||||
Reference in New Issue
Block a user