Merge branch 'chore/dependency-upgrade-latest'

Author: thomaxxl

.gitignore

@@ -115,4 +115,4 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-tmp/
+/tmp/

examples/docker_fastapi_demo/backend/README.md

@@ -1,57 +1,45 @@
 # Northwind Backend
 
-This backend contains two SAFRS app variants over the same Northwind model layer:
+This backend is the FastAPI SAFRS backend used by the demo container.
 
-- a Flask app using `SafrsApi`
-- a FastAPI app using `SafrsFastAPI`
-
-They exist side by side so the same validation project can be used to compare consumer-facing behavior easily.
+It can also be run standalone from this directory with `run.py`.
 
 ## Current intent
 
-- both backends use the same SQLite database
-- both backends expose the same resource and relationship names as the Northwind `admin.yaml`
-- both backends use the same `admin.yaml`
-- both backends are intended to run on port `5656`
-
-The main SAFRS development track is FastAPI, but Flask remains the reference behavior. This project supports switching between them quickly.
+- the demo container uses the FastAPI variant only
+- the backend uses the Northwind SQLite database
+- it exposes the same resource and relationship names as the shipped Northwind `admin.yaml`
+- it serves the same `admin.yaml` used by the frontend
+- the default standalone port is `5656`
 
-## Quick start
+## Run standalone
 
-Create a virtual environment, install the requirements, and run one backend variant from this directory:
+From this directory:
 
 ```bash
 python -m venv .venv
 . .venv/bin/activate
 pip install -r requirements.txt
-python run.py fastapi
-```
-
-Or:
-
-```bash
-python run.py flask
+python run.py
 ```
 
-Default URL targets for both variants:
+Because `requirements.txt` contains `-e ../vendor/safrs`, run `pip install -r requirements.txt` from the `backend/` directory so that relative path resolves correctly.
 
-- API root: `http://127.0.0.1:5656/api`
-- Admin schema: `http://127.0.0.1:5656/ui/admin/admin.yaml`
-
-## Switching
-
-Use one process at a time on the same port:
-
-- `python run.py fastapi`
-- `python run.py flask`
+`python run.py` defaults to the FastAPI app.
 
 You can also override host and port:
 
 ```bash
 python run.py fastapi --host 127.0.0.1 --port 5656
-python run.py flask --host 127.0.0.1 --port 5656
 ```
 
+Default URL targets:
+
+- API root: `http://127.0.0.1:5656/api`
+- docs: `http://127.0.0.1:5656/docs`
+- OpenAPI: `http://127.0.0.1:5656/jsonapi.json`
+- Admin schema: `http://127.0.0.1:5656/ui/admin/admin.yaml`
+
 ## Current scope
 
 The backend now exposes the full resource set currently described in `reference/nw-admin.yaml`:
@@ -74,4 +62,4 @@ The backend now exposes the full resource set currently described in `reference/
 - `Territory`
 - `Union`
 
-The active validation focus is no longer basic exposure. It is parity: the Flask and FastAPI apps should both honor the same documented contract and accept the same consumer-facing include paths.
+The active validation focus is consumer-facing parity and behavior validation against the frontend and example clients.

examples/docker_fastapi_demo/backend/run.py

@@ -19,7 +19,7 @@ def parse_args() -> argparse.Namespace:
         "framework",
         nargs="?",
         choices=("fastapi", "flask"),
-        help="Backend implementation to run. Defaults to NORTHWIND_BACKEND or fastapi.",
+        help="Backend implementation to run. Defaults to fastapi.",
     )
     parser.add_argument("--host", help="Bind host override.")
     parser.add_argument("--port", type=int, help="Bind port override.")
@@ -29,7 +29,7 @@ def parse_args() -> argparse.Namespace:
 def main() -> None:
     args = parse_args()
     settings = get_settings()
-    framework = (args.framework or settings.default_framework).lower()
+    framework = (args.framework or "fastapi").lower()
     host = args.host or settings.host
     port = args.port or settings.port
 
@@ -43,9 +43,9 @@ def main() -> None:
     from fastapi import FastAPI
     from fastapi.middleware.wsgi import WSGIMiddleware
 
-    flask_runner = FastAPI(docs_url=None, redoc_url=None, openapi_url=None)
-    flask_runner.mount("/", WSGIMiddleware(create_flask_app()))
-    uvicorn.run(flask_runner, host=host, port=port, log_level="info")
+    wsgi_runner = FastAPI(docs_url=None, redoc_url=None, openapi_url=None)
+    wsgi_runner.mount("/", WSGIMiddleware(create_flask_app()))
+    uvicorn.run(wsgi_runner, host=host, port=port, log_level="info")
 
 
 if __name__ == "__main__":

safrs/__init__.py

@@ -32,10 +32,11 @@ def _raise_missing_flask_adapter_error(exc: ModuleNotFoundError) -> None:
 except ModuleNotFoundError as exc:
     if exc.name not in _MISSING_FLASK_ADAPTER_DEPS:
         raise
+    _missing_flask_adapter_exc = exc
 
     class SAFRSAPI:  # type: ignore[no-redef]
         def __init__(self, *_args: Any, **_kwargs: Any) -> None:
-            _raise_missing_flask_adapter_error(exc)
+            _raise_missing_flask_adapter_error(_missing_flask_adapter_exc)
 
 
 SafrsApi = SAFRSAPI