Browse Source

Fix mounting sub-applications under APIRouter

pull/15232/head
giria660 4 months ago
parent
commit
88223ea7ca
No known key found for this signature in database GPG Key ID: 3D8290B3CD372BA4
  1. 5
      fastapi/routing.py
  2. 75
      tests/test_router_mount.py

5
fastapi/routing.py

@ -1499,6 +1499,9 @@ class APIRouter(routing.Router):
)
self.routes.append(route)
def mount(self, path: str, app: ASGIApp, name: str | None = None) -> None:
super().mount(self.prefix + path, app=app, name=name)
def websocket(
self,
path: Annotated[
@ -1803,6 +1806,8 @@ class APIRouter(routing.Router):
include_in_schema=route.include_in_schema,
name=route.name,
)
elif isinstance(route, routing.Mount):
self.mount(prefix + route.path, route.app, route.name)
elif isinstance(route, APIWebSocketRoute):
current_dependencies = []
if dependencies:

75
tests/test_router_mount.py

@ -0,0 +1,75 @@
from fastapi import APIRouter, FastAPI
from fastapi.testclient import TestClient
from inline_snapshot import snapshot
def get_sub_app() -> FastAPI:
sub_app = FastAPI()
@sub_app.get("/sub")
def read_sub():
return {"message": "Hello World from sub API"}
return sub_app
def test_mount_sub_application_with_router_prefix():
router = APIRouter(prefix="/api")
router.mount("/subapi", get_sub_app())
app = FastAPI()
app.include_router(router)
client = TestClient(app)
response = client.get("/api/subapi/sub")
assert response.status_code == 200, response.text
assert response.json() == {"message": "Hello World from sub API"}
def test_mount_sub_application_with_include_router_prefix():
router = APIRouter()
router.mount("/subapi", get_sub_app())
app = FastAPI()
app.include_router(router, prefix="/api")
client = TestClient(app)
response = client.get("/api/subapi/sub")
assert response.status_code == 200, response.text
assert response.json() == {"message": "Hello World from sub API"}
def test_mount_sub_application_openapi_with_included_router():
router = APIRouter(prefix="/api")
router.mount("/subapi", get_sub_app())
app = FastAPI()
app.include_router(router)
client = TestClient(app)
response = client.get("/api/subapi/openapi.json")
assert response.status_code == 200, response.text
assert response.json() == snapshot(
{
"openapi": "3.1.0",
"info": {"title": "FastAPI", "version": "0.1.0"},
"paths": {
"/sub": {
"get": {
"summary": "Read Sub",
"operationId": "read_sub_sub_get",
"responses": {
"200": {
"description": "Successful Response",
"content": {"application/json": {"schema": {}}},
}
},
}
}
},
"servers": [{"url": "/api/subapi"}],
}
)
Loading…
Cancel
Save